htrace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject incubator-htrace git commit: HTRACE-257. htrace-htraced: add web symlink rather than generating programmatically (cmccabe)
Date Fri, 18 Sep 2015 21:47:52 GMT
Repository: incubator-htrace
Updated Branches:
  refs/heads/4.0 c82602fa6 -> 4e110718b


HTRACE-257. htrace-htraced: add web symlink rather than generating programmatically (cmccabe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/4e110718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/4e110718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/4e110718

Branch: refs/heads/4.0
Commit: 4e110718b3251a45bcdf85dc1ba740d782399f0a
Parents: c82602f
Author: Colin P. Mccabe <cmccabe@apache.org>
Authored: Fri Sep 18 14:44:09 2015 -0700
Committer: Colin P. Mccabe <cmccabe@apache.org>
Committed: Fri Sep 18 14:47:47 2015 -0700

----------------------------------------------------------------------
 .gitignore                   | 1 -
 htrace-htraced/go/gobuild.sh | 3 ---
 htrace-htraced/go/web        | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4e110718/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b56ff18..067a4b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@
 dependency-reduced-pom.xml
 htrace-htraced/go/build
 htrace-htraced/go/pkg
-htrace-htraced/go/web
 htrace-htraced/src/go
 htrace-htraced/bin

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4e110718/htrace-htraced/go/gobuild.sh
----------------------------------------------------------------------
diff --git a/htrace-htraced/go/gobuild.sh b/htrace-htraced/go/gobuild.sh
index 2728b8f..3e9b30a 100755
--- a/htrace-htraced/go/gobuild.sh
+++ b/htrace-htraced/go/gobuild.sh
@@ -129,9 +129,6 @@ install)
     FLAGS="-X main.RELEASE_VERSION ${RELEASE_VERSION} -X main.GIT_VERSION ${GIT_VERSION}"
     go install ${TAGS} -ldflags "${FLAGS}" -v org/apache/htrace/... "$@" \
         || die "go install failed."
-    # Make a symlink to web src dir so can do development in-situ out
-    # of build dir. This is ugly but blame go build.
-    ln -fs "../../htrace-webapp/src/main/webapp" "${GOBIN}/../web"
     # Set the RPATH to make bundling leveldb and snappy easier.
     set_rpath "${GOBIN}/htraced"
     ;;

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4e110718/htrace-htraced/go/web
----------------------------------------------------------------------
diff --git a/htrace-htraced/go/web b/htrace-htraced/go/web
new file mode 120000
index 0000000..aefd68d
--- /dev/null
+++ b/htrace-htraced/go/web
@@ -0,0 +1 @@
+../../htrace-webapp/src/main/webapp
\ No newline at end of file


Mime
View raw message