From 3fab94ed1e624c5bf6316601079e3f82e5bc5663 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 22 Jun 2007 06:25:37 +0000
Subject: [PATCH] Added "NewBuild" option to incorporate new build system
 locating in $(WORKSPACE)\BaseTools. This is a temporary solution which is
 subject to change in the future. Don't use it in formal platform or module
 build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2706 6f19259b-4bc3-4df7-8a09-765794883524
---
 edksetup.bat | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/edksetup.bat b/edksetup.bat
index 47d0fd10cf..740537faa6 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -25,6 +25,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
 
-- 
2.39.2