qbsp: fix replace tags

@TARGET@ was used twice for different things and other tags were used
with wrong content. Installer content now follows closer to the online
content.

Task-number: QTBUG-66010
Change-Id: I6a10f765fa582da2025134f268c6ee35b74ac8c6
Reviewed-by: Ilari Ängeslevä <ilari.angesleva@qt.io>

4 files changed, 12 insertions, 11 deletions

diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml
index 80a02e8..5f16dfa 100644
--- a/files/qbsp/base_package.xml
+++ b/files/qbsp/base_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@NAME@</DisplayName>
+  <DisplayName>@TARGET@</DisplayName>
   <Description>@NAME@ for @TARGET@</Description>
   <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
 </Package>
diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml
index a3fe0cc..27e5f2e 100644
--- a/files/qbsp/image_package.xml
+++ b/files/qbsp/image_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@MACHINE@ Linux System</DisplayName>
+  <DisplayName>@TARGET@ Linux System</DisplayName>
   <Description>System image for @TARGET@ hardware</Description>
   <DownloadableArchives>image.7z</DownloadableArchives>
 </Package>
diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
index 15e9570..4afab71 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/files/qbsp/toolchain_installscript.qs
@@ -38,6 +38,7 @@ Component.prototype.createOperations = function()
     var device = "@MACHINE@"
     var platform = "@NAME@"
     var sysroot = "@SYSROOT@"
+    var target_sys = "@TARGET_SYS@"
     var target = "@TARGET@"
     var abi = "@ABI@"
     var installPath = "@INSTALLPATH@/toolchain"
@@ -71,8 +72,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
-        "--name", "GCC (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gcc" + executableExt,
+        "--name", "GCC (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "--abi", abi,
         "--language", "1",
         "UNDOEXECUTE",
@@ -81,8 +82,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".g++",
-        "--name", "G++ (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt,
+        "--name", "G++ (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
         "--abi", abi,
         "--language", "2",
         "UNDOEXECUTE",
@@ -91,9 +92,9 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addDebugger",
         "--id", debuggerId,
-        "--name", "GDB (Boot2Qt " + platform + ")",
+        "--name", "GDB (" + platform + " " + target + ")",
         "--engine", "1",
-        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt,
+        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gdb" + executableExt,
         "--abis", abi,
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmDebugger", "--id", debuggerId]);
@@ -101,7 +102,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addQt",
          "--id", qtId,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
          "UNDOEXECUTE",
@@ -110,7 +111,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addKit",
          "--id", basecomponent,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--mkspec", "devices/linux-oe-generic-g++",
          "--qt", qtId,
          "--debuggerid", debuggerId,
diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml
index b578fc9..166e09b 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/files/qbsp/toolchain_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@MACHINE@ Linux Toolchain</DisplayName>
+  <DisplayName>@TARGET@ Linux Toolchain</DisplayName>
   <Description>Toolchain and system root for @TARGET@</Description>
   <DownloadableArchives>toolchain.7z</DownloadableArchives>
   <Dependencies>qt.tools.qtcreator</Dependencies>