From 98667b1af87f71baa12a3bbde75cc3a28eb4513c Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 20 Apr 2017 14:04:06 -0700 Subject: Turn on build saving and uf2 creation. --- tools/build_adafruit_bins.sh | 16 +++++++++++++--- tools/uf2 | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) create mode 160000 tools/uf2 (limited to 'tools') diff --git a/tools/build_adafruit_bins.sh b/tools/build_adafruit_bins.sh index 8dcbb274e..c8693f43f 100755 --- a/tools/build_adafruit_bins.sh +++ b/tools/build_adafruit_bins.sh @@ -5,15 +5,25 @@ ATMEL_BOARDS="arduino_zero circuitplayground_express feather_m0_basic feather_m0 for board in $ATMEL_BOARDS; do make -C atmel-samd BOARD=$board + (( exit_status = exit_status || $? )) done make -C esp8266 BOARD=feather_huzzah +(( exit_status = exit_status || $? )) version=`git describe --tags --exact-match` if [ $? -ne 0 ]; then - version=`git rev-parse --short HEAD` + version=`date +%Y%m%d`-`git rev-parse --short HEAD` fi for board in $ATMEL_BOARDS; do - cp atmel-samd/build-$board/firmware.bin bin/adafruit-circuitpython-$board-$version.bin + mkdir -p bin/$board/ + cp atmel-samd/build-$board/firmware.bin bin/$board/adafruit-circuitpython-$board-$version.bin + (( exit_status = exit_status || $? )) + python2 tools/uf2/utils/uf2conv.py -c -o bin/$board/adafruit-circuitpython-$board-$version.uf2 bin/$board/adafruit-circuitpython-$board-$version.bin + (( exit_status = exit_status || $? )) done -cp esp8266/build/firmware-combined.bin bin/adafruit-circuitpython-feather_huzzah-$version.bin +mkdir -p bin/esp8266/ +cp esp8266/build/firmware-combined.bin bin/esp8266/adafruit-circuitpython-feather_huzzah-$version.bin +(( exit_status = exit_status || $? )) + +exit $exit_status diff --git a/tools/uf2 b/tools/uf2 new file mode 160000 index 000000000..449f26673 --- /dev/null +++ b/tools/uf2 @@ -0,0 +1 @@ +Subproject commit 449f26673855736dbc0fc3f18d72403f25f62974 -- cgit v1.2.3