diff --git a/htrace-htraced/BUILDING.txt b/htrace-htraced/BUILDING.txt index abc0113..76098b3 100644 --- a/htrace-htraced/BUILDING.txt +++ b/htrace-htraced/BUILDING.txt @@ -13,7 +13,7 @@ The htrace go code consists of 4 main parts: This is the equivalent of the Java HTrace client library, but written in Go. You can build all these parts simply by running "gobuild.sh". -The binaries will be created in bin/. +The binaries will be created in the target dir. Dependencies ============ diff --git a/htrace-htraced/src/go/gobuild.sh b/htrace-htraced/src/go/gobuild.sh index 81c9f7d..39fb4cc 100755 --- a/htrace-htraced/src/go/gobuild.sh +++ b/htrace-htraced/src/go/gobuild.sh @@ -22,9 +22,9 @@ # # Builds the HTrace server code. # -# ./build.sh Builds the code. -# ./build.sh test Builds and runs all unit tests. -# ./build.sh bench Builds and runs all benchmarks +# ./gobuild.sh Builds the code. +# ./gobuild.sh test Builds and runs all unit tests. +# ./gobuild.sh bench Builds and runs all benchmarks # die() { @@ -42,7 +42,8 @@ RELEASE_VERSION=${RELEASE_VERSION:-unknown} # Set up directories. The build/ directory is where build dependencies and # build binaries should go. SCRIPT_DIR="$(cd "$( dirname $0 )" && pwd)" -export GOBIN="${SCRIPT_DIR}/build" +# Dir to build and create the binaries in +export GOBIN="${SCRIPT_DIR}/../../target" mkdir -p "${GOBIN}" || die "failed to mkdir -p ${GOBIN}" cd "${GOBIN}" || die "failed to cd to ${SCRIPT_DIR}" export GOPATH="${GOBIN}:${SCRIPT_DIR}" @@ -92,6 +93,8 @@ install) which godep &> /dev/null if [ $? -ne 0 ]; then echo "Installing godep..." + # Need Godeps over in $GOBIN + cp -r "${SCRIPT_DIR}/Godeps" "${GOBIN}" &> /dev/null go get github.com/tools/godep || die "failed to get godep" fi