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

diff --git a/edksetup.bat b/edksetup.bat
index 90e92e6a76..ec9f20444e 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -10,7 +10,7 @@
 @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
@@ -76,7 +76,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
@@ -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
@@ -132,8 +133,9 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 
 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
@@ -177,6 +179,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
 
@@ -241,6 +244,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
 echo CLASSPATH:     %CLASSPATH%
 goto end