Changeset 89983 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/set_vsprefix_envs.bat

Timestamp:

Jul 1, 2021 8:17:41 AM (4 years ago)

Author:

vboxsync

Message:

Devices/EFI: Merge edk-stable202105 and openssl 1.1.1j and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• BaseTools/set_vsprefix_envs.bat (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/set_vsprefix_envs.bat

@@ -4 +4 @@
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.
 @REM
-@REM Copyright (c) 2016-2019, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2016-2020, Intel Corporation. All rights reserved.<BR>
 @REM
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -109 +109 @@
 if /I "%1"=="VS2015" goto SetWinDDK
 
-:SetVS2019
-if not defined VS160COMNTOOLS (
+:SetVS2017
+if not defined VS150COMNTOOLS (
+  @REM clear two envs so that vcvars32.bat can run successfully.
+  set VSINSTALLDIR=
+  set VCToolsVersion=
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo
-      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
-        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
-      )
-      del vswhereInfo
-    ) else (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo
+      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
+        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+      )
+      del vswhereInfo
+    ) else (
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
@@ -126 +129 @@
     )
   ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (
-    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo
-      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
-        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
-      )
-      del vswhereInfo
-    ) else (
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo
+      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
+        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+      )
+      del vswhereInfo
+    ) else (
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
@@ -140 +143 @@
     )
   ) else (
-    if /I "%1"=="VS2019" goto ToolNotInstall
+    if /I "%1"=="VS2017" goto ToolNotInstall
     goto SetWinDDK
   )
@@ -146 +149 @@
 
 if defined VCToolsInstallDir (
-  if not defined VS2019_PREFIX (
-    set "VS2019_PREFIX=%VCToolsInstallDir%"
+  if not defined VS2017_PREFIX (
+    set "VS2017_PREFIX=%VCToolsInstallDir%"
   )
   if not defined WINSDK10_PREFIX (
@@ -165 +168 @@
 )
 
-:SetVS2017
-if not defined VS150COMNTOOLS (
+if /I "%1"=="VS2017" goto SetWinDDK
+
+:SetVS2019
+if not defined VS160COMNTOOLS (
+  @REM clear two envs so that vcvars32.bat can run successfully.
+  set VSINSTALLDIR=
+  set VCToolsVersion=
   if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\BuildTools" (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo
-      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
-        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
-      )
-      del vswhereInfo
-    ) else (
-      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo
+    if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools" (
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo
+      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
+        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+      )
+      del vswhereInfo
+    ) else (
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
@@ -182 +190 @@
     )
   ) else if exist "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" (
-    if exist "%ProgramFiles%\Microsoft Visual Studio\2017\BuildTools" (
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 15,16 > vswhereInfo
-      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
-        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
-      )
-      del vswhereInfo
-    ) else (
-      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 15,16 > vswhereInfo
+    if exist "%ProgramFiles%\Microsoft Visual Studio\2019\BuildTools" (
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version 16,17 > vswhereInfo
+      for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
+        if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
+      )
+      del vswhereInfo
+    ) else (
+      call "%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" -version 16,17 > vswhereInfo
       for /f "usebackq tokens=1* delims=: " %%i in (vswhereInfo) do (
         if /i "%%i"=="installationPath" call "%%j\VC\Auxiliary\Build\vcvars32.bat"
@@ -196 +204 @@
     )
   ) else (
-    if /I "%1"=="VS2017" goto ToolNotInstall
+    if /I "%1"=="VS2019" goto ToolNotInstall
     goto SetWinDDK
   )
@@ -202 +210 @@
 
 if defined VCToolsInstallDir (
-  if not defined VS2017_PREFIX (
-    set "VS2017_PREFIX=%VCToolsInstallDir%"
+  if not defined VS2019_PREFIX (
+    set "VS2019_PREFIX=%VCToolsInstallDir%"
   )
   if not defined WINSDK10_PREFIX (
@@ -221 +229 @@
 )
 
+if /I "%1"=="VS2019" goto SetWinDDK
+
 :SetWinDDK
 if not defined WINDDK3790_PREFIX (