BaseTools/Conf/tools_def.template:

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index d91bd1cf0b8d5a0e64501a320e9e75eef8a830b7..8f3e1ec94f27528e0bbb0a41aac886787145cc42 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -51,9 +51,15 @@ goto check_vc
 @REM\r
 \r
 :check_vc\r
+@REM The following setup is required for building the Nt32Pkg\Nt32.dsc\r
+@REM platform emulation environment.\r
 if defined VCINSTALLDIR goto check_cygwin\r
 if defined VS71COMNTOOLS (\r
- call "%VS71COMNTOOLS%\vsvars32.bat"\r
+  @REM Use Visual Studio .NET 2003 if it is installed\r
+  call "%VS71COMNTOOLS%\vsvars32.bat"\r
+) else if defined VS80COMNTOOLS (\r
+  @REM Use Visual Studio 2005 iff Visual Studio .NET 2003 is not installed.\r
+  call "%VS80COMNTOOLS%\vsvars32.bat"\r
 ) else (\r
   echo.\r
   echo !!! WARNING !!!! Cannot find Visual Studio !!!\r
@@ -62,6 +68,7 @@ if defined VS71COMNTOOLS (
 goto check_new_build\r
 \r
 :check_cygwin\r
+@if /I "%1"=="NewBuild" goto NewBuild\r
 if defined CYGWIN_HOME goto check_java\r
 if exist c:\cygwin (\r
   set CYGWIN_HOME=c:\cygwin\r
@@ -287,9 +294,9 @@ echo.
 @goto end\r
 \r
 :NewBuild\r
-@IF NOT EXIST "Tools\BaseTools\toolsetup.bat" goto AntBuild\r
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\Tools\BaseTools\r
-@call Tools\BaseTools\toolsetup.bat\r
+@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild\r
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
+@call BaseTools\toolsetup.bat\r
 @goto end\r
 \r
 :end\r