BaseTools/Conf/tools_def.template:

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 740537faa699fd5f0166eede603ac5a6501dfb3f..8f3e1ec94f27528e0bbb0a41aac886787145cc42 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -28,8 +28,21 @@
 @REM\r
 @REM Set the WORKSPACE to the current working directory\r
 @REM\r
+pushd .\r
+cd %~dp0\r
 set WORKSPACE=%CD%\r
 \r
+@if /I "%1"=="-h" goto Usage\r
+@if /I "%1"=="-help" goto Usage\r
+@if /I "%1"=="--help" goto Usage\r
+@if /I "%1"=="/h" goto Usage\r
+@if /I "%1"=="/?" goto Usage\r
+@if /I "%1"=="/help" goto Usage\r
+@if /I not "%1"=="--nt32" goto check_new_build\r
+shift\r
+goto check_vc\r
+\r
+:check_new_build\r
 @if /I "%1"=="NewBuild" goto NewBuild\r
 \r
 :AntBuild\r
@@ -38,16 +51,24 @@ set WORKSPACE=%CD%
 @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
+  @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
   echo.\r
 )\r
+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
@@ -87,12 +108,6 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 \r
 :path_ok\r
 \r
-@if /I "%1"=="-h" goto Usage\r
-@if /I "%1"=="-help" goto Usage\r
-@if /I "%1"=="--help" goto Usage\r
-@if /I "%1"=="/h" goto Usage\r
-@if /I "%1"=="/?" goto Usage\r
-@if /I "%1"=="/help" goto Usage\r
 @if /I "%1"=="ForceRebuild" goto ForceBuild\r
 @if /I "%1"=="Reconfig" goto Reconfig\r
 \r
@@ -265,7 +280,9 @@ goto end
 \r
 :Usage\r
 echo.\r
-echo  Usage: %0 [Rebuild] [ForceRebuild] [Reconfig]\r
+echo  Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig]\r
+echo         --nt32         Call vsvars32.bat for NT32 platform build\r
+echo         NewBuild       Using new build tools in BaseTools package\r
 echo         Rebuild:       Incremental build, only build those updated tools; \r
 echo         ForceRebuild:  Rebuild all tools neither updated or not; \r
 echo         Reconfig:      Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. \r
@@ -274,13 +291,15 @@ echo  Note that target.template, tools_def.template, FrameworkDatabase.template
 echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they\r
 echo  are not existed. Using option [Reconfig] to do the force copy. \r
 echo.\r
+@goto end\r
 \r
 :NewBuild\r
 @IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild\r
-@set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\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
+@popd\r
 @echo on\r
 \r