git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1233 6f19259b...

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 90e92e6a7661d0f9f25c706779eeabce97390b42..04409836dafa6ca4ba47be6c14994cb3fabcb740 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -76,7 +76,7 @@ goto path_ok
 :check_path\r
 if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok\r
 set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%\r
-set WORKSPACE_PATH=%WORKSPACE%\r
+set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
 echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE\r
 \r
 :path_ok\r
@@ -89,6 +89,7 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 @if "%1"=="/help" goto Usage\r
 \r
 @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild\r
+@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild\r
 @IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild\r
@@ -133,7 +134,7 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 goto skipbuild\r
 \r
 :ForceBuild\r
-call ant -f %WORKSPACE%\Tools\build.xml cleanall\r
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall\r
 \r
 :NormalBuild\r
 @REM\r