EdkRepo: Add Support for VS2022

Removes the SetupLauncher functionality. Updates build build_windows_installer.bat to add support for VS2022. Fixes #233 Signed-off-by: Ashley E Desimone <[email protected]>
tianocore · Apr 18, 2024 · e968eee · e968eee
1 parent 6630bc6
commit e968eee
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 1,874 deletions.
diff --git a/build-scripts/build_windows_installer.bat b/build-scripts/build_windows_installer.bat
@@ -39,12 +39,41 @@ if %FIND_VS_WHERE% NEQ 0 (
 
 :VS2017PlusCheck
 
+if defined VS170COMNTOOLS (
+  set TOOL_CHAIN_TAG=VS2022
+)
 if defined VS160COMNTOOLS (
   set TOOL_CHAIN_TAG=VS2019
 )
 if defined VS150COMNTOOLS (
   set TOOL_CHAIN_TAG=VS2017
 )
+
+set CHECK_VS2022=0
+if not defined TOOL_CHAIN_TAG (
+  set CHECK_VS2022=1
+) else (
+  if /I "%TOOL_CHAIN_TAG%"=="VS2022" (
+    set CHECK_VS2022=1
+  )
+)
+if %CHECK_VS2022% NEQ 0 (
+  for /f "usebackq tokens=1* delims=: " %%i in (`"%VS_WHERE%" -version [17.0^,18.0^)`) do (
+    if /i "%%i"=="installationPath" set INSTALL_PATH=%%j
+  )
+)
+if %CHECK_VS2022% NEQ 0 (
+  if defined INSTALL_PATH (
+    echo.
+    echo Prebuild:  Set the VS2022 environment.
+    echo.
+    if not defined VS160COMNTOOLS (
+      call "%INSTALL_PATH%\VC\Auxiliary\Build\vcvars32.bat"
+    )
+    set TOOL_CHAIN_TAG=VS2022
+  )
+)
+
 set CHECK_VS2019=0
 if not defined TOOL_CHAIN_TAG (
   set CHECK_VS2019=1
@@ -155,11 +184,7 @@ if errorlevel 1 (
   set SCRIPT_ERROR=1
   goto End
 )
-copy /B /Y ..\edkrepo_installer\Release\SetupLauncher.exe ..\dist\self_extract
-if errorlevel 1 (
-  set SCRIPT_ERROR=1
-  goto End
-)
+
 copy /B /Y ..\edkrepo_installer\EdkRepoInstaller\bin\Release\EdkRepoInstaller.exe ..\dist\self_extract
 if errorlevel 1 (
   set SCRIPT_ERROR=1

diff --git a/edkrepo_installer/SelfExtract/config.txt b/edkrepo_installer/SelfExtract/config.txt
@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
 Title="EdkRepo Installer"
-RunProgram="SetupLauncher.exe"
+RunProgram="EdkRepoInstaller.exe"
 ;!@InstallEnd@!