diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index dd06240d507..d68a8e9ea88 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -368,8 +368,8 @@ McuPackagePtr createStm32CubeProgrammerPackage(const SettingsHandler::Ptr &setti FilePath defaultPath = {}; const FilePath detectionPath = FilePath::fromUserInput( - QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "bin/STM32_Programmer_CLI.exe" - : "bin/STM32_Programmer.sh")); + QLatin1String(Utils::HostOsInfo::isWindowsHost() ? "STM32_Programmer_CLI.exe" + : "STM32_Programmer.sh")); return McuPackagePtr{ new McuPackage(settingsHandler, diff --git a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h index 3b1ef8172f7..5a4f2cf0617 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f469i_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f469i_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h index 62171d73334..40a075e92a9 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f769i_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h index d6e28c6c429..783561df426 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32f769i_discovery_freertos_json.h @@ -20,12 +20,12 @@ constexpr auto armgcc_stm32f769i_discovery_freertos_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h index a2819c8cf8a..b8ae6d3c9ae 100644 --- a/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/armgcc_stm32h750b_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto armgcc_stm32h750b_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h index af961af20d6..0b1741cf63c 100644 --- a/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f469i_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto iar_stm32f469i_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h index 4b7c3fb8223..b4ea6ca8fd9 100644 --- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto iar_stm32f769i_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h index 198d008be81..d378be51564 100644 --- a/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h +++ b/src/plugins/mcusupport/test/iar_stm32f769i_discovery_freertos_json.h @@ -20,12 +20,12 @@ constexpr auto iar_stm32f769i_discovery_freertos_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h index cec5412f71e..0e3faaf1884 100644 --- a/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h +++ b/src/plugins/mcusupport/test/iar_stm32h750b_discovery_baremetal_json.h @@ -20,12 +20,12 @@ constexpr auto iar_stm32h750b_discovery_baremetal_json = R"( "type": "path", "setting": "Stm32CubeProgrammer", "defaultValue": { - "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/", - "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/" + "windows": "%{Env:PROGRAMFILES}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin", + "linux": "%{Env:HOME}/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin" }, "detectionPath": { - "windows": "bin/STM32_Programmer_CLI.exe", - "linux": "bin/STM32_Programmer.sh" + "windows": "STM32_Programmer_CLI.exe", + "linux": "STM32_Programmer.sh" }, "optional": false, "addToSystemPath": true diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 887ad6e4cf8..69ac5e06627 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -139,8 +139,8 @@ const char stmCubeProgrammerSetting[]{"Stm32CubeProgrammer"}; const char stmCubeProgrammerLabel[]{"STM32CubeProgrammer"}; const QString stmCubeProgrammerPath{QString{defaultToolPath} + "/bin"}; const QString stmCubeProgrammerDetectionPath{HostOsInfo::isWindowsHost() - ? QString("bin/STM32_Programmer_CLI.exe") - : QString("bin/STM32_Programmer.sh")}; + ? QString("STM32_Programmer_CLI.exe") + : QString("STM32_Programmer.sh")}; const char renesasProgrammerSetting[]{"RenesasFlashProgrammer"}; const char renesasProgrammerCmakeVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"};