Merge pull request #1241 from Danmou/patch-1

[micro.git] / tools / cross-compile.sh

diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh
index 99f07028952e35cf55bd3c882b6a1f15c0560fdb..d0b962c3d64c9a476164e57a5faf9955189d66c6 100755 (executable)
--- a/tools/cross-compile.sh
+++ b/tools/cross-compile.sh
@@ -1,26 +1,26 @@
+# Source tar
+
+./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-cp LICENSE micro-$1
-cp README.md micro-$1
-
-# Source tar
-
-cd tools
-./vendor-src.sh micro-$1-src
-cd ..
 mv micro-$1-src.tar.gz binaries
 mv micro-$1-src.zip binaries
 
+cp LICENSE micro-$1
+cp README.md micro-$1
+cp LICENSE-THIRD-PARTY micro-$1
+
 HASH="$(git rev-parse --short HEAD)"
 VERSION="$(go run tools/build-version.go)"
 DATE="$(go run tools/build-date.go)"
+ADDITIONAL_GO_LINKER_FLAGS="$(go run tools/info-plist.go $VERSION)"
 
 # Mac
 echo "OSX 64"
-GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro
+GOOS=darwin GOARCH=amd64 go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE' $ADDITIONAL_GO_LINKER_FLAGS" -o micro-$1/micro ./cmd/micro
 tar -czf micro-$1-osx.tar.gz micro-$1
 mv micro-$1-osx.tar.gz binaries
 
@@ -81,4 +81,3 @@ zip -r -q -T micro-$1-win32.zip micro-$1
 mv micro-$1-win32.zip binaries
 
 rm -rf micro-$1
-