feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Update test json headers for TraveoII board

Browse Source 
Reflect changes in QUL repo that allow for correct SDK and GHS compiler
version detection.

Change-Id: Ibc54f45ef214227db5681c33b3278dc52f5bdde6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Daniele Bortolotti
2022-10-31 14:21:16 +01:00
parent 7fa756663c
commit e16a5c8d0e
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/mcusupport/test/ghs_tviic2d4m_baremetal_json.h
View File

@@ -29,7 +29,7 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"toolchain": { "toolchain": {
"id": "arm-greenhills", "id": "arm-greenhills",
"versions": [ "versions": [
"201954" "2019.5.4"
], ],
"compiler": { "compiler": {
"id": "GHS_ARM_DIR", "id": "GHS_ARM_DIR",
@@ -38,7 +38,13 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"setting": "GHSArmToolchain", "setting": "GHSArmToolchain",
"detectionPath": "cxarm.exe", "detectionPath": "cxarm.exe",
"type": "path", "type": "path",
"optional": false "optional": false,
"versionDetection": {
"filePattern": "gversion.exe",
"executableArgs": "-help",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": "cxarm.exe"
}, },
"file": { "file": {
"id": "GHS_ARM_CMAKE_TOOLCHAIN_FILE", "id": "GHS_ARM_CMAKE_TOOLCHAIN_FILE",
@@ -59,7 +65,9 @@ constexpr auto ghs_tviic2d4m_baremetal_json = R"(
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"optional": false "optional": false,
"versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+"
} }
} }
)"; )";

14
src/plugins/mcusupport/test/ghs_tviic2d6m_baremetal_json.h
View File

@@ -29,7 +29,7 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"toolchain": { "toolchain": {
"id": "arm-greenhills", "id": "arm-greenhills",
"versions": [ "versions": [
"201954" "2019.5.4"
], ],
"compiler": { "compiler": {
"id": "GHS_ARM_DIR", "id": "GHS_ARM_DIR",
@@ -38,7 +38,13 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"setting": "GHSArmToolchain", "setting": "GHSArmToolchain",
"detectionPath": "cxarm.exe", "detectionPath": "cxarm.exe",
"type": "path", "type": "path",
"optional": false "optional": false,
"versionDetection": {
"filePattern": "gversion.exe",
"executableArgs": "-help",
"regex": "\\bv(\\d+\\.\\d+\\.\\d+)\\b"
},
"detectionPath": "cxarm.exe"
}, },
"file": { "file": {
"id": "GHS_ARM_CMAKE_TOOLCHAIN_FILE", "id": "GHS_ARM_CMAKE_TOOLCHAIN_FILE",
@@ -59,7 +65,9 @@ constexpr auto ghs_tviic2d6m_baremetal_json = R"(
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"optional": false "optional": false,
"versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+"
} }
} }
)"; )";

4
src/plugins/mcusupport/test/iar_tviic2d6m_baremetal_json.h
View File

@@ -68,7 +68,9 @@ constexpr auto iar_tviic2d6m_baremetal_json = R"(
"label": "Graphics Driver for Traveo II Cluster Series", "label": "Graphics Driver for Traveo II Cluster Series",
"cmakeVar": "QUL_BOARD_SDK_DIR", "cmakeVar": "QUL_BOARD_SDK_DIR",
"type": "path", "type": "path",
"optional": false "optional": false,
"versionDetection": {
"regex": "V\\w+\\.\\d+\\.\\d+"
} }
} }
)"; )";