Merge pull request #11 from arduino/refactors

Refactors and fix to serial write overrun

Author: cmaglie

README.adoc

@@ -48,9 +48,11 @@ The full list of command line options can be obtained with the `-h` option: `./u
 
 == How to build the tools from source file ==
 
- go get github.com/arduino/FirmwareUpdater/cli
+From the sources root directory run:
 
-This will create a bin folder with `cli` executable in it.
+ go build -o updater
+
+This will create the `updater` executable.
 
 == License ==
 

distrib.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/bash -ex
 
-VERSION=`cd src/github.com/arduino/FirmwareUpdater/cli && git describe --tags`
+VERSION=`git describe --tags`
 FILENAME="FirmwareUpdater"
 
 rm -rf distrib
@@ -13,22 +13,22 @@ mkdir -p distrib/windows
 
 export CGO_ENABLED=0
 
-GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater github.com/arduino/FirmwareUpdater/cli
-GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater github.com/arduino/FirmwareUpdater/cli
-GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater github.com/arduino/FirmwareUpdater/cli
-GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater github.com/arduino/FirmwareUpdater/cli
-GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe github.com/arduino/FirmwareUpdater/cli
+GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater
+GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater
+GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater
+GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater
+GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe
 
 #export CGO_ENABLED=1
 # need osxcross in path
-GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater github.com/arduino/FirmwareUpdater/cli
+GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater
 
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux64
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux32
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm64
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/windows
-cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/osx
+cp -r firmwares distrib/linux64
+cp -r firmwares distrib/linux32
+cp -r firmwares distrib/linuxarm
+cp -r firmwares distrib/linuxarm64
+cp -r firmwares distrib/windows
+cp -r firmwares distrib/osx
 
 cd distrib/linux64 && tar cjf ../${FILENAME}-${VERSION}-linux64.tar.bz2 * && cd -
 LINUX64_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-linux64.tar.bz2 | cut -f1 -d " "`
@@ -59,7 +59,7 @@ echo "=============================="
 echo "BOARD MANAGER SNIPPET"
 echo "=============================="
 
-cat $GOPATH/src/github.com/arduino/FirmwareUpdater/extras/package_index.json.template |
+cat extras/package_index.json.template |
 sed "s/%%VERSION%%/${VERSION}/" |
 sed "s/%%FILENAME%%/${FILENAME}/" |
 sed "s/%%LINUX64_SHA%%/${LINUX64_SHA}/" |
@@ -76,4 +76,4 @@ sed "s/%%WINDOWS_SHA%%/${WINDOWS_SHA}/" |
 sed "s/%%WINDOWS_SIZE%%/${WINDOWS_SIZE}/"
 
 # call the tool with something like
-# ./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
+# ./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