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.

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

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

Merged
merged 6 commits into from
Sep 23, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
makefile: leverage GOPATH to avoid mv _vendor/vendor
Before:
ln -s _vendor/vendor vendor
$(GO) build .
rm -rf vendor

After:
export GOPATH := $(CURDIR)/_vendor:$(GOPATH)
$(GO) build
  • Loading branch information
tiancaiamao committed Sep 21, 2016
commit 9a846f68083b0a096c90e3c1b9b5605a9e5d0d0d
26 changes: 4 additions & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ ifeq "$(GOPATH)" ""
$(error Please set the environment variable GOPATH before running `make`)
endif

CURDIR := $(shell pwd)
path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH)))
export PATH := $(path_to_add):$(PATH)
export GOPATH := $(CURDIR)/_vendor:$(GOPATH)
GO := GO15VENDOREXPERIMENT="1" go

ARCH := "`uname -s`"
Expand All @@ -32,21 +34,15 @@ all: dev server install benchkv
dev: parser build benchkv test check

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

install:
rm -rf vendor && ln -s _vendor/vendor vendor
$(GO) install ./...
rm -rf vendor

TEMP_FILE = temp_parser_file

goyacc:
rm -rf vendor && ln -s _vendor/vendor vendor
$(GO) build -o bin/goyacc github.com/pingcap/tidb/parser/goyacc
rm -rf vendor

parser: goyacc
rm -rf parser/scanner.go
Expand Down Expand Up @@ -96,46 +92,32 @@ todo:
test: gotest

gotest:
rm -rf vendor && ln -s _vendor/vendor vendor
@export log_level=error;\
$(GO) test -cover $(PACKAGES)
rm -rf vendor

race:
rm -rf vendor && ln -s _vendor/vendor vendor
@export log_level=debug; \
dirs=`go list ./... | grep -vE 'vendor' | awk '{sub("github.com/pingcap/tidb/",""); print}'`;\
for dir in $$dirs; do \
cd $$dir;\
go test -race | awk 'END{if($$1=="FAIL") {exit 1}}' || exit 1;\
cd -;\
done;
rm -rf vendor

tikv_integration_test:
rm -rf vendor && ln -s _vendor/vendor vendor
$(GO) test ./store/tikv/. -with-tikv=true
rm -rf vendor

interpreter:
rm -rf vendor && ln -s _vendor/vendor vendor
@cd interpreter && $(GO) build -ldflags '$(LDFLAGS)'
rm -rf vendor

server: parser
server: parser
ifeq ($(TARGET), "")
rm -rf vendor && ln -s _vendor/vendor vendor
$(GO) build -ldflags '$(LDFLAGS)' -o bin/tidb-server tidb-server/main.go
rm -rf vendor
else
rm -rf vendor && ln -s _vendor/vendor vendor
$(GO) build -ldflags '$(LDFLAGS)' -o '$(TARGET)' tidb-server/main.go
rm -rf vendor
endif

benchkv:
rm -rf vendor && ln -s _vendor/vendor vendor
benchkv:
$(GO) build -ldflags '$(LDFLAGS)' -o bin/benchkv benchkv/main.go
rm -rf vendor


Loading