Merge pull request #721 from kinke/merge_stable

Merge stable

Author: thewilsonator

.github/workflows/build_release_template.yml

@@ -128,7 +128,7 @@ jobs:
             target: linux
           - os: macos-13
             target: osx
-          - os: windows-2019
+          - os: windows-2022
             target: windows
           # FreeBSD is built on an additional VM
           - os: ubuntu-latest
@@ -230,7 +230,7 @@ jobs:
           # Windows: set LDC_VSDIR
           if [[ "${{ matrix.target }}" == "windows" ]]
           then
-            export LDC_VSDIR='C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
+            export LDC_VSDIR='C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
           fi
 
           # Build the release
@@ -271,7 +271,7 @@ jobs:
           run: |
             set -eux
 
-            sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm15
+            sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm19
 
             # Import key used to sign binaries
             curl -fsS https://dlang.org/d-keyring.gpg -o d-keyring.gpg

.github/workflows/build_windows.yml

@@ -14,10 +14,10 @@ jobs:
       matrix:
         arch: [x86, x64]
     name: Build LLD ${{ matrix.arch }}
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 120
     env:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
+      VSINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
       # NB: update windows/build_lld.sha256sums as well
       LLVM_VER: 9.0.0
       ARCH: ${{ matrix.arch }}
@@ -34,10 +34,10 @@ jobs:
 
   build_mingw_libs:
     name: Build MinGW-based libs
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 120
     env:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
+      VSINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
       # NB: update windows/build_mingw.sha256sums as well
       MINGW_VER: 8.0.0
       D_VERSION: 2.077.1
@@ -54,10 +54,10 @@ jobs:
 
   build_curl:
     name: Build curl
-    runs-on: windows-2019
+    runs-on: windows-2022
     timeout-minutes: 120
     env:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
+      VSINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
       # NB: update windows/build_curl.sha256sums as well
       CURL_VER: 7.68.0
       ZLIB_VER: 1.2.11

create_dmd_release/create_dmd_release.d

@@ -323,13 +323,13 @@ void buildAll(Bits bits, string branch)
     version (Windows)
     {
         // Setup MSVC environment for x64/x86 native builds
-        const vcVars = quote(buildPath(environment["LDC_VSDIR"], `VC\Auxiliary\Build\vcvarsall.bat`));
+        const vcVars = quote(buildPath(environment["LDC_VSDIR"], `Common7\Tools\VsDevCmd.bat`));
         version (Win64)
-            enum arch32 = "amd64_x86";
+            enum hostArch = " -host_arch=x64";
         else
-            enum arch32 = "x86";
+            enum hostArch = null;
 
-        const msvcVars = vcVars~" "~(is32 ? arch32 : "x64")~" && ";
+        const msvcVars = vcVars~" -arch="~(is32 ? "x86" : "x64")~hostArch~" && ";
     }
     else
         enum msvcVars = "";

windows/build_curl.bat

@@ -43,7 +43,7 @@ SET ZLIB_PATH=%ROOT%\zlib
 :: --------------------------------------------------------------------
 :: Build x64 DLL and import libs
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64
+call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=x64
 @echo on
 cd %ROOT%
 
@@ -63,7 +63,7 @@ mingw32-make -C curl\lib -f Makefile.m32 clean
 :: --------------------------------------------------------------------
 :: Build x86 DLL and import libs
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86
+call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=x86
 @echo on
 cd %ROOT%
 set PATH=%ROOT%\mingw32\bin;%PATH%

windows/build_lld.bat

@@ -12,7 +12,7 @@ REM Stop early if the artifact already exists
 powershell -Command "Invoke-WebRequest downloads.dlang.org/other/%ARTIFACT% -OutFile %ARTIFACTPATH%" && exit /B 0
 
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
+call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=%ARCH%
 @echo on
 cd %ROOT%
 

windows/build_mingw.bat

@@ -32,13 +32,13 @@ sha256sum -c "%ROOT%\windows\build_mingw.sha256sums" || exit /B 1
 
 move mingw-w64-v%MINGW_VER% mingw-w64
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=x64 -host_arch=x86
 @echo on
 rem CWD might be changed by vcvars64.bat
 cd %ROOT%\windows\mingw
 dmd -run buildsdk.d x64 %ROOT%\mingw-w64 dmd2\windows\lib64\mingw || exit /B 1
 
-call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86
+call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=x86
 @echo on
 cd %ROOT%\windows\mingw
 dmd -run buildsdk.d x86 %ROOT%\mingw-w64 dmd2\windows\lib32mscoff\mingw || exit /B 1