X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=04409836dafa6ca4ba47be6c14994cb3fabcb740;hp=4a5abcc5869941a221fef24f1f244df4eb52db08;hb=a8a9de7cbbfc0146a1c6c5c9a9dc4abfe48fca6e;hpb=11f009f190e49bcfd888cc0b4c808e0037204c16;ds=sidebyside

diff --git a/edksetup.bat b/edksetup.bat
index 4a5abcc586..04409836da 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -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
@@ -133,7 +134,7 @@ 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
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall
 
 :NormalBuild
 @REM
@@ -172,6 +173,7 @@ 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
@@ -235,6 +237,7 @@ 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