Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

makefile: leverage GOPATH to avoid mv _vendor/vendor #1748

Merged
merged 6 commits into from
Sep 23, 2016
Merged

makefile: leverage GOPATH to avoid mv _vendor/vendor #1748

merged 6 commits into from
Sep 23, 2016

Conversation

tiancaiamao
Copy link
Contributor

Before:

ln -s _vendor/vendor vendor
$(GO) build .
rm -rf vendor

After:

export GOPATH := $(CURDIR)/_vendor:$(GOPATH)
$(GO) build

this PR rename _vendor/vendor to _vendor/src , CI may need update.

@tiancaiamao
makefile: leverage GOPATH to avoid mv _vendor/vendor
9a846f6 
Before:
ln -s _vendor/vendor vendor
$(GO) build .
rm -rf vendor

After:
export GOPATH := $(CURDIR)/_vendor:$(GOPATH)
$(GO) build
@tiancaiamao
fix ci
805cf1b
@tiancaiamao
Merge branch 'master' into tiancaiamao/update-makefile
a932f44 
Conflicts:
	Makefile
	_vendor/src/bitbucket.org/ww/goautoneg/Makefile
	_vendor/src/bitbucket.org/ww/goautoneg/README.txt
	_vendor/src/github.com/beorn7/perks/quantile/exampledata.txt
	_vendor/src/github.com/boltdb/bolt/.gitignore
	_vendor/src/github.com/boltdb/bolt/Makefile
	_vendor/src/github.com/boltdb/bolt/README.md
	_vendor/src/github.com/boltdb/bolt/appveyor.yml
	_vendor/src/github.com/cloudfoundry-incubator/candiedyaml/.gitignore
	_vendor/src/github.com/cloudfoundry-incubator/candiedyaml/.travis.yml
	_vendor/src/github.com/cloudfoundry-incubator/candiedyaml/README.md
	_vendor/src/github.com/cloudfoundry-incubator/candiedyaml/libyaml-LICENSE
	_vendor/src/github.com/coreos/etcd/auth/authpb/auth.proto
	_vendor/src/github.com/coreos/etcd/clientv3/README.md
	_vendor/src/github.com/coreos/etcd/etcdserver/etcdserverpb/etcdserver.proto
	_vendor/src/github.com/coreos/etcd/etcdserver/etcdserverpb/raft_internal.proto
	_vendor/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.proto
	_vendor/src/github.com/coreos/etcd/mvcc/mvccpb/kv.proto
	_vendor/src/github.com/cznic/golex/lex/Makefile
	_vendor/src/github.com/cznic/golex/lex/dfa
	_vendor/src/github.com/cznic/golex/lex/example.l
	_vendor/src/github.com/cznic/mathutil/AUTHORS
	_vendor/src/github.com/cznic/mathutil/CONTRIBUTORS
	_vendor/src/github.com/cznic/mathutil/Makefile
	_vendor/src/github.com/cznic/mathutil/README
	_vendor/src/github.com/cznic/mathutil/nist-sts-2-1-1-report
	_vendor/src/github.com/cznic/parser/yacc/AUTHORS
	_vendor/src/github.com/cznic/parser/yacc/CONTRIBUTORS
	_vendor/src/github.com/cznic/parser/yacc/Makefile
	_vendor/src/github.com/cznic/parser/yacc/go.l
	_vendor/src/github.com/cznic/parser/yacc/parser.y
	_vendor/src/github.com/cznic/parser/yacc/parser.yy
	_vendor/src/github.com/cznic/parser/yacc/y.l
	_vendor/src/github.com/cznic/sortutil/AUTHORS
	_vendor/src/github.com/cznic/sortutil/CONTRIBUTORS
	_vendor/src/github.com/cznic/sortutil/Makefile
	_vendor/src/github.com/cznic/sortutil/README
	_vendor/src/github.com/cznic/strutil/AUTHORS
	_vendor/src/github.com/cznic/strutil/CONTRIBUTORS
	_vendor/src/github.com/cznic/strutil/Makefile
	_vendor/src/github.com/cznic/strutil/README
	_vendor/src/github.com/cznic/y/AUTHORS
	_vendor/src/github.com/cznic/y/CONTRIBUTORS
	_vendor/src/github.com/cznic/y/Makefile
	_vendor/src/github.com/cznic/y/README.md
	_vendor/src/github.com/gengo/grpc-gateway/runtime/internal/stream_chunk.proto
	_vendor/src/github.com/ghodss/yaml/.gitignore
	_vendor/src/github.com/ghodss/yaml/.travis.yml
	_vendor/src/github.com/ghodss/yaml/README.md
	_vendor/src/github.com/go-sql-driver/mysql/.gitignore
	_vendor/src/github.com/go-sql-driver/mysql/.travis.yml
	_vendor/src/github.com/go-sql-driver/mysql/AUTHORS
	_vendor/src/github.com/go-sql-driver/mysql/CHANGELOG.md
	_vendor/src/github.com/go-sql-driver/mysql/CONTRIBUTING.md
	_vendor/src/github.com/go-sql-driver/mysql/README.md
	_vendor/src/github.com/gogo/protobuf/proto/Makefile
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test.go
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
	_vendor/src/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
	_vendor/src/github.com/golang/protobuf/proto/Makefile
	_vendor/src/github.com/golang/snappy/AUTHORS
	_vendor/src/github.com/golang/snappy/CONTRIBUTORS
	_vendor/src/github.com/golang/snappy/README
	_vendor/src/github.com/grpc-ecosystem/grpc-gateway/runtime/internal/stream_chunk.proto
	_vendor/src/github.com/juju/errors/.gitignore
	_vendor/src/github.com/juju/errors/Makefile
	_vendor/src/github.com/juju/errors/README.md
	_vendor/src/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore
	_vendor/src/github.com/matttproud/golang_protobuf_extensions/pbutil/Makefile
	_vendor/src/github.com/ngaut/log/README.md
	_vendor/src/github.com/ngaut/pools/vitess_license
	_vendor/src/github.com/ngaut/sync2/vitess_license
	_vendor/src/github.com/ngaut/systimemon/README.md
	_vendor/src/github.com/peterh/liner/README.md
	_vendor/src/github.com/pingcap/check/.gitignore
	_vendor/src/github.com/pingcap/check/README.md
	_vendor/src/github.com/pingcap/check/TODO
	_vendor/src/github.com/pingcap/check/check.v1_license
	_vendor/src/github.com/pingcap/check/godropbox_license
	_vendor/src/github.com/pingcap/goleveldb/.travis.yml
	_vendor/src/github.com/pingcap/goleveldb/README.md
	_vendor/src/github.com/pingcap/goleveldb/manualtest/dbstress/key.go
	_vendor/src/github.com/pingcap/goleveldb/manualtest/dbstress/main.go
	_vendor/src/github.com/pingcap/goleveldb/manualtest/filelock/main.go
	_vendor/src/github.com/pingcap/kvproto/pkg/mvccpb/mvccpb.pb.go
	_vendor/src/github.com/pingcap/kvproto/pkg/pd_jobpb/pd_jobpb.pb.go
	_vendor/src/github.com/pingcap/kvproto/pkg/raftpb/raftpb.pb.go
	_vendor/src/github.com/prometheus/client_golang/prometheus/.gitignore
	_vendor/src/github.com/prometheus/client_golang/prometheus/README.md
	_vendor/src/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/README.txt
	_vendor/src/github.com/prometheus/procfs/.travis.yml
	_vendor/src/github.com/prometheus/procfs/AUTHORS.md
	_vendor/src/github.com/prometheus/procfs/CONTRIBUTING.md
	_vendor/src/github.com/prometheus/procfs/Makefile
	_vendor/src/github.com/prometheus/procfs/README.md
	_vendor/src/github.com/twinj/uuid/.gitignore
	_vendor/src/github.com/twinj/uuid/.travis.yml
	_vendor/src/github.com/twinj/uuid/README.md
	_vendor/src/golang.org/x/net/http2/.gitignore
	_vendor/src/golang.org/x/net/http2/Dockerfile
	_vendor/src/golang.org/x/net/http2/Makefile
	_vendor/src/golang.org/x/net/http2/README
	_vendor/src/google.golang.org/grpc/.travis.yml
	_vendor/src/google.golang.org/grpc/CONTRIBUTING.md
	_vendor/src/google.golang.org/grpc/Makefile
	_vendor/src/google.golang.org/grpc/README.md
	_vendor/src/google.golang.org/grpc/codegen.sh
	_vendor/src/google.golang.org/grpc/coverage.sh
	_vendor/src/google.golang.org/grpc/credentials/credentials_util_go17.go
	_vendor/src/google.golang.org/grpc/credentials/credentials_util_pre_go17.go
	_vendor/src/google.golang.org/grpc/transport/go16.go
	_vendor/src/google.golang.org/grpc/transport/go17.go
	_vendor/src/google.golang.org/grpc/transport/pre_go16.go
	_vendor/vendor/github.com/ngaut/pools/vitess_license
	_vendor/vendor/github.com/ngaut/sync2/vitess_license
	_vendor/vendor/golang.org/x/sys/LICENSE
	_vendor/vendor/golang.org/x/time/LICENSE
@coocood
Copy link
Member

coocood commented Sep 22, 2016

LGTM

@siddontang
Copy link
Member

@overvenus
We can do it in pd too.

@shenli
Copy link
Member

shenli commented Sep 22, 2016

LGTM
/cc @iamxy PTAL After this PR, we need to change jenkins script.

@tiancaiamao tiancaiamao merged commit be703dd into master Sep 23, 2016
@tiancaiamao tiancaiamao deleted the tiancaiamao/update-makefile branch September 23, 2016 08:55
@overvenus overvenus mentioned this pull request Sep 29, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tiancaiamao @coocood @siddontang @shenli @zimulala