From cd36947561697f11e943ce25d7b43198c9dbaa37 Mon Sep 17 00:00:00 2001 From: Yasser Grimes Date: Mon, 1 Aug 2022 16:46:23 +0300 Subject: [PATCH] McuSupport: Handle projects with "-" in their name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using "-" in a McuSupport project's name will result in errors. This commit fixes that by changing the occurrences of "-" with "_" in the templates used for generating the project. Task-number: QTCREATORBUG-26512 Change-Id: I7e65e3992bf1fa139d008ff5c2221a1098c12b92 Reviewed-by: Reviewed-by: hjk Reviewed-by: Piotr Mućko --- .../mcusupport/wizards/application/CMakeLists.txt | 10 +++++----- src/plugins/mcusupport/wizards/application/wizard.json | 5 +++-- .../mcusupport/wizards/qmlproject/CMakeLists.txt | 8 ++++---- src/plugins/mcusupport/wizards/qmlproject/wizard.json | 7 ++++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/plugins/mcusupport/wizards/application/CMakeLists.txt b/src/plugins/mcusupport/wizards/application/CMakeLists.txt index 4b384653be1..c260ae1f104 100644 --- a/src/plugins/mcusupport/wizards/application/CMakeLists.txt +++ b/src/plugins/mcusupport/wizards/application/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required (VERSION 3.15) -project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) +project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) find_package(Qul) -qul_add_target(%{ProjectName}) -qul_target_qml_sources(%{ProjectName} %{MainQmlFile}) -app_target_setup_os(%{ProjectName}) -app_target_default_entrypoint(%{ProjectName} %{RootItemName}) +qul_add_target(%{CorrectedProjectName}) +qul_target_qml_sources(%{CorrectedProjectName} %{MainQmlFile}) +app_target_setup_os(%{CorrectedProjectName}) +app_target_default_entrypoint(%{CorrectedProjectName} %{RootItemName}) diff --git a/src/plugins/mcusupport/wizards/application/wizard.json b/src/plugins/mcusupport/wizards/application/wizard.json index 93bffa9f6e2..1c9802f3bd4 100644 --- a/src/plugins/mcusupport/wizards/application/wizard.json +++ b/src/plugins/mcusupport/wizards/application/wizard.json @@ -12,8 +12,9 @@ "options": [ - { "key": "MainQmlFile", "value": "%{ProjectName}.qml" }, - { "key": "RootItemName", "value": "%{ProjectName}" }, + { "key": "CorrectedProjectName", "value": "%{JS: '%{ProjectName}'.replace(/-/g, '_')}"}, + { "key": "MainQmlFile", "value": "%{JS: '%{CorrectedProjectName}.qml'}" }, + { "key": "RootItemName", "value": "%{JS: '%{CorrectedProjectName}'}" }, { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" } ], diff --git a/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt b/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt index a1fb2aef795..532918eb0f2 100644 --- a/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt +++ b/src/plugins/mcusupport/wizards/qmlproject/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required (VERSION 3.15) -project(%{ProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) +project(%{CorrectedProjectName} VERSION 0.0.1 LANGUAGES C CXX ASM ASM_MASM) find_package(Qul) -qul_add_target(%{ProjectName} QML_PROJECT %{QmlProjectFile}) -app_target_setup_os(%{ProjectName}) -app_target_default_entrypoint(%{ProjectName} %{RootItemName}) +qul_add_target(%{CorrectedProjectName} QML_PROJECT %{QmlProjectFile}) +app_target_setup_os(%{CorrectedProjectName}) +app_target_default_entrypoint(%{CorrectedProjectName} %{RootItemName}) diff --git a/src/plugins/mcusupport/wizards/qmlproject/wizard.json b/src/plugins/mcusupport/wizards/qmlproject/wizard.json index 71874ff02bc..f0b3bf12ff3 100644 --- a/src/plugins/mcusupport/wizards/qmlproject/wizard.json +++ b/src/plugins/mcusupport/wizards/qmlproject/wizard.json @@ -12,9 +12,10 @@ "options": [ - { "key": "MainQmlFile", "value": "%{ProjectName}.qml" }, - { "key": "QmlProjectFile", "value": "%{ProjectName}.qmlproject" }, - { "key": "RootItemName", "value": "%{ProjectName}" }, + { "key": "CorrectedProjectName", "value": "%{JS: '%{ProjectName}'.replace(/-/g, '_')}"}, + { "key": "MainQmlFile", "value": "%{CorrectedProjectName}.qml" }, + { "key": "QmlProjectFile", "value": "%{CorrectedProjectName}.qmlproject" }, + { "key": "RootItemName", "value": "%{CorrectedProjectName}" }, { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" }, { "key": "ModuleFile", "value": "CustomModule.qmlproject"}, { "key": "QmlComponent", "value": "CustomComponent.qml"}