Simplifies naming convention for RTOS Source location. (#1717)

***NO_CI***

Author: networkfusion

.vscode/cmake-variants.TEMPLATE.json

@@ -38,12 +38,11 @@
           "DP_FLOATINGPOINT": "<OFF-default-ON-for-adding-support-for-double-precision-floating-point>",
           "SUPPORT_ANY_BASE_CONVERSION": "<OFF-default-ON-for-adding-support-for-conversion-strings-to-values-on-any-base>",
           "RTOS": "<one-of-valid-rtos-options-CHIBIOS-FREERTOS-FREERTOS_ESP32-TI_SIMPLELINK>",
-          "CHIBIOS_SOURCE": "<path-to-chibios-source-mind-the-forward-slash>",
+          "RTOS_SOURCE_FOLDER": "<path-to-RTOS-source-folder-if-supported-mind-the-forward-slash>",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF-default-ON-to-include_ChibiOS-Contrib-repository-in-the-build",
           "CHIBIOS_CONTRIB_SOURCE": "<path-to-local-ChibiOS-contrib-source-mind-the-forward-slash>",
           "FREERTOS_BOARD": "<valid-freertos-board-name-from-boards-collection>",
           "FREERTOS_VERSION": "<valid-freertos-version-if-empty-use-default-set-cmake>",
-          "FREERTOS_SOURCE": "<path-to-freertos-source-mind-the-forward-slash>",
           "CMSIS_SOURCE": "<path-to-cmsis-source-mind-the-forward-slash>",
           "CMSIS_VERSION": "<valid-cmsis-version-if-empty-use-default-set-cmake>",
           "CHIBIOS_BOARD": "<valid-chibios-board-name-from-boards-collection>",

CMakeSettings.SAMPLE.json

@@ -299,7 +299,7 @@
           "type": "STRING"
         },
         {
-          "name": "CHIBIOS_SOURCE",
+          "name": "RTOS_SOURCE_FOLDER",
           "value": "C:/usr/src/NanoFramework/ChibiOS",
           "type": "PATH"
         },

CMakeSettings.json

@@ -48,7 +48,7 @@
           "value": "ST_STM32F769I_DISCOVERY"
         },
         {
-          "name": "CHIBIOS_SOURCE",
+          "name": "RTOS_SOURCE_FOLDER",
           "value": "E:/GitHub/ChibiOS"
         },
         {

targets/CMSIS-OS/ChibiOS/CMakeLists.txt

@@ -23,11 +23,11 @@ if(DEFINED TOOL_HEX2DFU_PREFIX)
     endif()
 endif()
 
-# check if CHIBIOS_SOURCE was specified or if it's empty (default is empty)
-set(NO_CHIBIOS_SOURCE TRUE)
-if(CHIBIOS_SOURCE)
-    if(NOT "${CHIBIOS_SOURCE}" STREQUAL "")
-        set(NO_CHIBIOS_SOURCE FALSE)
+# check if RTOS_SOURCE_FOLDER was specified or if it's empty (default is empty)
+set(NO_RTOS_SOURCE_FOLDER TRUE)
+if(RTOS_SOURCE_FOLDER)
+    if(NOT "${RTOS_SOURCE_FOLDER}" STREQUAL "")
+        set(NO_RTOS_SOURCE_FOLDER FALSE)
     endif()
 endif()
 
@@ -39,7 +39,7 @@ if(CHIBIOS_CONTRIB_SOURCE)
     endif()
 endif()
 
-if(NO_CHIBIOS_SOURCE)
+if(NO_RTOS_SOURCE_FOLDER)
     # no CHIBIOS source specified, download it from it's repo
 
     # check for Git (needed here for advanced warning to user if it's not installed)
@@ -93,21 +93,21 @@ else()
     # ChibiOS source was specified
 
     # sanity check is source path exists
-    if(EXISTS "${CHIBIOS_SOURCE}/")
-        message(STATUS "RTOS is: ChibiOS (source from: ${CHIBIOS_SOURCE})")
+    if(EXISTS "${RTOS_SOURCE_FOLDER}/")
+        message(STATUS "RTOS is: ChibiOS (source from: ${RTOS_SOURCE_FOLDER})")
 
         # check if we already have the sources, no need to copy again
         NF_DIRECTORY_EXISTS_NOT_EMPTY(${CMAKE_BINARY_DIR}/ChibiOS_Source/ SOURCE_EXISTS)
 
         if(NOT ${SOURCE_EXISTS})
-            file(COPY "${CHIBIOS_SOURCE}/" DESTINATION "${CMAKE_BINARY_DIR}/ChibiOS_Source")
+            file(COPY "${RTOS_SOURCE_FOLDER}/" DESTINATION "${CMAKE_BINARY_DIR}/ChibiOS_Source")
         else()
-            message(STATUS "Using local cache of ChibiOS source from ${CHIBIOS_SOURCE}")
+            message(STATUS "Using local cache of ChibiOS source from ${RTOS_SOURCE_FOLDER}")
         endif()
 
         set(CHIBIOS_INCLUDE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source/include)
     else()
-        message(FATAL_ERROR "Couldn't find ChibiOS source at ${CHIBIOS_SOURCE}/")
+        message(FATAL_ERROR "Couldn't find ChibiOS source at ${RTOS_SOURCE_FOLDER}/")
     endif()
 
     # add ChibiOS as external project

targets/CMSIS-OS/ChibiOS/MBN_QUAIL/cmake-variants.json

@@ -31,8 +31,8 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "RTOS": "CHIBIOS",
           "TARGET_SERIES": "STM32F4xx",
-          "CHIBIOS_SOURCE": "",
-          "CHIBIOS_BOARD": "MBN_QUAIL",
+          "RTOS_SOURCE_FOLDER": "",
+          "RTOS_BOARD": "MBN_QUAIL",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",
           "STM32_CUBE_PACKAGE_REQUIRED": "OFF",

targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/cmake-variants.json

@@ -31,7 +31,7 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "RTOS": "CHIBIOS",
           "TARGET_SERIES": "STM32F4xx",
-          "CHIBIOS_SOURCE": "",
+          "RTOS_SOURCE_FOLDER": "",
           "CHIBIOS_BOARD": "NETDUINO3_WIFI",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",

targets/CMSIS-OS/ChibiOS/ORGPAL_PALTHREE/cmake-variants.json

@@ -31,7 +31,7 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "RTOS": "CHIBIOS",
           "TARGET_SERIES": "STM32F7xx",
-          "CHIBIOS_SOURCE": "",
+          "RTOS_SOURCE_FOLDER": "",
           "CHIBIOS_BOARD": "ORGPAL_PALTHREE",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",

targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/cmake-variants.json

@@ -31,7 +31,7 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "TARGET_SERIES": "STM32F0xx",
           "RTOS": "CHIBIOS",
-          "CHIBIOS_SOURCE": "",
+          "RTOS_SOURCE_FOLDER": "",
           "CHIBIOS_BOARD": "ST_NUCLEO64_F091RC",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",

targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/cmake-variants.json

@@ -31,7 +31,7 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "RTOS": "CHIBIOS",
           "TARGET_SERIES": "STM32F4xx",
-          "CHIBIOS_SOURCE": "",
+          "RTOS_SOURCE_FOLDER": "",
           "CHIBIOS_BOARD": "ST_STM32F429I_DISCOVERY",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",

targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/cmake-variants.json

@@ -31,7 +31,7 @@
           "TOOL_HEX2DFU_PREFIX": "<absolute-path-to-hex2dfu-mind-the-forward-slashes>",
           "RTOS": "CHIBIOS",
           "TARGET_SERIES": "STM32F7xx",
-          "CHIBIOS_SOURCE": "",
+          "RTOS_SOURCE_FOLDER": "",
           "CHIBIOS_BOARD": "ST_STM32F769I_DISCOVERY",
           "CHIBIOS_CONTRIB_REQUIRED": "OFF",
           "CHIBIOS_CONTRIB_SOURCE": "",