Updated to check for NASM_PREFIXE system environment variable, also to fix an issue...

[mirror_edk2.git] / Edk2Setup.bat

diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index bdf85c221f6b89edf6ca708382d65e57afe841d3..171a00cad5ce271b2c309b48df6ea9f50372192d 100755 (executable)
--- a/Edk2Setup.bat
+++ b/Edk2Setup.bat
@@ -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
@@ -368,17 +374,17 @@
 \r
 @REM Set up Visual Studio if required to build the Nt32Pkg/Nt32Pkg.dsc emulator\r
 @if "%NT32PKG%"=="TRUE" (\r
-    @if not defined VSINSTALLDIR @set "PATH=%ORIGINAL_PATH%"\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
+    @if defined NT32_X64 call "%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat"\r
     @set NT32_X64=\r
 )\r
 @if "%NT32PKG%"=="TRUE" (\r
-    @if not defined VS_PATH set "VS_PATH=%PATH%"\r
+    @if not defined VS_PATH set VS_PATH=%PATH%\r
 )\r
 @if defined VS_PATH @set "PATH=%VS_PATH%"\r
 @if not defined VS_PATH @set "PATH=%ORIGINAL_PATH%"\r
-@set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"\r
+@set "PATH=%EDK_TOOLS_PATH%\Bin\Win32";%PATH%\r
 \r
 @if "%REBUILD_TOOLS%"=="TRUE" @goto Rebuild\r
 @if "%SVN_PULL%"== "TRUE" (\r
@@ -422,8 +428,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