Fixed a little issue which will cause just one duplicated classpath

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 4a5abcc5869941a221fef24f1f244df4eb52db08..333f061eabc9ac3246693f1885e1409e9256331f 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -10,7 +10,7 @@
 @REM\r
 \r
 @REM set following environment in this file or in command shell\r
-@REM set JAVA_HOME=C:\Java\jdk1.5.0_04\r
+@REM set JAVA_HOME=C:\Java\jdk1.5.0_06\r
 @REM set ANT_HOME=C:\ANT\r
 @REM set XMLBEANS_HOME=C:\xmlbeans\r
 @REM set CYGWIN_HOME=C:\cygwin\r
@@ -67,6 +67,9 @@ set WORKSPACE=%CD%
 \r
 set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
 \r
+if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH= %CLASSPATH%\r
+set CLASSPATH=%ORIGINAL_CLASSPATH%\r
+\r
 if defined WORKSPACE_TOOLS_PATH goto check_path\r
 set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%\r
 set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%\r
@@ -76,7 +79,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 +92,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 +136,8 @@ 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
+call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall\r
 \r
 :NormalBuild\r
 @REM\r
@@ -149,7 +153,7 @@ echo.
 @REM Java Programs can use it.\r
 @REM It needs the XMLBEANS libraries in order to compile.\r
 @REM\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r
@@ -172,10 +176,12 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
 @REM using the cpp-tasks to create our tools\r
 @REM\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
 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
@@ -226,7 +232,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 echo CYGWIN_HOME:   %CYGWIN_HOME%\r
 echo PATH:          %PATH%\r
 echo.\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar\r
@@ -235,10 +241,12 @@ set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
 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