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

McuSupport: CMake expects programmer path to include the bin folder

Browse Source 
Change-Id: I193dc5d30abfa50830ca93c61af8eeb985fe9c4f
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Rainer Keller
2022-11-01 09:06:21 +01:00
parent b23d066f9d
commit e558fc4d1f
10 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mcusupport/mcusupportsdk.cpp
View File

@@ -368,8 +368,8 @@ McuPackagePtr createStm32CubeProgrammerPackage(const SettingsHandler::Ptr &setti
FilePath defaultPath = {}; FilePath defaultPath = {};
const FilePath detectionPath = FilePath::fromUserInput( const FilePath detectionPath = FilePath::fromUserInput(
QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "bin/STM32_Programmer_CLI.exe" QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "STM32_Programmer_CLI.exe"
: "bin/STM32_Programmer.sh")); : "STM32_Programmer.sh"));
return McuPackagePtr{ return McuPackagePtr{
new McuPackage(settingsHandler, new McuPackage(settingsHandler,

8
src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f469i_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f769i_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f769i_discovery_freertos_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto armgcc_stm32h750b_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto iar_stm32f469i_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto iar_stm32f769i_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto iar_stm32f769i_discovery_freertos_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

8
src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h
View File

@@ -20,12 +20,12 @@ constexpr auto iar_stm32h750b_discovery_baremetal_json = R"(
"type": "path", "type": "path",
"setting": "Stm32CubeProgrammer", "setting": "Stm32CubeProgrammer",
"defaultValue": { "defaultValue": {
"windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
"linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin"
}, },
"detectionPath": { "detectionPath": {
"windows": "bin/STM32_Programmer_CLI.exe", "windows": "STM32_Programmer_CLI.exe",
"linux": "bin/STM32_Programmer.sh" "linux": "STM32_Programmer.sh"
}, },
"optional": false, "optional": false,
"addToSystemPath": true "addToSystemPath": true

4
src/plugins/mcusupport/test/unittest.cpp
View File

@@ -139,8 +139,8 @@ const char stmCubeProgrammerSetting[]{"Stm32CubeProgrammer"};
const char stmCubeProgrammerLabel[]{"STM32CubeProgrammer"}; const char stmCubeProgrammerLabel[]{"STM32CubeProgrammer"};
const QString stmCubeProgrammerPath{QString{defaultToolPath} + "/bin"}; const QString stmCubeProgrammerPath{QString{defaultToolPath} + "/bin"};
const QString stmCubeProgrammerDetectionPath{HostOsInfo::isWindowsHost() const QString stmCubeProgrammerDetectionPath{HostOsInfo::isWindowsHost()
? QString("bin/STM32_Programmer_CLI.exe") ? QString("STM32_Programmer_CLI.exe")
: QString("bin/STM32_Programmer.sh")}; : QString("STM32_Programmer.sh")};
const char renesasProgrammerSetting[]{"RenesasFlashProgrammer"}; const char renesasProgrammerSetting[]{"RenesasFlashProgrammer"};
const char renesasProgrammerCmakeVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"}; const char renesasProgrammerCmakeVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"};