mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
*: remove old gitignore and build functions
Not needed since we are now using go module. Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
parent
9b6c3e3378
commit
a48706ecfb
17
.gitignore
vendored
17
.gitignore
vendored
@ -16,21 +16,4 @@ hack/tls-setup/certs
|
|||||||
/contrib/raftexample/raftexample
|
/contrib/raftexample/raftexample
|
||||||
/contrib/raftexample/raftexample-*
|
/contrib/raftexample/raftexample-*
|
||||||
|
|
||||||
# TODO: use dep prune
|
|
||||||
# https://github.com/golang/dep/issues/120#issuecomment-306518546
|
|
||||||
vendor/**/*
|
|
||||||
!vendor/**/
|
|
||||||
!vendor/**/*.go
|
|
||||||
!vendor/**/*.c
|
|
||||||
!vendor/**/*.cpp
|
|
||||||
!vendor/**/*.s
|
|
||||||
!vendor/**/COPYING*
|
|
||||||
!vendor/**/PATENTS*
|
|
||||||
!vendor/**/NOTICE*
|
|
||||||
!vendor/**/Licence*
|
|
||||||
!vendor/**/License*
|
|
||||||
!vendor/**/LICENCE*
|
|
||||||
!vendor/**/LICENSE*
|
|
||||||
vendor/**/*_test.go
|
|
||||||
|
|
||||||
*.bak
|
*.bak
|
||||||
|
21
build
21
build
@ -23,23 +23,6 @@ toggle_failpoints() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
etcd_setup_gopath() {
|
|
||||||
echo "Setting GOPATH from vendor directory at 'gopath'"
|
|
||||||
d=$(dirname "$0")
|
|
||||||
CDIR=$(cd "$d" || return && pwd)
|
|
||||||
cd "$CDIR" || return
|
|
||||||
etcdGOPATH="${CDIR}/gopath"
|
|
||||||
# preserve old gopath to support building with unvendored tooling deps (e.g., gofail)
|
|
||||||
if [[ -n "$GOPATH" ]]; then
|
|
||||||
GOPATH=":$GOPATH"
|
|
||||||
fi
|
|
||||||
rm -rf "${etcdGOPATH:?}/"
|
|
||||||
mkdir -p "${etcdGOPATH}/vendor" "${etcdGOPATH}/etcd_src/src/go.etcd.io"
|
|
||||||
export GOPATH=${etcdGOPATH}/vendor:${etcdGOPATH}/etcd_src${GOPATH}
|
|
||||||
ln -s "${CDIR}/vendor" "${etcdGOPATH}/vendor/src"
|
|
||||||
ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/go.etcd.io/etcd"
|
|
||||||
}
|
|
||||||
|
|
||||||
toggle_failpoints_default() {
|
toggle_failpoints_default() {
|
||||||
mode="disable"
|
mode="disable"
|
||||||
if [[ -n "$FAILPOINTS" ]]; then mode="enable"; fi
|
if [[ -n "$FAILPOINTS" ]]; then mode="enable"; fi
|
||||||
@ -88,10 +71,6 @@ tools_build() {
|
|||||||
|
|
||||||
toggle_failpoints_default
|
toggle_failpoints_default
|
||||||
|
|
||||||
if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
|
|
||||||
etcd_setup_gopath
|
|
||||||
fi
|
|
||||||
|
|
||||||
# only build when called directly, not sourced
|
# only build when called directly, not sourced
|
||||||
if echo "$0" | grep "build$" >/dev/null; then
|
if echo "$0" | grep "build$" >/dev/null; then
|
||||||
etcd_build
|
etcd_build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user