|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: src/github.com/pingcap/tidb/Makefile
|
|
|
|
|
--- src/github.com/pingcap/tidb/Makefile.orig 2016-03-06 20:52:29.000000000 +0100
|
|
|
|
|
+++ src/github.com/pingcap/tidb/Makefile 2016-03-06 21:01:54.912574432 +0100
|
|
|
|
|
--- src/github.com/pingcap/tidb/Makefile.orig 2016-04-05 23:37:30.000000000 +0200
|
|
|
|
|
+++ src/github.com/pingcap/tidb/Makefile 2016-04-05 23:40:39.497293331 +0200
|
|
|
|
|
@@ -34,7 +34,7 @@
|
|
|
|
|
MAC := "Darwin"
|
|
|
|
|
|
|
|
|
|
@ -10,7 +10,7 @@ Index: src/github.com/pingcap/tidb/Makefile
|
|
|
|
|
|
|
|
|
|
TARGET = ""
|
|
|
|
|
|
|
|
|
|
@@ -43,27 +43,18 @@
|
|
|
|
|
@@ -43,28 +43,18 @@
|
|
|
|
|
all: godep build test check
|
|
|
|
|
|
|
|
|
|
godep:
|
|
|
|
|
@ -18,6 +18,7 @@ Index: src/github.com/pingcap/tidb/Makefile
|
|
|
|
|
- go get github.com/pingcap/go-hbase
|
|
|
|
|
- go get github.com/pingcap/go-themis
|
|
|
|
|
- go get github.com/pingcap/tso/client
|
|
|
|
|
- go get github.com/pingcap/ticlient
|
|
|
|
|
|
|
|
|
|
build:
|
|
|
|
|
- $(GO) build
|
|
|
|
|
@ -39,24 +40,25 @@ Index: src/github.com/pingcap/tidb/Makefile
|
|
|
|
|
$(GOYACC) -o /dev/null -xegen $(TEMP_FILE) parser/parser.y
|
|
|
|
|
$(GOYACC) -o parser/parser.go -xe $(TEMP_FILE) parser/parser.y 2>&1 | egrep "(shift|reduce)/reduce" | awk '{print} END {if (NR > 0) {print "Find conflict in parser.y. Please check y.output for more information."; system("rm -f $(TEMP_FILE)"); exit 1;}}'
|
|
|
|
|
rm -f $(TEMP_FILE)
|
|
|
|
|
@@ -83,16 +74,6 @@
|
|
|
|
|
@@ -84,17 +74,6 @@
|
|
|
|
|
@awk 'BEGIN{print "// Code generated by goyacc"} {print $0}' parser/scanner.go > tmp_scanner.go && mv tmp_scanner.go parser/scanner.go;
|
|
|
|
|
|
|
|
|
|
check:
|
|
|
|
|
- bash gitcookie.sh
|
|
|
|
|
- go get github.com/golang/lint/golint
|
|
|
|
|
-
|
|
|
|
|
- @echo "vet"
|
|
|
|
|
- @ go tool vet . 2>&1 | grep -vE 'Godeps|parser/scanner.*unreachable code' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
- @echo "vet --shadow"
|
|
|
|
|
- @ go tool vet --shadow . 2>&1 | grep -vE 'Godeps' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
- @ go tool vet --shadow . 2>&1 | grep -vE 'Godeps|parser/parser.go|parser/scanner.go' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
- @echo "golint"
|
|
|
|
|
- @ $(GOLINT) ./... 2>&1 | grep -vE 'LastInsertId|NewLexer' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
- @ $(GOLINT) ./... 2>&1 | grep -vE 'LastInsertId|NewLexer|\.pb\.go' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
- @echo "gofmt (simplify)"
|
|
|
|
|
- @ gofmt -s -l . 2>&1 | grep -vE 'Godeps|parser/parser.go|parser/scanner.go' | awk '{print} END{if(NR>0) {exit 1}}'
|
|
|
|
|
|
|
|
|
|
deps:
|
|
|
|
|
go list -f '{{range .Deps}}{{printf "%s\n" .}}{{end}}{{range .TestImports}}{{printf "%s\n" .}}{{end}}' ./... | \
|
|
|
|
|
@@ -115,23 +96,19 @@
|
|
|
|
|
@@ -117,23 +96,19 @@
|
|
|
|
|
test: gotest
|
|
|
|
|
|
|
|
|
|
gotest:
|
|
|
|
|
|
