Fixed build break caused by GetPerformanceCounter() in PeiMain module

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 90e92e6a7661d0f9f25c706779eeabce97390b42..740b7bd15b6badc0a7fe1f78c7d23910d8f152ce 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
@@ -132,8 +133,9 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 \r
 goto skipbuild\r
 \r
-:ForceBuild\r
-call ant -f %WORKSPACE%\Tools\build.xml cleanall\r
+:ForceBuild \r
+@if "%CLASSPATH%"=="" set CLASSPATH=  \r
+call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall\r
 \r
 :NormalBuild\r
 @REM\r
@@ -177,6 +179,7 @@ set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar\r
 \r
 call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
 \r
@@ -241,6 +244,7 @@ set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar\r
 echo CLASSPATH:     %CLASSPATH%\r
 goto end\r
 \r