Merge tag '2022-10-28'

jeremyd2019 · Oct 29, 2022 · 34e9634 · 34e9634
2 parents 3cc3aed + c76b36f
commit 34e9634
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
       - test-docker-sfx
       - test-installer
       - test-sfx
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v2

diff --git a/qt-ifw/config/config.xml b/qt-ifw/config/config.xml
@@ -6,7 +6,7 @@
     <Publisher>The MSYS2 Developers</Publisher>
     <ControlScript>control.js</ControlScript>
     <StartMenuDir>MSYS2 @BITNESS@bit</StartMenuDir>
-    <RunProgram>@TargetDir@/mingw64.exe</RunProgram>
+    <RunProgram>@TargetDir@/ucrt64.exe</RunProgram>
     <RunProgramArguments></RunProgramArguments>
     <InstallerApplicationIcon>../../msys2</InstallerApplicationIcon>
     <InstallerWindowIcon>../../msys2</InstallerWindowIcon>

diff --git a/qt-ifw/packages/com.msys2.root/meta/installscript.js b/qt-ifw/packages/com.msys2.root/meta/installscript.js
@@ -1,4 +1,37 @@
+function cancelInstaller(message)
+{
+    installer.setDefaultPageVisible(QInstaller.Introduction, false);
+    installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
+    installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
+    installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
+    installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false);
+    installer.setDefaultPageVisible(QInstaller.PerformInstallation, false);
+    installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
+
+    var abortText = "<font color='red'>" + message +"</font>";
+    installer.setValue("FinishedText", abortText);
+    installer.setValue("RunProgram", null);
+}
+
+function isSupported()
+{
+    if (systemInfo.kernelType === "winnt") {
+        var major = parseInt(systemInfo.kernelVersion.split(".", 1));
+        var minor = parseInt(systemInfo.kernelVersion.split(".", 2)[1]);
+        if (major > 6 || (major == 6 && minor >= 1)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 function Component() {
+
+    if (!isSupported()) {
+        cancelInstaller("Installation on " + systemInfo.prettyProductName + " is not supported");
+        return;
+    }
+
     var systemDrive = installer.environmentVariable("SystemDrive");
     // Use C: as a default for messed up systems.
     if (systemDrive === "") {