Skip to content

Commit

Permalink
chore(build): set build path to gopath/
Browse files Browse the repository at this point in the history
With this, pkg/ could be used as normal directory, and it doesn't need
to gitignore pkg/, which shields pkg/http and pkg/strings.
  • Loading branch information
yichengq committed Apr 9, 2014
1 parent 4ce8c34 commit 84ad6dd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/pkg
/gopath
/go-bindata
/machine*
/bin
/src
.vagrant
*.etcd
8 changes: 4 additions & 4 deletions build
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/sh -e

if [ ! -h src/github.com/coreos/etcd ]; then
mkdir -p src/github.com/coreos/
ln -s ../../.. src/github.com/coreos/etcd
if [ ! -h gopath/src/github.com/coreos/etcd ]; then
mkdir -p gopath/src/github.com/coreos/
ln -s ../../../.. gopath/src/github.com/coreos/etcd
fi

export GOBIN=${PWD}/bin
export GOPATH=${PWD}
export GOPATH=${PWD}/gopath
export GOFMTPATH="./bench ./config ./discovery ./etcd ./error ./http ./log main.go ./metrics ./mod ./server ./store ./tests"

# Don't surprise user by formatting their codes by stealth
Expand Down

0 comments on commit 84ad6dd

Please sign in to comment.