X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=7fabe4690e921b6d2be5a841258f983a03f2e380;hp=90e92e6a7661d0f9f25c706779eeabce97390b42;hb=c81d735d570e86056e90ea2e7b5ddfad66736f22;hpb=d14ebb43742f411f2a013996b8e76bcab2420552

diff --git a/edksetup.bat b/edksetup.bat
index 90e92e6a76..7fabe4690e 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -10,12 +10,12 @@
 @REM
 
 @REM set following environment in this file or in command shell
-@REM set JAVA_HOME=C:\Java\jdk1.5.0_04
+@REM set JAVA_HOME=C:\Java\jdk1.5.0_06
 @REM set ANT_HOME=C:\ANT
 @REM set XMLBEANS_HOME=C:\xmlbeans
 @REM set CYGWIN_HOME=C:\cygwin
 
-@REM usage: edksetup.bat [Rebuild] [ForceRebuild]
+@REM usage: edksetup.bat [Rebuild] [ForceRebuild] [Reconfig]
 @REM if the argument, skip is present, only the paths and the
 @REM test and set of environment settings are performed. 
 
@@ -67,6 +67,9 @@ set WORKSPACE=%CD%
 
 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
 
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH= %CLASSPATH%
+set CLASSPATH=%ORIGINAL_CLASSPATH%
+
 if defined WORKSPACE_TOOLS_PATH goto check_path
 set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
 set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
@@ -76,7 +79,7 @@ goto path_ok
 :check_path
 if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok
 set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%
-set WORKSPACE_PATH=%WORKSPACE%
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin
 echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 
 :path_ok
@@ -87,8 +90,11 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 @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 NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild
+@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild
 @IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild
@@ -127,13 +133,12 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 @IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild
 
 @if "%1"=="Rebuild" goto NormalBuild
-@if "%1"=="ForceRebuild" goto ForceBuild
 @if NOT "%1"=="" goto Usage
 
 goto skipbuild
 
-:ForceBuild
-call ant -f %WORKSPACE%\Tools\build.xml cleanall
+:ForceBuild 
+call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall
 
 :NormalBuild
 @REM
@@ -149,7 +154,7 @@ echo.
 @REM Java Programs can use it.
 @REM It needs the XMLBEANS libraries in order to compile.
 @REM
-set CLASSPATH=%XMLBEANS_HOME%\lib
+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
@@ -177,6 +182,7 @@ 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
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -227,7 +233,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%
 echo PATH:          %PATH%
 echo.
-set CLASSPATH=%XMLBEANS_HOME%\lib
+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
@@ -241,12 +247,27 @@ 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
 echo CLASSPATH:     %CLASSPATH%
 goto end
 
+:Reconfig
+@REM
+@REM Reinstall all config files
+@REM
+call ant -f %WORKSPACE%\Tools\build.xml reconfig
+goto end
+
 :Usage
 echo.
-echo  Usage: %0 [Rebuild] [ForceRebuild]
+echo  Usage: %0 [Rebuild] [ForceRebuild] [Reconfig]
+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. 
+echo.
+echo  Note that target.template, tools_def.template, FrameworkDatabase.template will be
+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.
 
 :end