X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=475d830db936031d6da60992ec4d1750931efd7b;hp=7fabe4690e921b6d2be5a841258f983a03f2e380;hb=305a12799e69c9247bea76f37d707eeedb3dc9e2;hpb=2fcfed38cbdd18fdda427588fe40718a374af6e6

diff --git a/edksetup.bat b/edksetup.bat
index 7fabe4690e..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,14 +82,9 @@ 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%
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
 set CLASSPATH=%ORIGINAL_CLASSPATH%
 
 if defined WORKSPACE_TOOLS_PATH goto check_path
@@ -84,14 +101,8 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 
 :path_ok
 
-@if "%1"=="-h" goto Usage
-@if "%1"=="-help" goto Usage
-@if "%1"=="--help" goto Usage
-@if "%1"=="/h" goto Usage
-@if "%1"=="/?" goto Usage
-@if "%1"=="/help" goto Usage
-@if "%1"=="ForceRebuild" goto ForceBuild
-@if "%1"=="Reconfig" goto Reconfig
+@if /I "%1"=="ForceRebuild" goto ForceBuild
+@if /I "%1"=="Reconfig" goto Reconfig
 
 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild
@@ -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
 @IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild
 
-@if "%1"=="Rebuild" goto NormalBuild
+@if /I "%1"=="Rebuild" goto NormalBuild
 @if NOT "%1"=="" goto Usage
 
 goto skipbuild
@@ -154,13 +165,13 @@ echo.
 @REM Java Programs can use it.
 @REM It needs the XMLBEANS libraries in order to compile.
 @REM
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
+set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%
 
 call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
 
@@ -168,7 +179,7 @@ call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
 @REM Now we can make the other Java Programs
 @REM All of the remaining Java Programs require the SurfaceArea library to compile
 @REM
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
+set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%
 
 call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 
@@ -176,13 +187,13 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @REM We have all of the Java Programs and add-in classes created, so we can start
 @REM using the cpp-tasks to create our tools
 @REM
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
+set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -233,21 +244,23 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
 echo PATH:          %PATH%
 echo.
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
-set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
+set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH%
+set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
+set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%
 echo CLASSPATH:     %CLASSPATH%
 goto end
 
@@ -260,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. 
@@ -269,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