Revert "Remove the MINGW32 shortcut"

This reverts commit cf1e9b4c20.

.ci/Dockerfile.2019

@@ -1,13 +0,0 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
-
-COPY ./msys2-base-x86_64-latest.sfx.exe /msys2.exe
-
-RUN powershell -Command \
-  $ErrorActionPreference = 'Stop'; \
-  $ProgressPreference = 'SilentlyContinue'; \
-  /msys2.exe -y -oC:\; \
-  function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
-  msys ' '; \
-  msys 'pacman --noconfirm -Syuu'; \
-  msys 'pacman --noconfirm -Syuu'; \
-  msys 'pacman --noconfirm -Scc';

.ci/Dockerfile.2022

@@ -1,13 +0,0 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
-
-COPY ./msys2-base-x86_64-latest.sfx.exe /msys2.exe
-
-RUN powershell -Command \
-  $ErrorActionPreference = 'Stop'; \
-  $ProgressPreference = 'SilentlyContinue'; \
-  /msys2.exe -y -oC:\; \
-  function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
-  msys ' '; \
-  msys 'pacman --noconfirm -Syuu'; \
-  msys 'pacman --noconfirm -Syuu'; \
-  msys 'pacman --noconfirm -Scc';

.github/workflows/build.yml

@@ -1,184 +0,0 @@
-name: 'build'
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 3 * * *'
-
-concurrency: nope
-
-jobs:
-  build-installer:
-    runs-on: windows-2022
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: setup-msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: >-
-            tar
-            mingw-w64-x86_64-qt-installer-framework
-            mingw-w64-x86_64-7zip
-
-      - name: Switch to the main mirror
-        shell: msys2 {0}
-        run: |
-          echo 'Server = https://repo.msys2.org/mingw/$repo/' > /etc/pacman.d/mirrorlist.mingw
-          echo 'Server = https://repo.msys2.org/msys/$arch/' > /etc/pacman.d/mirrorlist.msys
-          pacman-conf.exe
-
-      - name: Update using the main mirror & Check install
-        run: |
-          msys2 -c 'pacman --noconfirm -Suuy'
-          msys2 -c 'pacman --noconfirm -Suu'
-          msys2 -c 'pacman -Qkq'
-
-      - name: Build Installer
-        shell: msys2 {0}
-        run: |
-          bash make-msys2-installer
-
-      - name: Create 'latest' Variants and Checksums
-        run: |
-          mv msys2-base-x86_64-[0-9]*.sfx.exe msys2-base-x86_64-latest.sfx.exe
-          mv msys2-x86_64-[0-9]*.exe msys2-x86_64-latest.exe
-          mv msys2-*.tar.xz msys2-base-x86_64-latest.tar.xz
-          sha256sum.exe msys2-*
-          sha256sum.exe msys2-* > msys2-checksums.txt
-
-      - name: Upload Results
-        uses: actions/upload-artifact@v3
-        with:
-          name: installer
-          path: msys2-*
-
-  test-installer:
-    name: installer-${{ matrix.image }}
-    runs-on: windows-${{ matrix.image }}
-    needs: build-installer
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [2019, 2022]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: installer
-
-      - name: Install
-        run: |
-          ./msys2-x86_64-latest.exe in --confirm-command --accept-messages --root C:/msys2-install-test
-
-      - name: Test without Login Shell
-        run: |
-          C:\msys2-install-test\usr\bin\pacman.exe -Syy
-          C:\msys2-install-test\usr\bin\pacman.exe --noconfirm -S vim
-
-      - name: Test
-        run: |
-          C:\msys2-install-test\usr\bin\bash.exe -lc "pacman --version"
-          C:\msys2-install-test\usr\bin\bash.exe -lc "pacman -Qkv"
-          C:\msys2-install-test\usr\bin\bash.exe -lc "pacman -Syy"
-          C:\msys2-install-test\usr\bin\bash.exe -lc "pacman --noconfirm -S git"
-
-      - name: Uninstall
-        run: |
-          C:\msys2-install-test\uninstall.exe pr --confirm-command
-
-  test-docker-sfx:
-    name: docker-sfx-${{ matrix.image }}
-    runs-on: windows-${{ matrix.image }}
-    needs: build-installer
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [2019, 2022]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: installer
-
-      - name: Build image
-        run: |
-          docker build -t msys2-base -f ./.ci/Dockerfile.${{ matrix.image }} .
-
-      - name: Test without Login Shell
-        run: |
-          docker run msys2-base C:\msys64\usr\bin\pacman.exe -Syy
-          docker run msys2-base C:\msys64\usr\bin\pacman.exe --noconfirm -S vim
-
-      - name: Test
-        run: |
-          docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman --version"
-          docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Qkv"
-          docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Qkk || true"
-          docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Syy"
-          docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -S --noconfirm git"
-
-  test-sfx:
-    name: sfx-${{ matrix.image }}
-    runs-on: windows-${{ matrix.image }}
-    needs: build-installer
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [2019, 2022]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: installer
-
-      - name: Install
-        run: |
-          ./msys2-base-x86_64-latest.sfx.exe  -y -oC:/msys2-install-test
-
-      - name: Test without Login Shell
-        run: |
-          $env:Path = 'C:\msys2-install-test\msys64\usr\bin;' + $env:Path
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman-key --init"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman-key --populate"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman -Syy"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman --noconfirm -S vim"
-
-      - name: Test
-        run: |
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman --version"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Qkv"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Qkk || true"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Syy"
-          C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -S --noconfirm git"
-
-  upload-nightly:
-    permissions:
-      contents: write
-    needs:
-      - test-docker-sfx
-      - test-installer
-      - test-sfx
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: installer
-
-      - name: Upload Installers
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload nightly-x86_64 msys2-* --clobber -R ${{ github.repository }}

.gitignore

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

README.md

@@ -1,9 +1,5 @@
 # MSYS2 Installer
 
-## Nightly build
-
-https://github.com/msys2/msys2-installer/releases/tag/nightly-x86_64
-
 ![screenshot](screenshot.png)
 
 ## CLI Usage examples

create-sfx.sh

@@ -3,21 +3,28 @@
 
 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="7z21.03-zstd-x64"
-CHECKSUM="531b20dfb03d8f30f61ae56a181610bbb6f3cf7cc71dac1d8f95511289de76f3"
+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/v21.03-v1.5.0-R2/$NAME.exe" -o "$BASE.exe"
+    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
 
-# Creat SFX installer
+# Create SFX installer
 INPUT="$1"
 OUTPUT="$2"
 TEMP="$OUTPUT.payload"
@@ -25,4 +32,4 @@ TEMP="$OUTPUT.payload"
 rm -f "$TEMP"
 "$BASE/7z" a "$TEMP" -ms1T -m0=zstd -mx22 "$INPUT"
 cat "$BASE/7zCon.sfx" "$TEMP" > "$OUTPUT"
-rm "$TEMP"
+rm "$TEMP"

make-msys2-installer

@@ -11,6 +11,12 @@ _version="${_date}"
 _newmsysbase="${_build}/newmsys"
 _newmsys="${_newmsysbase}/msys64"
 
+if [ "$MSYSTEM" = "CLANGARM64" ]; then
+    _arch_name="arm64"
+else
+    _arch_name="x86_64"
+fi
+
 create_installer_archive() {
   echo "[Creating installer archive...]"
 
@@ -21,20 +27,28 @@ create_installer_archive() {
   popd > /dev/null
 }
 
-create_archive() {
-  echo "[Creating archive...]"
-
+create_archives() {
+  echo "[Creating tarball...]"
   pushd "${_newmsysbase}" > /dev/null
-    export XZ_OPT="-9T0"
-    /usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cJf "${_thisdir}/msys2-base-x86_64-${_date}.tar.xz" msys64
+  /usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cf "${_thisdir}/msys2-base-${_arch_name}-${_date}.tar" msys64
   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"
+
+  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"
 }
 
 create_sfx() {
   echo "[Creating SFX...]"
 
   pushd "${_newmsysbase}" > /dev/null
-    "${_thisdir}/create-sfx.sh" "msys64" "${_thisdir}/msys2-base-x86_64-${_date}.sfx.exe"
+    "${_thisdir}/create-sfx.sh" "msys64" "${_thisdir}/msys2-base-${_arch_name}-${_date}.sfx.exe"
   popd > /dev/null
 }
 
@@ -55,7 +69,7 @@ create_installer() {
       -p "${_ifwroot}/packages" \
       -c "${_ifwroot}/config/config.xml" \
       --offline-only \
-      "${_thisdir}/msys2-x86_64-${_date}.exe" \
+      "${_thisdir}/msys2-${_arch_name}-${_date}.exe" \
       -v
   popd > /dev/null
 }
@@ -72,6 +86,7 @@ create_chroot_system() {
     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
 }
 
@@ -79,6 +94,8 @@ main() {
   pacman -S --noconfirm --needed \
     "${MINGW_PACKAGE_PREFIX}-qt-installer-framework" \
     "${MINGW_PACKAGE_PREFIX}-7zip" \
+    "${MINGW_PACKAGE_PREFIX}-xz" \
+    "${MINGW_PACKAGE_PREFIX}-zstd" \
     "tar"
 
   create_chroot_system
@@ -87,8 +104,10 @@ main() {
   create_installer_archive
   create_installer
 
-  create_archive
-  create_sfx
+  if [ "$_arch_name" != "arm64" ]; then
+    create_archives
+    create_sfx
+  fi
 }
 
 main

qt-ifw/config/config.xml

@@ -3,7 +3,7 @@
     <Name>MSYS2</Name>
     <Version>@VERSION@</Version>
     <Title>MSYS2</Title>
-    <Publisher>The MSYS2 Developers</Publisher>
+    <Publisher>Befator Inc.</Publisher>
     <ControlScript>control.js</ControlScript>
     <StartMenuDir>MSYS2</StartMenuDir>
     <RunProgram>@TargetDir@/ucrt64.exe</RunProgram>
@@ -11,8 +11,11 @@
     <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/packages/com.msys2.root/meta/installscript.js

@@ -38,6 +38,7 @@ function createShortcuts()
     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",

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-  <DisplayName>MSYS2</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>