Small improvements to build scripts

alethenorio · May 7, 2017 · ae832e5 · ae832e5
1 parent ce9e80c
commit ae832e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -11,7 +11,7 @@ if [ "$GOOS" == "windows" ]; then
     BINARY="${BINARY}.exe"
 fi
 
-tar cfz /tmp/${NAME}-${VERSION}-tar.gz --exclude="./.git" .
+tar cfz /tmp/${NAME}-${VERSION}-tar.gz --exclude="./.git" --exclude="./dist" .
 
 go build -o "${BINARY}" -ldflags "-X main.Version=${VERSION} -X main.buildTime=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.commitId=${TRAVIS_COMMIT}"
 

diff --git a/buildall.bat b/buildall.bat
@@ -14,13 +14,15 @@ set ldt=%ldt:~0,4%-%ldt:~4,2%-%ldt:~6,2%_%ldt:~8,2%:%ldt:~10,2%:%ldt:~12,6%
 set BUILDTIME=%ldt%
 
 
-set CGO_ENABLED=0
 
 echo Building version=%VERSION% from commit=%COMMITID% for %GOOS%/%GOARCH%
+
+set CGO_ENABLED=0
 go build -a -installsuffix cgo -o "%BINARY%" -ldflags "-X main.version=%VERSION% -X main.buildTime=%BUILDTIME% -X main.commitId=%COMMITID%"
 
 set GOOS=windows
 set GOARCH=amd64
+set BINARY=dist/%NAME%-%GOOS%-%GOARCH%.exe
 
 echo Building version=%VERSION% from commit=%COMMITID% for %GOOS%/%GOARCH%
-go build -o "%BINARY%.exe" -ldflags "-X main.version=%VERSION% -X main.buildTime=%BUILDTIME% -X main.commitId=%COMMITID%"
+go build -o "%BINARY%" -ldflags "-X main.version=%VERSION% -X main.buildTime=%BUILDTIME% -X main.commitId=%COMMITID%"