Preliminary fix for MinGW toolchain 32 vs 64 bit issues on qtenv2.bat

During installation MinGW toolchain paths might get mixed on qtenv2.bat.
Set explicitly different variables for 32 and 64 bit binaries to avoid
possible runtime mix up.

Unify also architecture strings according other Qt packaging configs.

Task-number: QTBUG-73783
Change-Id: I0e21f1130928966dd63448339ad2dcad23e24b03
Reviewed-by: Antti Kokko <antti.kokko@qt.io>

2 files changed, 15 insertions, 15 deletions

diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs
index 79821af29..f23c74158 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win32_mingw730/meta/installscript.qs
@@ -31,7 +31,7 @@
 function Component()
 {
     installer.valueChanged.connect( this, Component.prototype.reactOnTargetDirChange );
-    // set the default values to MINGW730_DIR
+    // set the default values to MINGW730_32_DIR
     Component.prototype.reactOnTargetDirChange("TargetDir", installer.value("TargetDir"));
 }
 
@@ -39,7 +39,7 @@ Component.prototype.reactOnTargetDirChange = function(key, value)
 {
     if (key == "TargetDir") {
         var path = value + "%TARGET_INSTALL_DIR%";
-        installer.setValue("MINGW730_DIR", path.replace(/\\/g, "/"));
+        installer.setValue("MINGW730_32_DIR", path.replace(/\\/g, "/"));
     }
 }
 
@@ -61,7 +61,7 @@ Component.prototype.createOperations = function()
                                    ["{0,2}", "@SDKToolBinary@", "addTC",
                                     "--id", tcId + ".gcc",
                                     "--name", "MinGW 7.3.0 32-bit for C",
-                                    "--path", "@MINGW730_DIR@/bin/gcc.exe",
+                                    "--path", "@MINGW730_32_DIR@/bin/gcc.exe",
                                     "--abi", "x86-windows-msys-pe-32bit",
                                     "--language", "1",
                                     "--supportedAbis", "x86-windows-msys-pe-32bit",
@@ -72,7 +72,7 @@ Component.prototype.createOperations = function()
                                    ["{0,2}", "@SDKToolBinary@", "addTC",
                                     "--id", tcId + ".g++",
                                     "--name", "MinGW 7.3.0 32-bit for C++",
-                                    "--path", "@MINGW730_DIR@/bin/g++.exe",
+                                    "--path", "@MINGW730_32_DIR@/bin/g++.exe",
                                     "--abi", "x86-windows-msys-pe-32bit",
                                     "--language", "2",
                                     "--supportedAbis", "x86-windows-msys-pe-32bit",
@@ -83,7 +83,7 @@ Component.prototype.createOperations = function()
                                    ["{0,2}", "@SDKToolBinary@", "addDebugger",
                                     "--id", dbgId,
                                     "--name", "GNU gdb 8.1 for MinGW 7.3.0 32-bit",
-                                    "--binary", "@MINGW730_DIR@/bin/gdb.exe",
+                                    "--binary", "@MINGW730_32_DIR@/bin/gdb.exe",
                                     "--abis", "x86-windows-msys-pe-32bit",
                                     "--engine", "1",
                                     "UNDOEXECUTE",
@@ -91,7 +91,7 @@ Component.prototype.createOperations = function()
 
             component.addOperation("Execute",
                                    ["{0,4}", "@SDKToolBinary@", "addKeys",
-                                    "android", "MakeExtraSearchDirectory", "QString:@MINGW730_DIR@/bin"]);
+                                    "android", "MakeExtraSearchDirectory", "QString:@MINGW730_32_DIR@/bin"]);
         } catch( e ) {
             print( e );
         }
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs
index 427ba275c..a1f2c3f40 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs
+++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.win64_mingw730/meta/installscript.qs
@@ -31,7 +31,7 @@
 function Component()
 {
     installer.valueChanged.connect( this, Component.prototype.reactOnTargetDirChange );
-    // set the default values to MINGW730_DIR
+    // set the default values to MINGW730_64_DIR
     Component.prototype.reactOnTargetDirChange("TargetDir", installer.value("TargetDir"));
 }
 
@@ -39,7 +39,7 @@ Component.prototype.reactOnTargetDirChange = function(key, value)
 {
     if (key == "TargetDir") {
         var path = value + "%TARGET_INSTALL_DIR%";
-        installer.setValue("MINGW730_DIR", path.replace(/\\/g, "/"));
+        installer.setValue("MINGW730_64_DIR", path.replace(/\\/g, "/"));
     }
 }
 
@@ -60,8 +60,8 @@ Component.prototype.createOperations = function()
             component.addOperation("Execute",
                                    ["{0,2}", "@SDKToolBinary@", "addTC",
                                     "--id", tcId + ".gcc",
-                                    "--name", "MinGW 7.3.0 64bit for C",
-                                    "--path", "@MINGW730_DIR@/bin/gcc.exe",
+                                    "--name", "MinGW 7.3.0 64-bit for C",
+                                    "--path", "@MINGW730_64_DIR@/bin/gcc.exe",
                                     "--abi", "x86-windows-msys-pe-64bit",
                                     "--language", "1",
                                     "--supportedAbis", "x86-windows-msys-pe-64bit",
@@ -71,8 +71,8 @@ Component.prototype.createOperations = function()
             component.addOperation("Execute",
                                    ["{0,2}", "@SDKToolBinary@", "addTC",
                                     "--id", tcId + ".g++",
-                                    "--name", "MinGW 7.3.0 64bit for C++",
-                                    "--path", "@MINGW730_DIR@/bin/g++.exe",
+                                    "--name", "MinGW 7.3.0 64-bit for C++",
+                                    "--path", "@MINGW730_64_DIR@/bin/g++.exe",
                                     "--abi", "x86-windows-msys-pe-64bit",
                                     "--language", "2",
                                     "--supportedAbis", "x86-windows-msys-pe-64bit",
@@ -82,8 +82,8 @@ Component.prototype.createOperations = function()
             component.addOperation("Execute",
                                    ["{0,2}", "@SDKToolBinary@", "addDebugger",
                                     "--id", dbgId,
-                                    "--name", "GNU gdb 8.1 for MinGW 7.3.0 64bit",
-                                    "--binary", "@MINGW730_DIR@/bin/gdb.exe",
+                                    "--name", "GNU gdb 8.1 for MinGW 7.3.0 64-bit",
+                                    "--binary", "@MINGW730_64_DIR@/bin/gdb.exe",
                                     "--abis", "x86-windows-msys-pe-64bit",
                                     "--engine", "1",
                                     "UNDOEXECUTE",
@@ -91,7 +91,7 @@ Component.prototype.createOperations = function()
 
             component.addOperation("Execute",
                                    ["{0,4}", "@SDKToolBinary@", "addKeys",
-                                    "android", "MakeExtraSearchDirectory", "QString:@MINGW730_DIR@/bin"]);
+                                    "android", "MakeExtraSearchDirectory", "QString:@MINGW730_64_DIR@/bin"]);
         } catch( e ) {
             print( e );
         }