X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=ec9f20444edaa04e5625ff88feff4b2ec1b39b07;hp=3a72031dbdb4bf9397eda45711013ea68daf032c;hb=d61237595f61d2292f72a590684f5b4b054c6409;hpb=b0108f04c6ae6bffd3fcc19dbb0f8c4dffe06759

diff --git a/edksetup.bat b/edksetup.bat
index 3a72031dbd..ec9f20444e 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 [skip]
+@REM usage: edksetup.bat [Rebuild] [ForceRebuild]
 @REM if the argument, skip is present, only the paths and the
 @REM test and set of environment settings are performed. 
 
@@ -70,14 +70,14 @@ set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
 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%
-echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 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%
-echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin
+echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE
 
 :path_ok
 
@@ -89,6 +89,7 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 @if "%1"=="/help" goto Usage
 
 @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
@@ -128,11 +129,13 @@ echo Resetting the PATH variable to include the Framework_Tools_Path for this WO
 
 @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 
+@if "%CLASSPATH%"=="" set CLASSPATH=  
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall
 
 :NormalBuild
 @REM
@@ -171,10 +174,12 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @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
 
 call ant -f %WORKSPACE%\Tools\build.xml C_Code
 
@@ -234,10 +239,13 @@ 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
+echo CLASSPATH:     %CLASSPATH%
 goto end
 
 :Usage