McuSupport: Convert variables in JSON to qtcreator format

Change-Id: Iaa5abaf024495e14caded27400e1c2933e46854e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/mcusupport/test/armgcc_nxp_1050_json.h

@@ -12,11 +12,8 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "colorDepths": [
       16
     ],
-    "pathEntries": [],
-    "environmentEntries": [],
     "cmakeEntries": [
       {
-        "id": "Qul_DIR",
         "label": "Qt for MCUs SDK",
         "type": "path",
         "cmakeVar": "Qul_ROOT",
@@ -68,7 +65,6 @@ constexpr auto armgcc_nxp_1050_json = R"({
     "boardSdk": {
         "cmakeVar": "QUL_BOARD_SDK_DIR",
         "envVar": "EVKB_IMXRT1050_SDK_PATH",
-        "id": "NXP_SDK_DIR",
         "label": "Board SDK for MIMXRT1050-EVK",
         "optional": false,
         "setting": "EVKB_IMXRT1050_SDK_PATH",
@@ -83,7 +79,7 @@ constexpr auto armgcc_nxp_1050_json = R"({
     },
     "freeRTOS": {
         "cmakeVar": "FREERTOS_DIR",
-        "defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
+        "defaultValue": "%{QUL_BOARD_SDK_DIR}/rtos/freertos/freertos_kernel",
         "envVar": "IMXRT1050_FREERTOS_DIR",
         "label": "FreeRTOS SDK for MIMXRT1050-EVK",
         "optional": false,

src/plugins/mcusupport/test/armgcc_nxp_1064_json.h

@@ -8,7 +8,6 @@ constexpr auto armgcc_nxp_1064_json = R"(
     "boardSdk": {
         "cmakeVar": "QUL_BOARD_SDK_DIR",
         "envVar": "EVK_MIMXRT1064_SDK_PATH",
-        "id": "NXP_SDK_DIR",
         "label": "Board SDK for MIMXRT1064-EVK",
         "optional": false,
         "setting": "EVK_MIMXRT1064_SDK_PATH",
@@ -18,9 +17,8 @@ constexpr auto armgcc_nxp_1064_json = R"(
     "compatVersion": "1",
     "freeRTOS": {
         "cmakeVar": "FREERTOS_DIR",
-        "defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
+        "defaultValue": "%{QUL_BOARD_SDK_DIR}/rtos/freertos/freertos_kernel",
         "envVar": "IMXRT1064_FREERTOS_DIR",
-        "id": "NXP_FREERTOS_DIR",
         "label": "FreeRTOS SDK for MIMXRT1064-EVK",
         "optional": false,
         "setting": "FreeRTOSSourcePackage_IMXRT1064",
@@ -30,7 +28,7 @@ constexpr auto armgcc_nxp_1064_json = R"(
         "cmakeCacheEntries": [
             {
                 "camekVar": "Qul_ROOT",
-                "id": "Qul_DIR",
+                "envVar": "Qul_DIR",
                 "label": "Qt for MCUs SDK",
                 "optional": false,
                 "type": "path"
@@ -39,7 +37,7 @@ constexpr auto armgcc_nxp_1064_json = R"(
                 "camekVar": "MCUXPRESSO_IDE_PATH",
                 "defaultValue": {
                     "unix": "/usr/local/mcuxpressoide/",
-                    "windows": "$ROOT/nxp/MCUXpressoIDE*"
+                    "windows": "%{Env:ROOT}/nxp/MCUXpressoIDE*"
                 },
                 "id": "MCU_XPRESSO_PATH",
                 "label": "MCUXpresso IDE",
@@ -64,8 +62,7 @@ constexpr auto armgcc_nxp_1064_json = R"(
         },
         "file": {
             "camekVar": "CMAKE_TOOLCHAIN_FILE",
-            "defaultValue": "$Qul_ROOT/lib/cmake/Qul/toolchain/armgcc.cmake",
+            "defaultValue": "%{Qul_ROOT}/lib/cmake/Qul/toolchain/armgcc.cmake",
-            "id": "ARMGCC_CMAKE_TOOLCHAIN_FILE",
             "label": "CMake Toolchain File",
             "optional": false,
             "type": "file",

src/plugins/mcusupport/test/armgcc_stm32f769i_freertos_json.h

@@ -85,7 +85,7 @@ constexpr auto armgcc_stm32f769i_freertos_json = R"({
     "envVar": "STM32F7_FREERTOS_DIR",
     "label": "FreeRTOS SDK for STM32F769I-Discovery",
     "cmakeVar": "FREERTOS_DIR",
-    "defaultValue": "$QUL_BOARD_SDK_DIR/Middlewares/Third_Party/FreeRTOS/Source",
+    "defaultValue": "%{QUL_BOARD_SDK_DIR}/Middlewares/Third_Party/FreeRTOS/Source",
     "type": "path",
     "setting": "FreeRTOSSourcePackage_STM32F7",
     "optional": false

src/plugins/mcusupport/test/iar_nxp_1064_json.h

@@ -24,7 +24,7 @@ constexpr auto iar_nxp_1064_json = R"({
     },
     "freeRTOS": {
         "cmakeVar": "FREERTOS_DIR",
-        "defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
+        "defaultValue": "%{QUL_BOARD_SDK_DIR}/rtos/freertos/freertos_kernel",
         "envVar": "IMXRT1064_FREERTOS_DIR",
         "id": "NXP_FREERTOS_DIR",
         "label": "FreeRTOS SDK for MIMXRT1064-EVK",
@@ -45,7 +45,7 @@ constexpr auto iar_nxp_1064_json = R"({
                 "cmakeVar": "MCUXPRESSO_IDE_PATH",
                 "defaultValue": {
                     "unix": "/usr/local/mcuxpressoide/",
-                    "windows": "$ROOT/nxp/MCUXpressoIDE*"
+                    "windows": "%{Env:ROOT}/nxp/MCUXpressoIDE*"
                 }
             }
         ],

src/plugins/mcusupport/test/iar_stm32f469i_metal_json.h

@@ -18,8 +18,8 @@ constexpr auto iar_stm32f469i_metal_json = R"({
         "label": "STM32CubeProgrammer",
         "type": "path",
         "defaultValue": {
-          "windows": "$PROGRAMSANDFILES/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
+          "windows": "%{Env:PROGRAMSANDFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/",
-          "unix": "$HOME/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
+          "unix": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/"
         },
         "optional": false
       }

src/plugins/mcusupport/test/msvc_desktop_json.h

@@ -34,7 +34,7 @@ constexpr auto msvc_desktop_json = R"({
         "19.25","19.26","19.27","19.28","19.29"
     ],
     "compiler": {
-      "defaultValue": "$MSVC_COMPILER_DIR",
+      "defaultValue": "%{Env:MSVC_COMPILER_DIR}",
       "versionDetection" : {
             "filePattern": "cl.exe",
             "executableArgs": "--version",