Fixed EDKT381. We can keep the system's CLASSPATH value after executing edksetup...

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index ec9f20444edaa04e5625ff88feff4b2ec1b39b07..8a6aeb356c8e308b73731c4e07a45c85b2fea261 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -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
@@ -134,8 +137,7 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 goto skipbuild\r
 \r
 :ForceBuild \r
-@if "%CLASSPATH%"=="" set CLASSPATH=  \r
-call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall\r
+call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall\r
 \r
 :NormalBuild\r
 @REM\r
@@ -151,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
@@ -230,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