From 83bfc83c9f4f062663ba35ab2ed71d00a62fe6e8 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nowsecure.com>
Date: Sat, 26 Mar 2022 00:56:54 +0100
Subject: [PATCH] Add support for Visual Studio 2022 (community+enterprise)
 ##build

* add rule in the CI
---
 .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++++---
 preconfigure.bat            | 39 ++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f93eecc5d0..5424903ce7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -325,6 +325,51 @@ jobs:
         path: |
           radare2-${{ steps.r2v.outputs.branch }}-w32.zip
 #          radare2-win-installer\Output\radare2.exe
+  w64-static-2022:
+    runs-on: windows-2022
+    steps:
+    - name: Win configure Pagefile
+      uses: al-cheb/configure-pagefile-action@v1.2
+      with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
+    - name: Checkout
+      uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+#      with:
+#        python-version: '3.7'
+    - name: Preparing nmake
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install git+https://github.com/frida/meson.git@f7f25b19a8d71cebf8e2934733eb041eb6862eee
+        pip install ninja r2pipe wget r2env
+    - name: preconfigure
+      continue-on-error: true
+      shell: cmd
+      run: |
+        preconfigure
+    - name: Build with meson + ninja
+      shell: cmd
+      run: |
+        call configure static
+        call make
+    - name: Test executable
+      continue-on-error: true
+      shell: cmd
+      run: |
+        cd prefix\bin
+        r2blob -v
+    - uses: actions/upload-artifact@v2
+      continue-on-error: true
+      with:
+        name: w64-static-2022
+        path: prefix\bin\r2blob.static.exe
+
   w64-static:
     runs-on: windows-2019
     steps:
@@ -354,10 +399,6 @@ jobs:
         REM preconfigure
         call configure static
         call make
-    - uses: actions/upload-artifact@v2
-      with:
-        name: w32-mingw
-        path: radare2*.zip
     - name: Test executable
       continue-on-error: true
       shell: cmd
diff --git a/preconfigure.bat b/preconfigure.bat
index 8867c6f13c..d3d4a30cae 100644
--- a/preconfigure.bat
+++ b/preconfigure.bat
@@ -57,24 +57,35 @@ cl --help > NUL 2> NUL
 if %ERRORLEVEL% == 0 (
   echo FOUND
 ) else (
-  if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" (
-    echo "Found community edition"
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
+  if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" (
+    echo "Found 2022 Enterprise edition"
+    call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
   ) else (
-    if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
-      echo "Found Enterprise edition"
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+    if EXIST "C:\Program Files\Microsoft Visual Studio\2022\Community" (
+      echo "Found 2022 Community edition"
+      call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
     ) else (
-      if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" (
-        echo "Found Professional edition"
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+      if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" (
+        echo "Found 2019 community edition"
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
       ) else (
-        if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
-          echo "Found BuildTools"
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+        if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
+          echo "Found 2019 Enterprise edition"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
         ) else (
-          echo "Not Found"
-          exit /b 1
+          if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" (
+            echo "Found 2019 Professional edition"
+            call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+          ) else (
+            if EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+              echo "Found 2019 BuildTools"
+              call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" %VSARCH%
+            ) else (
+              echo "Not Found"
+              exit /b 1
+            )
+          )
         )
       )
     )