From 8e15de90c7ab1207e6f4942f715c6685d6538758 Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Tue, 19 Dec 2017 09:37:21 +0000 Subject: [PATCH] Tweak Linux version scripts --- BootLoaders/Boards/avr/tools/linux/do_version | 18 +++++++++++++++++- .../Boards/avr/tools/linux64/do_version | 18 +++++++++++++++++- BootLoaders/Boards/avr/tools/macosx/do_version | 18 +++++++++++++++++- .../Boards/stm32/tools/linux/do_version | 18 +++++++++++++++++- .../Boards/stm32/tools/linux64/do_version | 18 +++++++++++++++++- .../Boards/stm32/tools/macosx/do_version | 18 +++++++++++++++++- 6 files changed, 102 insertions(+), 6 deletions(-) diff --git a/BootLoaders/Boards/avr/tools/linux/do_version b/BootLoaders/Boards/avr/tools/linux/do_version index ba2a182..cfdf7a8 100755 --- a/BootLoaders/Boards/avr/tools/linux/do_version +++ b/BootLoaders/Boards/avr/tools/linux/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=avr +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}') diff --git a/BootLoaders/Boards/avr/tools/linux64/do_version b/BootLoaders/Boards/avr/tools/linux64/do_version index ba2a182..cfdf7a8 100755 --- a/BootLoaders/Boards/avr/tools/linux64/do_version +++ b/BootLoaders/Boards/avr/tools/linux64/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=avr +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}') diff --git a/BootLoaders/Boards/avr/tools/macosx/do_version b/BootLoaders/Boards/avr/tools/macosx/do_version index ba2a182..cfdf7a8 100755 --- a/BootLoaders/Boards/avr/tools/macosx/do_version +++ b/BootLoaders/Boards/avr/tools/macosx/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=avr +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}') diff --git a/BootLoaders/Boards/stm32/tools/linux/do_version b/BootLoaders/Boards/stm32/tools/linux/do_version index b469a5c..cfdf7a8 100755 --- a/BootLoaders/Boards/stm32/tools/linux/do_version +++ b/BootLoaders/Boards/stm32/tools/linux/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=stm +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}') diff --git a/BootLoaders/Boards/stm32/tools/linux64/do_version b/BootLoaders/Boards/stm32/tools/linux64/do_version index b469a5c..cfdf7a8 100755 --- a/BootLoaders/Boards/stm32/tools/linux64/do_version +++ b/BootLoaders/Boards/stm32/tools/linux64/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=stm +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}') diff --git a/BootLoaders/Boards/stm32/tools/macosx/do_version b/BootLoaders/Boards/stm32/tools/macosx/do_version index b469a5c..cfdf7a8 100755 --- a/BootLoaders/Boards/stm32/tools/macosx/do_version +++ b/BootLoaders/Boards/stm32/tools/macosx/do_version @@ -6,7 +6,23 @@ SKETCH_PATH=$3 MULTI_BOARD=$4 EXPORT_FLAG=$5 -MULTI_TYPE=stm +case "$MULTI_BOARD" in + MULTI_NO_BOOT) + MULTI_TYPE=avr + ;; + MULTI_FLASH_FROM_TX) + MULTI_TYPE=avr + ;; + MULTI_STM32_NO_BOOT) + MULTI_TYPE=stm + ;; + MULTI_STM32_FLASH_FROM_TX) + MULTI_TYPE=stm + ;; + MULTI_ORANGERX) + MULTI_TYPE=orx + ;; +esac if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')