FatBinPkg: Update EBC/IA32/X64/IPF binaries

[mirror_edk2.git] / Edk2Setup.bat

diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index bdf85c221f6b89edf6ca708382d65e57afe841d3..0aa786d9ab94fbcec87314f31a9704a948904228 100755 (executable)
--- a/Edk2Setup.bat
+++ b/Edk2Setup.bat
@@ -47,11 +47,11 @@
 @REM #\r
 @echo off\r
 @set SCRIPT_NAME=%0\r
-@set SCRIPT_VERSION=0.9.0.\r
-@set SVN_REVISION=$Revision: 8 $\r
+@set SCRIPT_VERSION=0.9.2.\r
+@set SVN_REVISION=$Revision$\r
 @set RESET_ENVIRONMENT=FALSE\r
 @set NT32PKG=FALSE\r
-@set NT32_64=FALSE\r
+@set NT32_X64=\r
 @set BUILD_TOOLS_WITH=\r
 @set LOCATION=\r
 @set REBUILD_TOOLS=\r
@@ -180,7 +180,7 @@
     @REM This option will try to set the environment for building the Nt32Pkg/Nt32Pkg; on a 64-bit \r
     @REM Windows OS\r
     @if /I "%2"=="X64" (\r
-        @set NT32_64=TRUE\r
+        @set NT32_X64=TRUE\r
         @shift\r
     )\r
   @shift\r
@@ -319,7 +319,13 @@
 @if not exist "%EDK_TOOLS_PATH%" (\r
     @mkdir %EDK_TOOLS_PATH%\r
 )\r
-\r
+@if not defined NASM_PREFIX (\r
+    @echo.\r
+    @echo WARNING : NASM_PREFIX environment variable is not set\r
+    @if exist "C:\nasm\nasm.exe" @set "NASM_PREFIX=C:\nasm\"\r
+    @if exist "C:\nasm\nasm.exe" @echo   Found nasm.exe, setting the environment variable to C:\nasm\\r
+    @if not exist "C:\nasm\nasm.exe" echo   Attempting to build modules that require NASM will fail.\r
+)\r
 @REM Set up the path to include the EDK_TOOLS_PATH\Bin\Win32 directory; this test determines\r
 @REM whether the path is in the workspace or a fully qualified path that may be outside of\r
 @REM the workspace\r
@@ -370,8 +376,7 @@
 @if "%NT32PKG%"=="TRUE" (\r
     @if not defined VSINSTALLDIR @set "PATH=%ORIGINAL_PATH%"\r
     @if not defined NT32_X64 @call "%WORKSPACE%\BaseTools\get_vsvars.bat"\r
-    @if defined NT32_X64 call "%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat\r
-    @set NT32_X64=\r
+    @if defined NT32_X64 call "%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat"\r
 )\r
 @if "%NT32PKG%"=="TRUE" (\r
     @if not defined VS_PATH set "VS_PATH=%PATH%"\r
@@ -422,8 +427,8 @@
 @call python --version > nul 2>&1\r
 @if errorlevel 1 @set "PATH=%PYTHONHOME%\python.exe;%PATH%"\r
 @if not defined PYTHON_FREEZER_PATH (\r
-    @if not exist %PYTHONHOME%\Scripts\cxfreeze.bat @goto NoCxFreeze\r
-    @set PYTHON_FREEZER_PATH=%PYTHONHOME%\Scripts\r
+    @if not exist "%PYTHONHOME%\Scripts\cxfreeze.bat" @goto NoCxFreeze\r
+    @set "PYTHON_FREEZER_PATH=%PYTHONHOME%\Scripts"\r
 )\r
 @call "%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat"\r
 @if errorlevel 1 @goto ExitFailure\r
@@ -441,7 +446,6 @@
 @set RESET_ENVIRONMENT=\r
 @set RECONFIG=\r
 @set NT32PKG=\r
-@set NT32_64=\r
 @set BUILD_TOOLS_WITH=\r
 @set LOCATION=\r
 @set REBUILD_TOOLS=\r
@@ -461,7 +465,6 @@
 @set RESET_ENVIRONMENT=\r
 @set RECONFIG=\r
 @set NT32PKG=\r
-@set NT32_64=\r
 @set BUILD_TOOLS_WITH=\r
 @set LOCATION=\r
 @set REBUILD_TOOLS=\r