1 files changed, 14 insertions, 5 deletions
diff --git a/edksetup.bat b/edksetup.bat
index 47d0fd10cf..740537faa6 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -26,6 +26,14 @@
 @echo off
 
 @REM
+@REM Set the WORKSPACE to the current working directory
+@REM
+set WORKSPACE=%CD%
+
+@if /I "%1"=="NewBuild" goto NewBuild
+
+:AntBuild
+@REM
 @REM Check the required system environment variables
 @REM
 
@@ -60,11 +68,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%
@@ -272,6 +275,12 @@ echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectivel
 echo  are not existed. Using option [Reconfig] to do the force copy. 
 echo.
 
+:NewBuild
+@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
+@set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+@call BaseTools\toolsetup.bat
+@goto end
+
 :end
 @echo on