Skip to content

Commit b40b996

Browse files
committed
Added build for win64
1 parent 56c72bb commit b40b996

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
lines changed

distrib.sh

+17-8
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ mkdir -p distrib/linux32
99
mkdir -p distrib/linuxarm
1010
mkdir -p distrib/linuxarm64
1111
mkdir -p distrib/osx
12-
mkdir -p distrib/windows
12+
mkdir -p distrib/windows32
13+
mkdir -p distrib/windows64
1314

1415
export CGO_ENABLED=0
1516

1617
GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater
1718
GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater
1819
GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater
1920
GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater
20-
GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe
21+
GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows32/updater.exe
22+
GOOS=windows GOARCH=amd64 go build -o distrib/windows64/updater.exe
2123

2224
#export CGO_ENABLED=1
2325
# need osxcross in path
@@ -27,7 +29,8 @@ cp -r firmwares distrib/linux64
2729
cp -r firmwares distrib/linux32
2830
cp -r firmwares distrib/linuxarm
2931
cp -r firmwares distrib/linuxarm64
30-
cp -r firmwares distrib/windows
32+
cp -r firmwares distrib/windows32
33+
cp -r firmwares distrib/windows64
3134
cp -r firmwares distrib/osx
3235

3336
cd distrib/linux64 && tar cjf ../${FILENAME}-${VERSION}-linux64.tar.bz2 * && cd -
@@ -50,9 +53,13 @@ cd distrib/osx && tar cjf ../${FILENAME}-${VERSION}-osx.tar.bz2 * && cd -
5053
OSX_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-osx.tar.bz2 | cut -f1 -d " "`
5154
OSX_SIZE=`ls -la distrib/${FILENAME}-${VERSION}-osx.tar.bz2 | cut -f5 -d " "`
5255

53-
cd distrib/windows && zip -r ../${FILENAME}-${VERSION}-windows.zip * && cd -
54-
WINDOWS_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-windows.zip | cut -f1 -d " "`
55-
WINDOWS_SIZE=`ls -la distrib/${FILENAME}-${VERSION}-windows.zip | cut -f5 -d " "`
56+
cd distrib/windows32 && zip -r ../${FILENAME}-${VERSION}-windows32.zip * && cd -
57+
WINDOWS32_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-windows32.zip | cut -f1 -d " "`
58+
WINDOWS32_SIZE=`ls -la distrib/${FILENAME}-${VERSION}-windows32.zip | cut -f5 -d " "`
59+
60+
cd distrib/windows64 && zip -r ../${FILENAME}-${VERSION}-windows64.zip * && cd -
61+
WINDOWS64_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-windows64.zip | cut -f1 -d " "`
62+
WINDOWS64_SIZE=`ls -la distrib/${FILENAME}-${VERSION}-windows64.zip | cut -f5 -d " "`
5663

5764

5865
echo "=============================="
@@ -72,8 +79,10 @@ sed "s/%%LINUXARM64_SHA%%/${LINUXARM64_SHA}/" |
7279
sed "s/%%LINUXARM64_SIZE%%/${LINUXARM64_SIZE}/" |
7380
sed "s/%%OSX_SHA%%/${OSX_SHA}/" |
7481
sed "s/%%OSX_SIZE%%/${OSX_SIZE}/" |
75-
sed "s/%%WINDOWS_SHA%%/${WINDOWS_SHA}/" |
76-
sed "s/%%WINDOWS_SIZE%%/${WINDOWS_SIZE}/"
82+
sed "s/%%WINDOWS32_SHA%%/${WINDOWS32_SHA}/" |
83+
sed "s/%%WINDOWS32_SIZE%%/${WINDOWS32_SIZE}/" |
84+
sed "s/%%WINDOWS64_SHA%%/${WINDOWS64_SHA}/" |
85+
sed "s/%%WINDOWS64_SIZE%%/${WINDOWS64_SIZE}/"
7786

7887
# call the tool with something like
7988
# ./linux64/updater -flasher firmwares/NINA/FirmwareUpdater.mkrwifi1010.ino.bin -firmware firmwares/NINA/1.2.1/NINA_W102.bin -port /dev/ttyACM0 -address arduino.cc:443 -restore_binary /tmp/arduino_build_619137/WiFiSSLClient.ino.bin -programmer {runtime.tools.bossac}/bossac

extras/package_index.json.template

+9-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,19 @@
1616
"checksum": "SHA-256:%%LINUX64_SHA%%",
1717
"size": "%%LINUX64_SIZE%%"
1818
},
19+
{
20+
"host": "x86_64-mingw32",
21+
"url": "http://downloads.arduino.cc/tools/%%FILENAME%%-%%VERSION%%-windows.zip",
22+
"archiveFileName": "%%FILENAME%%-%%VERSION%%-windows.zip",
23+
"checksum": "SHA-256:%%WINDOWS64_SHA%%",
24+
"size": "%%WINDOWS64_SIZE%%"
25+
},
1926
{
2027
"host": "i686-mingw32",
2128
"url": "http://downloads.arduino.cc/tools/%%FILENAME%%-%%VERSION%%-windows.zip",
2229
"archiveFileName": "%%FILENAME%%-%%VERSION%%-windows.zip",
23-
"checksum": "SHA-256:%%WINDOWS_SHA%%",
24-
"size": "%%WINDOWS_SIZE%%"
30+
"checksum": "SHA-256:%%WINDOWS32_SHA%%",
31+
"size": "%%WINDOWS32_SIZE%%"
2532
},
2633
{
2734
"host": "i386-apple-darwin11",

0 commit comments

Comments
 (0)