diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2011-10-28 08:45:17 +1100 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2011-10-28 08:45:17 +1100 |
| commit | c92a499bc3b0be67f91a1be47f5359e1289ca732 (patch) | |
| tree | 73fb97ca0ccf50124bab69648599f4aa8d54d35c | |
| parent | b7ef3c9a5465762a19cec6bc925ddeda1a6b441a (diff) | |
| download | go-c92a499bc3b0be67f91a1be47f5359e1289ca732.tar.gz go-c92a499bc3b0be67f91a1be47f5359e1289ca732.zip | |
misc/windows: allow to be used for amd64
R=jdpoirier
CC=golang-dev
https://golang.org/cl/5305048
| -rw-r--r-- | misc/windows/README | 15 | ||||
| -rwxr-xr-x | misc/windows/package.bash | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/misc/windows/README b/misc/windows/README index a7e0d3fc4b..45cd0df8b9 100644 --- a/misc/windows/README +++ b/misc/windows/README @@ -11,12 +11,9 @@ Unzip and place 7za.exe in msys' bin directory. Packaging ========= -1) have a go tree at $GOROOT -2) make sure $GOBIN=$GOROOT\bin is empty -3) select appropriate version "hg up -r ..." -4) build go "cd $GOROOT/src; ./all.bash" -5) create Windows packages "cd $GOROOT/misc/windows; ./package.bash" - - - - +- have a go tree at $GOROOT +- make sure $GOBIN=$GOROOT\bin or is empty +- make sure $GOARCH=386 or $GOARCH=amd64 +- select appropriate version "hg up -r ..." +- build go "cd $GOROOT/src; ./all.bash" +- create Windows packages "cd $GOROOT/misc/windows; ./package.bash" diff --git a/misc/windows/package.bash b/misc/windows/package.bash index 92e9093171..99670e8542 100755 --- a/misc/windows/package.bash +++ b/misc/windows/package.bash @@ -36,9 +36,9 @@ cp -a ../../pkg go/pkg cp -a ../../bin go/bin echo "%%%%% Starting zip packaging %%%%%" 1>&2 -7za a -tzip -mx=9 gowin386"_"$ver.zip "go/" >/dev/null +7za a -tzip -mx=9 gowin$GOARCH"_"$ver.zip "go/" >/dev/null echo "%%%%% Starting installer packaging %%%%%" 1>&2 -"$ISCC" //dAppName=Go //dAppVersion=386"_"$ver //dAppNameLower=go installer.iss >/dev/null +"$ISCC" //dAppName=Go //dAppVersion=$GOARCH"_"$ver //dAppNameLower=go installer.iss >/dev/null |