X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Edk2Setup.bat;h=0aa786d9ab94fbcec87314f31a9704a948904228;hp=bdf85c221f6b89edf6ca708382d65e57afe841d3;hb=fbce471eb1d72a5d2a3c1214b7bcc73c577d5b71;hpb=bf47c6a11b1fca90fe17070e0197963d4d586603

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