Merge branch 'feat/unify-firmware-tags'

Author: NickeZ

CMakeLists.txt

@@ -97,7 +97,6 @@ endif()
 # Versions MUST contain three parts and start with lowercase 'v'.
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
 set(FIRMWARE_VERSION "v9.24.0")
-set(FIRMWARE_BTC_ONLY_VERSION "v9.24.0")
 set(BOOTLOADER_VERSION "v1.1.2")
 
 find_package(PythonInterp 3.6 REQUIRED)
@@ -115,16 +114,6 @@ if(GIT_FOUND AND PYTHONINTERP_FOUND)
   if(NOT exit_code EQUAL "0")
     message(FATAL_ERROR "get_version firmware failed")
   endif()
-  execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} ./scripts/get_version firmware-btc-only --check-semver --check-gpg
-    RESULT_VARIABLE exit_code
-    OUTPUT_VARIABLE GIT_FIRMWARE_BTC_ONLY_VERSION_STRING
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(NOT exit_code EQUAL "0")
-    message(FATAL_ERROR "get_version firmware-btc-only failed")
-  endif()
   execute_process(
     COMMAND ${PYTHON_EXECUTABLE} ./scripts/get_version bootloader --check-semver --check-gpg
     RESULT_VARIABLE exit_code
@@ -158,14 +147,11 @@ if(GIT_FOUND AND PYTHONINTERP_FOUND)
   endif()
 else()
   set(GIT_FIRMWARE_VERSION_STRING "v0.0.0")
-  set(GIT_FIRMWARE_BTC_ONLY_VERSION_STRING "v0.0.0")
   set(GIT_BOOTLOADER_VERSION_STRING "v0.0.0")
   set(GIT_COMMIT_HASH "0000000000000000000000000000000000000000")
   set(GIT_COMMIT_HASH_SHORT "0000000000")
 endif()
 
-# MULTI
-
 # If the current HEAD is not on the matching tag append '-pre' for "pre-release"
 set(FIRMWARE_VERSION_FULL ${FIRMWARE_VERSION})
 if(NOT FIRMWARE_VERSION STREQUAL GIT_FIRMWARE_VERSION_STRING)
@@ -184,26 +170,6 @@ set(FIRMWARE_VERSION_MAJOR ${MAJOR})
 set(FIRMWARE_VERSION_MINOR ${MINOR})
 set(FIRMWARE_VERSION_PATCH ${PATCH})
 
-# BTC-ONLY
-
-# If the current HEAD is not on the matching tag append '-pre' for "pre-release"
-set(FIRMWARE_BTC_ONLY_VERSION_FULL ${FIRMWARE_BTC_ONLY_VERSION})
-if(NOT FIRMWARE_BTC_ONLY_VERSION STREQUAL GIT_FIRMWARE_BTC_ONLY_VERSION_STRING)
-  string(APPEND FIRMWARE_BTC_ONLY_VERSION_FULL "-pre+${GIT_COMMIT_HASH_SHORT}")
-endif()
-
-string(REPLACE "." ";" VERSION_LIST ${FIRMWARE_BTC_ONLY_VERSION})
-list(GET VERSION_LIST 0 vMAJOR)
-list(GET VERSION_LIST 1 MINOR_BTC_ONLY)
-list(GET VERSION_LIST 2 PATCH_BTC_ONLY)
-string(REPLACE "v" "" MAJOR_BTC_ONLY ${vMAJOR})
-
-string(LENGTH ${FIRMWARE_BTC_ONLY_VERSION_FULL} FIRMWARE_BTC_ONLY_VERSION_FULL_LEN)
-string(REGEX REPLACE "(.)" "'\\1', 0, " FIRMWARE_BTC_ONLY_VERSION_FULL_W16 ${FIRMWARE_BTC_ONLY_VERSION_FULL})
-set(FIRMWARE_BTC_ONLY_VERSION_MAJOR ${MAJOR_BTC_ONLY})
-set(FIRMWARE_BTC_ONLY_VERSION_MINOR ${MINOR_BTC_ONLY})
-set(FIRMWARE_BTC_ONLY_VERSION_PATCH ${PATCH_BTC_ONLY})
-
 # BOOTLOADER
 
 set(BOOTLOADER_VERSION_FULL ${BOOTLOADER_VERSION})
@@ -262,8 +228,6 @@ message(STATUS "\n\n=============================================")
 message(STATUS "            - General -")
 message(STATUS "Firmware version:       ${FIRMWARE_VERSION_FULL}")
 message(STATUS "Firmware v. (git):      ${GIT_FIRMWARE_VERSION_STRING}")
-message(STATUS "Firmware-btc version:   ${FIRMWARE_BTC_ONLY_VERSION_FULL}")
-message(STATUS "Firmware-btc v. (git):  ${GIT_FIRMWARE_BTC_ONLY_VERSION_STRING}")
 message(STATUS "Bootloader version:     ${BOOTLOADER_VERSION_FULL}")
 message(STATUS "Bootloader v. (git):    ${GIT_BOOTLOADER_VERSION_STRING}")
 message(STATUS "CMake version:          ${CMAKE_VERSION}")

src/version.h.in

@@ -2,10 +2,6 @@
 #define VERSION_H
 
 #include <platform/platform_config.h>
-
-// TOOD(nc): Create versions for factorysetup
-#if (PRODUCT_BITBOX_MULTI == 1) || (PRODUCT_BITBOX_PLUS_MULTI == 1) || \
-    (PRODUCT_BITBOX02_FACTORYSETUP == 1)
 /* Standard firmware */
 #define DIGITAL_BITBOX_VERSION "@FIRMWARE_VERSION_FULL@"
 #define DIGITAL_BITBOX_VERSION_SHORT "@FIRMWARE_VERSION@"
@@ -17,22 +13,6 @@
 #define DIGITAL_BITBOX_VERSION_MINOR @FIRMWARE_VERSION_MINOR@
 #define DIGITAL_BITBOX_VERSION_PATCH @FIRMWARE_VERSION_PATCH@
 
-#elif PRODUCT_BITBOX_BTCONLY == 1 || PRODUCT_BITBOX_PLUS_BTCONLY == 1
-/* BTC only firmware */
-#define DIGITAL_BITBOX_VERSION "@FIRMWARE_BTC_ONLY_VERSION_FULL@"
-#define DIGITAL_BITBOX_VERSION_SHORT "@FIRMWARE_BTC_ONLY_VERSION@"
-
-#define DIGITAL_BITBOX_VERSION_LEN @FIRMWARE_BTC_ONLY_VERSION_FULL_LEN@
-#define DIGITAL_BITBOX_VERSION_W16 @FIRMWARE_BTC_ONLY_VERSION_FULL_W16@
-
-#define DIGITAL_BITBOX_VERSION_MAJOR @FIRMWARE_BTC_ONLY_VERSION_MAJOR@
-#define DIGITAL_BITBOX_VERSION_MINOR @FIRMWARE_BTC_ONLY_VERSION_MINOR@
-#define DIGITAL_BITBOX_VERSION_PATCH @FIRMWARE_BTC_ONLY_VERSION_PATCH@
-
-#else
-#error "Invalid product"
-#endif
-
 // TODO: Add hash somewhere were it can be read out
 #define DIGITAL_BITBOX_GITHASH "@GIT_COMMIT_HASH@"
 #define DIGITAL_BITBOX_GITHASH_SHORT "@GIT_COMMIT_HASH_SHORT@"