Moving BaseTools to Tools/BaseTools.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index da7c7e5ff0c799db7ad1f3d83fd8161fa5d7df5c..37c1b2615955ceb3d26cffdb2af53eae74dd699b 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -25,6 +25,21 @@
 \r
 @echo off\r
 \r
+@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 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
 @REM\r
 @REM Check the required system environment variables\r
 @REM\r
@@ -32,12 +47,13 @@
 :check_vc\r
 if defined VCINSTALLDIR goto check_cygwin\r
 if defined VS71COMNTOOLS (\r
-  call "%VS71COMNTOOLS%\vsvars32.bat"\r
+ call "%VS71COMNTOOLS%\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 defined CYGWIN_HOME goto check_java\r
@@ -60,11 +76,6 @@ if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
 if "%XMLBEANS_HOME%"=="" goto no_xmlbeans\r
 if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8\r
 \r
-@REM\r
-@REM Set the WORKSPACE to the current working directory\r
-@REM\r
-set WORKSPACE=%CD%\r
-\r
 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
 \r
 if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%\r
@@ -84,14 +95,14 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 \r
 :path_ok\r
 \r
-@if "%1"=="-h" goto Usage\r
-@if "%1"=="-help" goto Usage\r
-@if "%1"=="--help" goto Usage\r
-@if "%1"=="/h" goto Usage\r
-@if "%1"=="/?" goto Usage\r
-@if "%1"=="/help" goto Usage\r
-@if "%1"=="ForceRebuild" goto ForceBuild\r
-@if "%1"=="Reconfig" goto Reconfig\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
 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild\r
@@ -132,7 +143,7 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 @IF NOT EXIST "Tools\bin\antlr.exe" goto NormalBuild\r
 @IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild\r
 \r
-@if "%1"=="Rebuild" goto NormalBuild\r
+@if /I "%1"=="Rebuild" goto NormalBuild\r
 @if NOT "%1"=="" goto Usage\r
 \r
 goto skipbuild\r
@@ -239,6 +250,8 @@ set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
 set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%\r
 set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%\r
 set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH%\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH%\r
 set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%\r
 set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%\r
 set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%\r
@@ -270,6 +283,13 @@ echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectivel
 echo  are not existed. Using option [Reconfig] to do the force copy. \r
 echo.\r
 \r
+:NewBuild\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
+@popd\r
 @echo on\r
 \r