From 1a58d54ee047047db4157b5c84c8d7043c1aa703 Mon Sep 17 00:00:00 2001 From: insion Date: Sun, 13 Sep 2015 11:28:07 +0800 Subject: [PATCH 1/5] just for windows make command --- make.cmd | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 make.cmd diff --git a/make.cmd b/make.cmd new file mode 100644 index 0000000000000..0e48587e05565 --- /dev/null +++ b/make.cmd @@ -0,0 +1,7 @@ +go get github.com/qiuyesuifeng/goyacc +go get github.com/qiuyesuifeng/golex +type nul >>temp.XXXXXX & copy temp.XXXXXX +,, +goyacc -o nul -xegen "temp.XXXXXX" parser/parser.y +goyacc -o parser/parser.go -xe "temp.XXXXXX" parser/parser.y +DEL /F /A /Q temp.XXXXXX +DEL /F /A /Q y.output From ade30aa26ac8227cb5f2388d79518d1ff4698e3a Mon Sep 17 00:00:00 2001 From: insion Date: Sun, 13 Sep 2015 11:29:42 +0800 Subject: [PATCH 2/5] for linux/unix/osx make command --- make.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 make.sh diff --git a/make.sh b/make.sh new file mode 100644 index 0000000000000..3b59ddb34cecb --- /dev/null +++ b/make.sh @@ -0,0 +1,7 @@ +go get github.com/qiuyesuifeng/goyacc +go get github.com/qiuyesuifeng/golex +touch temp.XXXXXX +goyacc -o /dev/null -xegen "temp.XXXXXX" parser/parser.y +goyacc -o parser/parser.go -xe "temp.XXXXXX" parser/parser.y +rm -f "temp.XXXXXX" +rm -f y.output From 5efcddd3788c622429502473980565b1b288591e Mon Sep 17 00:00:00 2001 From: insion Date: Tue, 15 Sep 2015 06:23:06 +0800 Subject: [PATCH 3/5] Update make.cmd --- make.cmd | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/make.cmd b/make.cmd index 0e48587e05565..c4addc235265f 100644 --- a/make.cmd +++ b/make.cmd @@ -1,3 +1,13 @@ +@echo off +::go build option +set TiDBBuildTS=%date:~0,10% %time:~1,7% +for /f "delims=" %%i in ('git rev-parse HEAD') do (set TiDBGitHash=%%i) +set LDFLAGS="-X github.com/pingcap/tidb/util/printer.TiDBBuildTS=%TiDBBuildTS% -X github.com/pingcap/tidb/util/printer.TiDBGitHash=%TiDBGitHash%" + +:: godep +go get github.com/tools/godep + +@echo [Parser] go get github.com/qiuyesuifeng/goyacc go get github.com/qiuyesuifeng/golex type nul >>temp.XXXXXX & copy temp.XXXXXX +,, @@ -5,3 +15,19 @@ goyacc -o nul -xegen "temp.XXXXXX" parser/parser.y goyacc -o parser/parser.go -xe "temp.XXXXXX" parser/parser.y DEL /F /A /Q temp.XXXXXX DEL /F /A /Q y.output + +golex -o parser/scanner.go parser/scanner.l + + +@echo [Build] +godep go build -ldflags '%LDFLAGS%' + +@echo [Install] +godep go install ./... + + +@echo [Test] +godep go test -cover ./... + +::done +@echo [Done] From 10407f78e2342f016fc45a1eb3c882baf0dbe6db Mon Sep 17 00:00:00 2001 From: insion Date: Tue, 15 Sep 2015 06:24:00 +0800 Subject: [PATCH 4/5] Update make.sh --- make.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/make.sh b/make.sh index 3b59ddb34cecb..d233b7350b882 100644 --- a/make.sh +++ b/make.sh @@ -1,3 +1,13 @@ +#go build option +LDFLAGS="-X github.com/pingcap/tidb/util/printer.TiDBBuildTS=`date -u '+%Y-%m-%d %I:%M:%S'` -X github.com/pingcap/tidb/util/printer.TiDBGitHash=`git rev-parse HEAD`" +ARCH="`uname -s`" +LINUX="Linux" +MAC="Darwin" + +# godep +go get github.com/tools/godep + +echo [Parser] go get github.com/qiuyesuifeng/goyacc go get github.com/qiuyesuifeng/golex touch temp.XXXXXX @@ -5,3 +15,28 @@ goyacc -o /dev/null -xegen "temp.XXXXXX" parser/parser.y goyacc -o parser/parser.go -xe "temp.XXXXXX" parser/parser.y rm -f "temp.XXXXXX" rm -f y.output + +if [ $ARCH = $LINUX ]; +then + sed -i -e 's|//line.*||' -e 's/yyEofCode/yyEOFCode/' parser/parser.go; +elif [ $ARCH = $MAC ]; +then + sed -i "" 's|//line.*||' parser/parser.go; + sed -i "" 's/yyEofCode/yyEOFCode/' parser/parser.go; +fi + +golex -o parser/scanner.go parser/scanner.l + + +echo [Build] +godep go build -ldflags '$LDFLAGS' + +echo [Install] +godep go install ./... + + +echo [Test] +godep go test -cover ./... + +#done +echo [Done] From 86b74f0ff7a015607f90566f2b7d99eaebadc12b Mon Sep 17 00:00:00 2001 From: insion Date: Tue, 15 Sep 2015 10:54:35 +0800 Subject: [PATCH 5/5] Delete make.sh --- make.sh | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 make.sh diff --git a/make.sh b/make.sh deleted file mode 100644 index d233b7350b882..0000000000000 --- a/make.sh +++ /dev/null @@ -1,42 +0,0 @@ -#go build option -LDFLAGS="-X github.com/pingcap/tidb/util/printer.TiDBBuildTS=`date -u '+%Y-%m-%d %I:%M:%S'` -X github.com/pingcap/tidb/util/printer.TiDBGitHash=`git rev-parse HEAD`" -ARCH="`uname -s`" -LINUX="Linux" -MAC="Darwin" - -# godep -go get github.com/tools/godep - -echo [Parser] -go get github.com/qiuyesuifeng/goyacc -go get github.com/qiuyesuifeng/golex -touch temp.XXXXXX -goyacc -o /dev/null -xegen "temp.XXXXXX" parser/parser.y -goyacc -o parser/parser.go -xe "temp.XXXXXX" parser/parser.y -rm -f "temp.XXXXXX" -rm -f y.output - -if [ $ARCH = $LINUX ]; -then - sed -i -e 's|//line.*||' -e 's/yyEofCode/yyEOFCode/' parser/parser.go; -elif [ $ARCH = $MAC ]; -then - sed -i "" 's|//line.*||' parser/parser.go; - sed -i "" 's/yyEofCode/yyEOFCode/' parser/parser.go; -fi - -golex -o parser/scanner.go parser/scanner.l - - -echo [Build] -godep go build -ldflags '$LDFLAGS' - -echo [Install] -godep go install ./... - - -echo [Test] -godep go test -cover ./... - -#done -echo [Done]