Revert "Remove the MINGW32 shortcut"

This reverts commit cf1e9b4c20.

.gitignore

@@ -0,0 +1,5 @@
+_cache
+*.exe
+*.xz
+*.zst
+_build

HACKING.md

@@ -0,0 +1,16 @@
+## Build Instructions
+
+```bash
+# Run in a MINGW64 environment
+./make-msys2-installer
+```
+
+## New Release TODO List
+
+* Trigger a new nightly build via https://github.com/msys2/msys2-installer/actions/workflows/build.yml or use an existing one
+* Get all files with dates in their names, sign them and create checksum files (.sig and .sha256)
+* Create a new git tag following format: `date -I`
+* Upload the installer files to the release tag
+* Update the download link and checksum for the GiHub action and verify that all tests pass: https://github.com/msys2/setup-msys2/blob/master/main.js
+* Run `msys2-devtools/update-installer "$(date -I)"` on the server to copy the release from GitHub
+* Update the link, name and checksum on the main website (pointing to GitHub): https://github.com/msys2/msys2.github.io/blob/source/web/index.md

LICENSE

@@ -0,0 +1,26 @@
+Copyright 2021 MSYS2 devs
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,14 +1,35 @@
 # MSYS2 Installer
 
-Nightly builds:
-
-* x86_64: [msys2-x86_64-latest.exe](https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-x86_64-latest.exe)
-* i686: [msys2-i686-latest.exe](https://github.com/msys2/msys2-installer/releases/download/nightly-i686/msys2-i686-latest.exe)
-
-Stable builds:
-
-* x86_64: http://repo.msys2.org/distrib/x86_64
-* i686: http://repo.msys2.org/distrib/i686
-
-
 ![screenshot](screenshot.png)
+
+## CLI Usage examples
+
+Installing the GUI installer via the CLI to `C:\msys64`:
+
+```powershell
+.\msys2-x86_64-latest.exe in --confirm-command --accept-messages --root C:/msys64
+```
+
+Uninstalling an existing installation in `C:\msys64` via the CLI:
+
+```powershell
+C:\msys64\uninstall.exe pr --confirm-command
+```
+
+Installing the self extracting archive to `C:\msys64`:
+
+```powershell
+.\msys2-base-x86_64-latest.sfx.exe -y -oC:\
+```
+
+## FAQ
+
+### What's the difference between the installer and the archives?
+
+The installer provides some additional features such as installing shortcuts, registering an uninstaller, a GUI for selecting the installation path and automatically running a login shell at the end to initialize the MSYS2 environment.
+
+If you unpack the archives and run a login shell once, you will get a functionally equivalent MSYS2 installation.
+
+### What is contained in the installer/archives?
+
+It contains the [base](https://packages.msys2.org/package/base) package and all its dependencies. You can list the contained packages using: `pactree base -lu | sort`

auto-install.js

@@ -1,78 +0,0 @@
-// Run with:
-// ./msys2-x86_64-$(date +'%Y%m%d').exe --platform minimal --script auto-install.js -v
-// Currently it gets stuck on the last page.
-// To see graphically what's happening, remove "--platform minimal"
-
-function Controller()
-{
-    print("(print) Hello Installer World!\n");
-    console.log("(console.log) Hello Installer World!\n");
-    installer.setDefaultPageVisible(QInstaller.Introduction, true);
-    installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
-
-    var page = gui.pageWidgetByObjectName( "ComponentSelectionPage" );
-    page.selectComponent( "com.msys2.root" );
-    page.selectComponent( "com.msys2.root.base" );
-
-    installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
-    installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false);
-    installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
-    installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
-    installer.setDefaultPageVisible(QInstaller.PerformInstallation, true);
-    installer.setDefaultPageVisible(QInstaller.InstallationFinished, true);
-    installer.setDefaultPageVisible(QInstaller.FinishedPage, true);
-    ComponentSelectionPage.selectAll();
-    installer.autoRejectMessageBoxes();
-    var result = QMessageBox.question("quit.question", "Installer", "Do you want to quit the installer?",
-                                      QMessageBox.Yes | QMessageBox.No);
-
-    console.log("(console.log) result " + result);
-    installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
-
-    installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes);
-    installer.setMessageBoxAutomaticAnswer("stopProcessesForUpdates", QMessageBox.Ignore);
-}
-
-Controller.prototype.IntroductionPageCallback = function()
-{
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.PerformInstallationPageCallback = function()
-{
-    var page = gui.pageWidgetByObjectName("PerformInstallationPage");
-    installer.setAutomatedPageSwitchEnabled(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.InstallationFinishedPageCallback = function()
-{
-    console.log("(console.log) InstallationFinishedPageCallback ");
-    var checkBox = gui.pageWidgetByObjectName("RunItCheckBox");
-    console.log("typeof checkBox is " + typeof checkBox);
-    assert(typeof checkBox === 'object');
-
-    var page = gui.pageWidgetByObjectName("InstallationFinishedPage");
-    gui.clickButton(buttons.NexthButton);
-}
-
-Controller.prototype.FinishedPageCallback = function()
-{
-    console.log("(console.log) FinishedPageCallback ");
-//    var checkBox = gui.pageWidgetByObjectName("RunItCheckBox");
-//    console.log("typeof checkBox is " + typeof checkBox);
-//    assert(typeof checkBox === 'object');
-
-    var page = gui.pageWidgetByObjectName("FinishedPage");
-    page.RunItCheckBox.checked = false;
-    gui.clickButton(buttons.FinishButton);
-}
-
-/*
-Controller.prototype.ComponentSelectionPageCallback = function()
-{
-    var page = gui.pageWidgetByObjectName( "ComponentSelectionPage" )
-    page.deselectComponent( "com.nokia.ndk.tools.maemo.usbdriver" )
-    gui.clickButton( buttons.NextButton )
-}
-*/

azure-pipelines.yml

@@ -1,59 +0,0 @@
-schedules:
-  - cron: '0 0 * * 0'
-    displayName: weekly build
-    branches:
-      include:
-      - master
-    always: true
-
-jobs:
-  - job: MSYS
-    timeoutInMinutes: 360
-    pool:
-      vmImage: 'windows-2019'
-    strategy:
-      maxParallel: 5
-      matrix:
-        i686:
-          MSYS_DIR: msys32
-          BASE_REPO: msys2-ci-base-i686
-          ARCH: i686
-        x86_64:
-          MSYS_DIR: msys64
-          BASE_REPO: msys2-ci-base
-          ARCH: x86_64
-    steps:
-      - script: |
-          git clone https://github.com/msys2/$(BASE_REPO).git %CD:~0,2%\$(MSYS_DIR)
-        displayName: Install MSYS2
-      - script: |
-          set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syuu
-        displayName: Update MSYS2
-      - script: |
-          set CHERE_INVOKING=yes
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "bash make-msys2-installer; cp msys2-*.exe msys2-$(ARCH)-latest.exe; cp msys2-*.tar.xz msys2-base-$(ARCH)-latest.tar.xz"
-        displayName: CI-Build
-      - task: CopyFiles@2
-        inputs:
-          contents: 'msys2-*'
-          targetFolder: $(Build.ArtifactStagingDirectory)
-        displayName: Copy installer
-      - task: GithubRelease@0
-        inputs:
-          githubConnection: 'msys2-installer-release-connection'
-          action: 'edit'
-          tag: nightly-$(ARCH)
-          assets: '$(Build.ArtifactStagingDirectory)/*'
-          assetUploadMode: 'delete'
-          addChangeLog: false
-        displayName: 'Create GitHub Release'
-        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables['Build.Reason'], 'PullRequest'))
-      - task: PublishBuildArtifacts@1
-        displayName: Publish packages
-        inputs:
-          pathtoPublish: $(Build.ArtifactStagingDirectory)
-          artifactName: $(MSYS_DIR)
-        condition: and(succeeded(), or(ne(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.Reason'], 'PullRequest')))

compress-msys2

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-_arch=$(uname -m)
-_date=$(date +'%Y%m%d')
-_filename=${_arch}-msys2-${_date}.tar.xz
-_log=/tmp/compress.log
-
-echo "Creating MSYS2 archive /tmp/$_filename"
-if [ -f /tmp/$_filename ]; then
-  rm -f /tmp/$_filename
-fi
-
-_dirs=
-for curr_dir in /etc /include /lib /libexec /sbin /share /ssl /tmp /usr /var /msys2.ico /msys2_shell.cmd; do
-  if [[ -d $curr_dir || -f $curr_dir ]]; then
-    _dirs="$_dirs $curr_dir"
-  fi
-done
-
-if [ -n "$_dirs" ]; then
-  _compress_cmd="/usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cvJf /tmp/${_filename} $_dirs -X /etc/compress_exclude"
-  cd /
-  eval ${_compress_cmd} | tee $_log 2>&1
-  _result=$?
-  if [ "$_result" -eq "0" ]; then
-  echo " done"
-  else
-  die "MSYS2 compressing fail. See $_log"
-  fi
-fi
-
-exit 0

compress_exclude

@@ -1,13 +0,0 @@
-/etc/postinstall/postinstall.marker
-/etc/group
-/etc/passwd
-/etc/mtab
-/etc/fstab
-/etc/hosts
-/etc/networks
-/etc/protocols
-/etc/services
-/home/*
-/dev/*
-/tmp/*
-/var/tmp/*

create-sfx.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# usage: ./create-sfx.sh /some/path/to/msys64 installer.exe
+
+set -e
+
+if [ "$MSYSTEM" = "CLANGARM64" ]; then
+    ARCH="arm64"
+    CHECKSUM="c526e8c6cb5dc0d175778f1b6b67bd1571ba8a2cf6f6b36b7c8a8d3197ad2bac"
+else
+    ARCH="x64"
+    CHECKSUM="d140094f0277b49a4e895159bd734da03cd2b60fb73a65e4151edfedc612981e"
+fi
+
+# Download and extract https://github.com/mcmilk/7-Zip-zstd
+NAME="7z25.01-zstd-${ARCH}"
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+mkdir -p "$DIR/_cache"
+BASE="$DIR/_cache/$NAME"
+if [ ! -f "$BASE.exe" ]; then
+    curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v25.01-v1.5.7-R1/$NAME.exe" -o "$BASE.exe"
+fi
+echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check
+if [ ! -d "$BASE" ]; then
+    7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
+fi
+
+# Create SFX installer
+INPUT="$1"
+OUTPUT="$2"
+TEMP="$OUTPUT.payload"
+
+rm -f "$TEMP"
+"$BASE/7z" a "$TEMP" -ms1T -m0=zstd -mx22 "$INPUT"
+cat "$BASE/7zCon.sfx" "$TEMP" > "$OUTPUT"
+rm "$TEMP"

make-msys2-installer

@@ -1,149 +1,113 @@
 #!/usr/bin/env bash
 
-_thisdir="$(dirname $0)"
-test "${_thisdir}" = "." && _thisdir=${PWD}
-_ifwroot="${_thisdir}"/qt-ifw
-_arch=$(uname -m)
+set -e
+
+_thisdir="$( cd "$( dirname "$0" )" && pwd )"
+_build="${_thisdir}/_build"
+_ifwroot="${_build}/qt-ifw"
 _date=$(date +'%Y%m%d')
 _dateqif=$(date +'%Y-%m-%d')
-_version=${_date}
-_filename=msys2-${_arch}-${_date}.exe
-_filename2=msys2-base-${_arch}-${_date}.tar.xz
-_log=/tmp/installer-${_arch}-${_date}.log
-if [ "${_arch}" = "x86_64" ]; then
-  _bitness=64
+_version="${_date}"
+_newmsysbase="${_build}/newmsys"
+_newmsys="${_newmsysbase}/msys64"
+
+if [ "$MSYSTEM" = "CLANGARM64" ]; then
+    _arch_name="arm64"
 else
-  _bitness=32
+    _arch_name="x86_64"
 fi
-_archivegen=/mingw${_bitness}/bin/archivegen.exe
-_binarycreator=/mingw${_bitness}/bin/binarycreator.exe
-_installerbase=/mingw${_bitness}/bin/installerbase.exe
-_newmsysbase=/tmp/newmsys
-_newmsys=${_newmsysbase}/msys"${_bitness}"
 
-declare -a undo_commands
+create_installer_archive() {
+  echo "[Creating installer archive...]"
 
-_exitcode=5
-
-exit_with_undo() {
-  for _cmd in ${undo_commands[@]}; do
-    eval "${_cmd}" | tee -a ${_log}
-  done
-  exit ${_exitcode}
-}
-
-exit_cleanly() {
-  _exitcode=$1; shift;
-  local _message=$1; shift;
-  echo "${_message}" | tee -a ${_log}
-  exit_with_undo
-}
-
-do_seds() {
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@DATE@|${_dateqif}|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@VERSION@|${_version}|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|@BITNESS@|${_bitness}|g" "{}" \;
-  undo_commands+=("undo_seds")
-}
-
-undo_seds() {
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|<ReleaseDate>${_dateqif}<|<ReleaseDate>@DATE@<|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|<Version>${_version}<|<Version>@VERSION@<|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|msys${_bitness}|msys@BITNESS@|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|${_bitness}bit|@BITNESS@bit|g" "{}" \;
-  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" -or -name "installscript.js" \) -exec sed -i "s|if (\"@BITNESS@bit\" === \"@BITNESS@bit\")|if (\"@BITNESS@bit\" === \"32bit\")|g" "{}" \;
+  local _data="${_ifwroot}"/packages/com.msys2.root/data
+  pushd / > /dev/null
+    mkdir -p "${_data}"
+    7z a -mx9 -md128m "${_data}/msys64.7z" "${_newmsys}/"*
+  popd > /dev/null
 }
 
 create_archives() {
-  local _data="${_ifwroot}"/packages/com.msys2.root.base/data
-  [ -d "${_data}" ] && rm -rf "${_data}"
-  mkdir -p "${_data}"
-  local _dirs=
-  for curr_dir in /dev /etc /var /tmp /usr /mingw32 /mingw64 /msys2_shell.cmd /msys2.exe /mingw32.exe /mingw64.exe /msys2.ini /mingw32.ini /mingw64.ini /msys2.ico /autorebase.bat autorebasebase1st.bat; do
-    if [[ -d ${_newmsys}${curr_dir} || -f ${_newmsys}${curr_dir} ]]; then
-      _dirs="${_dirs} ${_newmsys}$curr_dir"
-    fi
-  done
+  echo "[Creating tarball...]"
+  pushd "${_newmsysbase}" > /dev/null
+  /usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cf "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar" msys64
+  popd > /dev/null
 
-  if [ -n "${_dirs}" ]; then
-    local _compress_cmd="${_archivegen} ${_data}/msys${_bitness}.7z ${_dirs}"
-    pushd / > /dev/null
-      echo "Run: ${_compress_cmd} ..." | tee -a ${_log}
-      eval "${_compress_cmd}" 2>&1 | tee -a ${_log}
-      _result=$?
-      if [ "${_result}" -eq "0" ]; then
-            echo " archivegen succeeded. Created ${_data}/msys${_bitness}.7z" | tee -a ${_log}
-      else
-            exit_cleanly "3" "archivegen failed. See ${_log}"
-      fi
-    popd > /dev/null
+  echo "[Creating xz archive...]"
+  xz -9 --keep --verbose --force --compress --threads=0 "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar"
+  xz --test "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar.xz"
 
-    pushd ${_newmsysbase} > /dev/null
-      local _compress_cmd2="/usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cJf ${_thisdir}/${_filename2} msys${_bitness}"
-      echo "Run: ${_compress_cmd2} ..." | tee -a ${_log}
-      eval "${_compress_cmd2}" 2>&1 | tee -a ${_log}
-      _result=$?
-      if [ "${_result}" -eq "0" ]; then
-            echo " tar succeeded. Created " | tee -a ${_log}
-      else
-            die "MSYS2 compressing fail. See ${_log}"
-      fi
-    popd > /dev/null
-  fi
+  echo "[Creating zstd archive...]"
+  zstd -T0 -22 --ultra --force "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar" -o "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar.zst"
+  zstd --test "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar.zst"
+
+  rm "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar"
 }
 
-# Add -v to get more information.
-make_installer() {
-  eval "\"${_binarycreator}\" \
-    -t \"${_installerbase}\" \
-    -p \"${_ifwroot}/packages\" \
-    -c \"${_ifwroot}/config/config.xml\" \
-    --offline-only \
-    \"${_filename}\" \
-    -v"  | tee -a ${_log}
+create_sfx() {
+  echo "[Creating SFX...]"
+
+  pushd "${_newmsysbase}" > /dev/null
+    "${_thisdir}/create-sfx.sh" "msys64" "${_thisdir}/msys2-base-${_arch_name}-${_date}.sfx.exe"
+  popd > /dev/null
 }
 
-trap exit_with_undo 1 2 15
+copy_installer() {
+  echo "[Copying installer...]"
+  rm -Rf "${_ifwroot}" && cp -r "${_thisdir}"/qt-ifw "${_ifwroot}"
+
+  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@DATE@|${_dateqif}|g" "{}" \;
+  find "${_ifwroot}" \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@VERSION@|${_version}|g" "{}" \;
+}
+
+create_installer() {
+  echo "[Creating installer...]"
+
+  pushd "${_build}" > /dev/null
+    binarycreator \
+      -t "$(command -v installerbase)" \
+      -p "${_ifwroot}/packages" \
+      -c "${_ifwroot}/config/config.xml" \
+      --offline-only \
+      "${_thisdir}/msys2-${_arch_name}-${_date}.exe" \
+      -v
+  popd > /dev/null
+}
 
 create_chroot_system() {
-  [ -d ${_newmsysbase} ] && rm -rf ${_newmsysbase}
-  mkdir -p "${_newmsys}"
-  pushd "${_newmsys}" > /dev/null
+  echo "[Creating chroot system...]"
+  rm -Rf "${_newmsysbase}" && mkdir -p "${_newmsys}"
 
+  pushd "${_newmsys}" > /dev/null
     mkdir -p var/lib/pacman
     mkdir -p var/log
     mkdir -p tmp
 
-    eval "pacman -Syu --root \"${_newmsys}\"" | tee -a ${_log}
-    eval "pacman -S base --noconfirm --root \"${_newmsys}\"" | tee -a ${_log}
-    _result=$?
-    if [ "${_result}" -ne "0" ]; then
-      exit_cleanly "1" "failed to create newmsys2 via command 'pacman -S base --noconfirm --root ${_newmsys}'"
-    fi
+    pacman -Syu --root "${_newmsys}"
+    pacman -S filesystem msys2-runtime --noconfirm --root "${_newmsys}"
+    pacman -S base --noconfirm --root "${_newmsys}"
+    pacman -Q --root "${_newmsys}" > "${_thisdir}/msys2-base-${_arch_name}-${_date}.packages.txt"
   popd > /dev/null
 }
 
-if [ ! -f "${_archivegen}" ]; then
-  eval "pacman -S --noconfirm mingw${_bitness}/mingw-w64-${_arch}-qt-installer-framework" | tee -a ${_log}
-fi
+main() {
+  pacman -S --noconfirm --needed \
+    "${MINGW_PACKAGE_PREFIX}-qt-installer-framework" \
+    "${MINGW_PACKAGE_PREFIX}-7zip" \
+    "${MINGW_PACKAGE_PREFIX}-xz" \
+    "${MINGW_PACKAGE_PREFIX}-zstd" \
+    "tar"
 
-if [ ! -f "${_archivegen}" ]; then
-  exit_cleanly "2" "installation of qt installer framework failed. See ${_log}"
-fi
+  create_chroot_system
 
-if [ -f "${_log}" ]; then
-  rm "${_log}"
-fi
+  copy_installer
+  create_installer_archive
+  create_installer
 
-echo "Creating MSYS2 chroot system ${_newmsys}" | tee -a ${_log}
-create_chroot_system
+  if [ "$_arch_name" != "arm64" ]; then
+    create_archives
+    create_sfx
+  fi
+}
 
-echo "Creating MSYS2 installer /tmp/${_filename}" | tee -a ${_log}
-if [ -f /tmp/${_filename} ]; then
-  rm -f /tmp/${_filename}
-fi
-
-do_seds
-create_archives
-make_installer
-exit_cleanly "0" "All done, see ${_filename}"
+main

make-msys2-installer.bat

@@ -1,52 +0,0 @@
-@echo off
-
-REM Copyright (c) 2014, Ray Donnelly <mingw.android@gmail.com>
-
-if "%1"=="" (
-  echo Please re-run, passing the the location of an existing MSYS2 installation
-  exit /b 1
-)
-
-if not exist %1\msys2_shell.cmd (
-  echo '%1' does not seem to be the root folder of an existing MSYS2 installation?!
-  exit /b 2
-)
-
-set "NEWMSYS=%CD:\=/%/newmsys/msys64"
-set "NEWMSYSW=%CD%\newmsys\msys64"
-
-echo.
-echo ***********
-echo * Warning *
-echo ***********
-echo.
-echo This batch file will sync (forcibly) the 'base' group of the MSYS2 installation in '%1'
-<nul set /p =.. Do you want to proceed? 
-choice /N
-if "%errorlevel%"=="1" (
-  echo.
-) else (
-  exit /b 0
-)
-
-REM set "PATH=%1\bin;%PATH%"
-
-echo Updating 'base' group of the existing MSYS2 installation
-pushd %1
-  REM %1\bin\bash -l -c "pacman -S base --force --noconfirm" | more /E /P
-  timeout 1 > NUL
-popd
-
-echo Creating new MSYS2 installation containing only 'base'
-timeout 1 > NUL
-pushd %1
-  mkdir %NEWMSYSW%\var\lib\pacman
-  echo bin\bash -l -c "pacman -Syu --root %NEWMSYS%"
-  bin\bash -l -c "pacman -Syu --root %NEWMSYS%"
-  exit /b 999
-  %1\bin\bash -l -c "pacman -S pacman --root %NEWMSYS%"
-  %1\bin\bash -l -c "pacman -S base --force --root %NEWMSYS%" | more /E /P
-  timeout 1 > NUL
-popd
-
-exit /b 0

qt-ifw/config/config.xml

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
-    <Name>MSYS2 @BITNESS@bit</Name>
+    <Name>MSYS2</Name>
     <Version>@VERSION@</Version>
-    <Title>MSYS2 @BITNESS@bit</Title>
-    <Publisher>The MSYS2 Developers</Publisher>
-    <StartMenuDir>MSYS2 @BITNESS@bit</StartMenuDir>
-    <RunProgram>@TargetDir@/msys2_shell.cmd</RunProgram>
+    <Title>MSYS2</Title>
+    <Publisher>Befator Inc.</Publisher>
+    <ControlScript>control.js</ControlScript>
+    <StartMenuDir>MSYS2</StartMenuDir>
+    <RunProgram>@TargetDir@/ucrt64.exe</RunProgram>
     <RunProgramArguments></RunProgramArguments>
-    <InstallerApplicationIcon>../../msys2</InstallerApplicationIcon>
-    <InstallerWindowIcon>../../msys2</InstallerWindowIcon>
+    <InstallerApplicationIcon>msys2</InstallerApplicationIcon>
+    <InstallerWindowIcon>msys2.ico</InstallerWindowIcon>
+    <InstallActionColumnVisible>false</InstallActionColumnVisible>
+    <WizardStyle>Modern</WizardStyle>
+    <WizardDefaultWidth>40em</WizardDefaultWidth>
+    <MaintenanceToolName>uninstall</MaintenanceToolName>
+    <SupportsModify>false</SupportsModify>
+    <RepositorySettingsPageVisible>false</RepositorySettingsPageVisible>
+    <SaveDefaultRepositories>false</SaveDefaultRepositories>
+    <AllowRepositoriesForOfflineInstaller>false</AllowRepositoriesForOfflineInstaller>
 </Installer>

qt-ifw/config/control.js

@@ -0,0 +1,20 @@
+function Controller()
+{
+  installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
+  if (installer.isInstaller()) {
+    installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
+    installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
+  }
+}
+
+Controller.prototype.IntroductionPageCallback = function()
+{
+  const widget = gui.currentPageWidget();
+  const radioNames = ["PackageManagerRadioButton", "UpdaterRadioButton"];
+  for (const name of radioNames) {
+    const el = gui.findChild(widget, name);
+    if (el != null) {
+      el.hide();
+    }
+  }
+}

qt-ifw/packages/com.msys2.root.base/meta/installscript.js

@@ -1,38 +0,0 @@
-function Component()
-{
-    // constructor
-}
-
-Component.prototype.isDefault = function()
-{
-    // select the component by default
-    return true;
-}
-
-function createShortcuts()
-{
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir === "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = installer.value("TargetDir") + "\\msys2_shell.cmd";
-    component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 32-bit.lnk", "-mingw32", "iconPath=@TargetDir@/mingw32.exe");
-    component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MinGW 64-bit.lnk", "-mingw64", "iconPath=@TargetDir@/mingw64.exe");
-    component.addOperation("CreateShortcut", cmdLocation, "@StartMenuDir@/MSYS2 MSYS.lnk", "-msys", "iconPath=@TargetDir@/msys2.exe");
-
-    if ("@BITNESS@bit" === "32bit") {
-        component.addOperation( "Execute",
-                               ["@TargetDir@\\autorebase.bat"]);
-    }
-
-    component.addOperation( "Execute",
-                           ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-    createShortcuts();
-}

qt-ifw/packages/com.msys2.root.base/meta/package.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-  <DisplayName>MSYS2 @BITNESS@bit base</DisplayName>
-  <Description>Cygwin-derived Posix-like env. for Windows with Arch Linux's Pacman</Description>
-  <Version>@VERSION@</Version>
-  <ReleaseDate>@DATE@</ReleaseDate>
-  <Default>true</Default>
-  <Script>installscript.js</Script>
-</Package>

qt-ifw/packages/com.msys2.root/meta/installscript.js

@@ -1,16 +1,69 @@
+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]);
+        // Windows >= 8.1
+        if (major > 6 || (major == 6 && minor >= 3)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+function createShortcuts()
+{
+    var windir = installer.environmentVariable("WINDIR");
+    if (windir === "") {
+        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
+        return;
+    }
+
+    component.addOperation("CreateShortcut", "@TargetDir@/mingw32.exe", "@StartMenuDir@/MSYS2 MINGW32.lnk", "iconPath=@TargetDir@/mingw32.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/mingw64.exe", "@StartMenuDir@/MSYS2 MINGW64.lnk", "iconPath=@TargetDir@/mingw64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/ucrt64.exe", "@StartMenuDir@/MSYS2 UCRT64.lnk", "iconPath=@TargetDir@/ucrt64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 CLANG64.lnk", "iconPath=@TargetDir@/clang64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/clangarm64.exe", "@StartMenuDir@/MSYS2 CLANGARM64.lnk", "iconPath=@TargetDir@/clangarm64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/msys2.exe", "@StartMenuDir@/MSYS2 MSYS.lnk", "iconPath=@TargetDir@/msys2.exe");
+
+    component.addOperation( "Execute",
+                           ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);
+}
+
 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 === "") {
         systemDrive = "C:";
     }
-    var targetDir = installer.value("TargetDir", systemDrive+"\\msys@BITNESS@")
+    var targetDir = installer.value("TargetDir", systemDrive+"\\msys64")
 
     installer.setValue("TargetDir", targetDir);
-    installer.setDefaultPageVisible(QInstaller.Introduction, false);
-    installer.setDefaultPageVisible(QInstaller.TargetDirectory, true);
-    installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
-    installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
-    installer.setDefaultPageVisible(QInstaller.StartMenuSelection, true);
-    installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
+}
+
+Component.prototype.createOperations = function()
+{
+    component.createOperations();
+    createShortcuts();
 }

qt-ifw/packages/com.msys2.root/meta/package.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <Package>
-  <DisplayName>MSYS2 @BITNESS@bit</DisplayName>
+  <DisplayName>Befator Inc. MSYS2</DisplayName>
   <Description>Cygwin-derived Posix-like env. for Windows with Arch Linux's Pacman</Description>
   <Version>@VERSION@</Version>
   <ReleaseDate>@DATE@</ReleaseDate>
+  <Default>true</Default>
   <Script>installscript.js</Script>
 </Package>