X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=475d830db936031d6da60992ec4d1750931efd7b;hp=47d0fd10cfe830eddd6c3517c3b57b2feb983610;hb=46ffb9a4eeea0e46e7d0d8915435f6d56340cd2f;hpb=51ac2ffdab2124694a466b56283440414e51780c

diff --git a/edksetup.bat b/edksetup.bat
index 47d0fd10cf..475d830db9 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -25,6 +25,27 @@
 
 @echo off
 
+@REM
+@REM Set the WORKSPACE to the current working directory
+@REM
+pushd .
+cd %~dp0
+set WORKSPACE=%CD%
+
+@if /I "%1"=="-h" goto Usage
+@if /I "%1"=="-help" goto Usage
+@if /I "%1"=="--help" goto Usage
+@if /I "%1"=="/h" goto Usage
+@if /I "%1"=="/?" goto Usage
+@if /I "%1"=="/help" goto Usage
+@if /I not "%1"=="--nt32" goto check_new_build
+shift
+goto check_vc
+
+:check_new_build
+@if /I "%1"=="NewBuild" goto NewBuild
+
+:AntBuild
 @REM
 @REM Check the required system environment variables
 @REM
@@ -32,12 +53,13 @@
 :check_vc
 if defined VCINSTALLDIR goto check_cygwin
 if defined VS71COMNTOOLS (
-  call "%VS71COMNTOOLS%\vsvars32.bat"
+ call "%VS71COMNTOOLS%\vsvars32.bat"
 ) else (
   echo.
   echo !!! WARNING !!!! Cannot find Visual Studio !!!
   echo.
 )
+goto check_new_build
 
 :check_cygwin
 if defined CYGWIN_HOME goto check_java
@@ -60,11 +82,6 @@ if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
 if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
 if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
 
-@REM
-@REM Set the WORKSPACE to the current working directory
-@REM
-set WORKSPACE=%CD%
-
 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
 
 if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
@@ -84,12 +101,6 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 
 :path_ok
 
-@if /I "%1"=="-h" goto Usage
-@if /I "%1"=="-help" goto Usage
-@if /I "%1"=="--help" goto Usage
-@if /I "%1"=="/h" goto Usage
-@if /I "%1"=="/?" goto Usage
-@if /I "%1"=="/help" goto Usage
 @if /I "%1"=="ForceRebuild" goto ForceBuild
 @if /I "%1"=="Reconfig" goto Reconfig
 
@@ -262,7 +273,9 @@ goto end
 
 :Usage
 echo.
-echo  Usage: %0 [Rebuild] [ForceRebuild] [Reconfig]
+echo  Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig]
+echo         --nt32         Call vsvars32.bat for NT32 platform build
+echo         NewBuild       Using new build tools in BaseTools package
 echo         Rebuild:       Incremental build, only build those updated tools; 
 echo         ForceRebuild:  Rebuild all tools neither updated or not; 
 echo         Reconfig:      Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. 
@@ -271,7 +284,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
 echo  are not existed. Using option [Reconfig] to do the force copy. 
 echo.
+@goto end
+
+:NewBuild
+@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+@call BaseTools\toolsetup.bat
+@goto end
 
 :end
+@popd
 @echo on