From 038b839f9eae6092c9d6159d19d495aa4cf4e348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= Date: Fri, 12 Aug 2022 16:14:27 +0200 Subject: [PATCH] McuSupport: Remove unavailable JSON param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit freeRTOS' boardSdkSubDir param in JSON was removed long time ago. It's time to remove corresponding code. Change-Id: I6805aaa51cce599f5505fbc74692ed562f448ad4 Reviewed-by: Reviewed-by: Dawid Śliwa Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportsdk.cpp | 8 +++----- src/plugins/mcusupport/mcusupportsdk.h | 3 +-- src/plugins/mcusupport/mcutargetdescription.h | 1 - .../mcusupport/mcutargetfactorylegacy.cpp | 12 +++++------- src/plugins/mcusupport/test/unittest.cpp | 17 +++++++---------- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 9a2209fbbc6..d5abfe7dba1 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -151,16 +151,15 @@ McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &settingsHandler, McuPackagePtr createFreeRTOSSourcesPackage(const SettingsHandler::Ptr &settingsHandler, const QString &envVar, - const FilePath &boardSdkDir, - const FilePath &freeRTOSBoardSdkSubDir) + const FilePath &boardSdkDir) { const QString envVarPrefix = removeRtosSuffix(envVar); FilePath defaultPath; if (qEnvironmentVariableIsSet(envVar.toLatin1())) defaultPath = FilePath::fromUserInput(qEnvironmentVariable(envVar.toLatin1())); - else if (!boardSdkDir.isEmpty() && !freeRTOSBoardSdkSubDir.isEmpty()) - defaultPath = boardSdkDir / freeRTOSBoardSdkSubDir.toString(); + else if (!boardSdkDir.isEmpty()) + defaultPath = boardSdkDir; return McuPackagePtr{ new McuPackage(settingsHandler, @@ -728,7 +727,6 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data) boardSdkPackage, { freeRTOS.value("envVar").toString(), - FilePath::fromUserInput(freeRTOS.value("boardSdkSubDir").toString()), freeRtosEntries, }}; } diff --git a/src/plugins/mcusupport/mcusupportsdk.h b/src/plugins/mcusupport/mcusupportsdk.h index 88a86ccc74e..8a1b8ed4412 100644 --- a/src/plugins/mcusupport/mcusupportsdk.h +++ b/src/plugins/mcusupport/mcusupportsdk.h @@ -74,8 +74,7 @@ McuToolChainPackagePtr createGhsArmToolchainPackage(const SettingsHandler::Ptr & McuPackagePtr createBoardSdkPackage(const SettingsHandler::Ptr &, const McuTargetDescription &); McuPackagePtr createFreeRTOSSourcesPackage(const SettingsHandler::Ptr &settingsHandler, const QString &envVar, - const Utils::FilePath &boardSdkDir, - const Utils::FilePath &freeRTOSBoardSdkSubDir); + const Utils::FilePath &boardSdkDir); } // namespace Legacy } // namespace McuSupport::Internal diff --git a/src/plugins/mcusupport/mcutargetdescription.h b/src/plugins/mcusupport/mcutargetdescription.h index 83d530706f3..72fa57db851 100644 --- a/src/plugins/mcusupport/mcutargetdescription.h +++ b/src/plugins/mcusupport/mcutargetdescription.h @@ -82,7 +82,6 @@ struct McuTargetDescription struct FreeRTOS { QString envVar; - Utils::FilePath boardSdkSubDir; QList packages; } freeRTOS; }; diff --git a/src/plugins/mcusupport/mcutargetfactorylegacy.cpp b/src/plugins/mcusupport/mcutargetfactorylegacy.cpp index b3c8aa398bf..8bf8b297756 100644 --- a/src/plugins/mcusupport/mcutargetfactorylegacy.cpp +++ b/src/plugins/mcusupport/mcutargetfactorylegacy.cpp @@ -83,13 +83,11 @@ QPair McuTargetFactory::createTargets(const McuTargetDescript // Free RTOS specific settings. if (!desc.freeRTOS.envVar.isEmpty()) { if (!freeRTOSPkgs.contains(desc.freeRTOS.envVar)) { - freeRTOSPkgs - .insert(desc.freeRTOS.envVar, - McuPackagePtr{ - Legacy::createFreeRTOSSourcesPackage(settingsHandler, - desc.freeRTOS.envVar, - boardSdkDefaultPath, - desc.freeRTOS.boardSdkSubDir)}); + freeRTOSPkgs.insert(desc.freeRTOS.envVar, + McuPackagePtr{ + Legacy::createFreeRTOSSourcesPackage(settingsHandler, + desc.freeRTOS.envVar, + boardSdkDefaultPath)}); } required3rdPartyPkgs.insert(freeRTOSPkgs.value(desc.freeRTOS.envVar)); } diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 525317c1c55..bb491d7f5ed 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -30,10 +30,10 @@ #include "armgcc_stm32f769i_freertos_json.h" #include "armgcc_stm32h750b_metal_json.h" #include "gcc_desktop_json.h" -#include "msvc_desktop_json.h" #include "ghs_rh850_d1m1a_baremetal_json.h" #include "iar_nxp_1064_json.h" #include "iar_stm32f469i_metal_json.h" +#include "msvc_desktop_json.h" #include "mcuhelpers.h" #include "mcukitmanager.h" @@ -82,7 +82,7 @@ const char armGccSuffix[]{"bin/arm-none-eabi-g++"}; const char armGccToolchainFilePath[]{"/opt/qtformcu/2.2/lib/cmake/Qul/toolchain/armgcc.cmake"}; const char armGccVersion[]{"9.3.1"}; const char armGccNewVersion[]{"10.3.1"}; -const char msvcVersion[] {"14.29"}; +const char msvcVersion[]{"14.29"}; const QStringList boardSdkVersions{{"2.11.0"}}; const char cmakeToolchainLabel[]{"CMake Toolchain File"}; const char fallbackDir[]{"/abc/def/fallback"}; @@ -207,7 +207,7 @@ void verifyGccToolchain(const McuToolChainPackagePtr &gccPackage, const QStringL QCOMPARE(gccPackage->isDesktopToolchain(), true); QCOMPARE(gccPackage->toolChainName(), "gcc"); QCOMPARE(gccPackage->toolchainType(), McuToolChainPackage::ToolChainType::GCC); - QVERIFY(allOf(versions, [&](const QString &v){ return gccPackage->versions().contains(v);})); + QVERIFY(allOf(versions, [&](const QString &v) { return gccPackage->versions().contains(v); })); } void verifyMsvcToolchain(const McuToolChainPackagePtr &msvcPackage, const QStringList &versions) @@ -218,7 +218,7 @@ void verifyMsvcToolchain(const McuToolChainPackagePtr &msvcPackage, const QStrin QCOMPARE(msvcPackage->toolchainType(), McuToolChainPackage::ToolChainType::MSVC); QCOMPARE(msvcPackage->isDesktopToolchain(), true); QCOMPARE(msvcPackage->toolChainName(), "msvc"); - QVERIFY(allOf(versions, [&](const QString &v){ return msvcPackage->versions().contains(v);})); + QVERIFY(allOf(versions, [&](const QString &v) { return msvcPackage->versions().contains(v); })); } void verifyTargetToolchains(const Targets &targets, @@ -365,7 +365,6 @@ void McuSupportTest::test_parseBasicInfoFromJson() const auto description = parseDescriptionJson(iar_nxp_1064_json); QVERIFY(!description.freeRTOS.envVar.isEmpty()); - QVERIFY(description.freeRTOS.boardSdkSubDir.isEmpty()); } void McuSupportTest::test_parseCmakeEntries() @@ -457,7 +456,7 @@ void McuSupportTest::test_createDesktopGccToolchain() void McuSupportTest::test_legacy_createDesktopMsvcToolchain() { McuToolChainPackagePtr msvcPackage = Legacy::createMsvcToolChainPackage(settingsMockPtr, - {msvcVersion}); + {msvcVersion}); verifyMsvcToolchain(msvcPackage, {msvcVersion}); } @@ -604,10 +603,8 @@ void McuSupportTest::test_createFreeRtosPackageWithCorrectSetting() QFETCH(QString, freeRtosEnvVar); QFETCH(QString, expectedSettingsKey); - McuPackagePtr package{Legacy::createFreeRTOSSourcesPackage(settingsMockPtr, - freeRtosEnvVar, - FilePath{}, - FilePath{})}; + McuPackagePtr package{ + Legacy::createFreeRTOSSourcesPackage(settingsMockPtr, freeRtosEnvVar, FilePath{})}; QVERIFY(package != nullptr); QCOMPARE(package->settingsKey(), expectedSettingsKey);