Skip to content

Commit

Permalink
build: allow to build outside the etcd directory
Browse files Browse the repository at this point in the history
And added gopath hack which allows to build without setting any GOPATH
env. Just run the build script when you have installed golang.
  • Loading branch information
kayrus committed Jul 18, 2016
1 parent 336e4f2 commit cab2e45
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
11 changes: 11 additions & 0 deletions build
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/sh -e

CDIR=$(cd `dirname "$0"` && pwd)
cd "$CDIR"

# set some environment variables
ORG_PATH="github.com/coreos"
REPO_PATH="${ORG_PATH}/etcd"
Expand Down Expand Up @@ -35,7 +38,15 @@ etcd_build() {
CGO_ENABLED=0 go build $GO_BUILD_FLAGS -installsuffix cgo -ldflags "-s" -o ${out}/etcdctl ${REPO_PATH}/cmd/etcdctl
}

etcd_setup_gopath() {
export GOPATH=${CDIR}/gopath
rm -f $GOPATH/src
mkdir -p $GOPATH
ln -s ${CDIR}/cmd/vendor $GOPATH/src
}

toggle_failpoints
etcd_setup_gopath

# don't build when sourced
(echo "$0" | grep "/build$" > /dev/null) && etcd_build || true
6 changes: 0 additions & 6 deletions test
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,6 @@ function build_pass {
GO_BUILD_FLAGS="-a -v" etcd_build
}

# Set up gopath so tests use vendored dependencies
export GOPATH=${PWD}/gopath
rm -f $GOPATH/src
mkdir -p $GOPATH
ln -s ${PWD}/cmd/vendor $GOPATH/src

for pass in $PASSES; do
${pass}_pass
done
Expand Down

0 comments on commit cab2e45

Please sign in to comment.