Updates to build script.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/191b637c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/191b637c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/191b637c Branch: refs/heads/master Commit: 191b637c7ec884fc59f4427aac471620b72cd488 Parents: d540b96 Author: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Authored: Wed Feb 24 12:20:30 2016 +0000 Committer: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Committed: Wed Feb 24 12:20:30 2016 +0000 ---------------------------------------------------------------------- release/build.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/191b637c/release/build.sh ---------------------------------------------------------------------- diff --git a/release/build.sh b/release/build.sh index 7c79c92..fc4e864 100755 --- a/release/build.sh +++ b/release/build.sh @@ -16,7 +16,6 @@ ARCHVALUES="386 amd64" BRNAME="br" PROJECT="github.com/apache/brooklyn-client" CLI_PACKAGE="${PROJECT}/${BRNAME}" -EXECUTABLE_DIR="$GOPATH/src/$CLI_PACKAGE" GOBIN=go GODEP=godep @@ -137,14 +136,14 @@ if [ -n "$outdir" -a ! -d "$outdir" ]; then exit 1 fi -# Set GOPATH to $outdir and link source +# Set GOPATH to $outdir and link to source code. export GOPATH=${outdir} mkdir -p ${GOPATH}/src/${PROJECT%/*} [ -e ${GOPATH}/src/${PROJECT} ] || ln -s ${sourcedir} ${GOPATH}/src/${PROJECT} - +PATH=${GOPATH}/bin:${PATH} command -v $GODEP >/dev/null 2>&1 || { - go get github.com/tools/godep + go get github.com/tools/godep || { echo failed installing dodep ; exit 1; } } command -v $GODEP >/dev/null 2>&1 || { @@ -164,7 +163,7 @@ if [ \( -n "$os" -a -z "$arch" \) -o \( -z "$os" -a -n "$arch" \) ]; then exit 1 fi - +EXECUTABLE_DIR="$GOPATH/src/$CLI_PACKAGE" if [ -d ${EXECUTABLE_DIR} ]; then cd ${EXECUTABLE_DIR} else @@ -172,9 +171,11 @@ else exit 2 fi +mkdir -p ${GOPATH}/bin + if [ -z "$os" -a -z "$all" ]; then echo "Building $BRNAME for native OS/ARCH" - $GODEP $GOBIN build -ldflags "-s" -o "${outdir}/${BRNAME}${label}${timestamp}" $CLI_PACKAGE + $GODEP $GOBIN build -ldflags "-s" -o "${GOPATH}/bin/${BRNAME}${label}${timestamp}" $CLI_PACKAGE elif [ -z "$all" ]; then validos=`expr " $OSVALUES " : ".* $os "` if [ "$validos" -eq 0 ]; then @@ -189,8 +190,8 @@ elif [ -z "$all" ]; then exit 1 fi echo "Building $BRNAME for $os/$arch" - mkdir -p ${outdir}/$os.$arch - GOOS="$os" GOARCH="$arch" $GODEP $GOBIN build -ldflags "-s" -o "${outdir}/$os.$arch/${BRNAME}${label}" $CLI_PACKAGE + mkdir -p ${GOPATH}/bin/$os.$arch + GOOS="$os" GOARCH="$arch" $GODEP $GOBIN build -ldflags "-s" -o "${GOPATH}/bin/$os.$arch/${BRNAME}${label}" $CLI_PACKAGE else echo "Building $BRNAME for all OS/ARCH:" os="$OSVALUES" @@ -198,8 +199,8 @@ else for archv in $arch; do for osv in $os; do echo " $osv/$archv" - mkdir -p ${outdir}/$osv.$archv - GOOS="$osv" GOARCH="$archv" $GODEP $GOBIN build -ldflags "-s" -o "${outdir}/$osv.$archv/${BRNAME}${label}" $CLI_PACKAGE + mkdir -p ${GOPATH}/bin/$osv.$archv + GOOS="$osv" GOARCH="$archv" $GODEP $GOBIN build -ldflags "-s" -o "${GOPATH}/bin/$osv.$archv/${BRNAME}${label}" $CLI_PACKAGE done done fi
