tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed EDKT381. We can keep the system's CLASSPATH value after executing edksetup.bat and won't duplicate it with more than one time of execution. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1769 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-10-17 06:24:21 +00:00
parent ae69d4dae8
commit eb614e7e39
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
edksetup.bat
View File

@ -67,6 +67,9 @@ set WORKSPACE=%CD%
set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH%
set CLASSPATH=%ORIGINAL_CLASSPATH%
if defined WORKSPACE_TOOLS_PATH goto check_path if defined WORKSPACE_TOOLS_PATH goto check_path
set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH% set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%
set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH% set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%
@ -134,8 +137,7 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
goto skipbuild goto skipbuild
:ForceBuild :ForceBuild
@if "%CLASSPATH%"=="" set CLASSPATH= call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall
call ant -noclasspath -f %WORKSPACE%\Tools\build.xml cleanall
:NormalBuild :NormalBuild
@REM @REM
@ -151,7 +153,7 @@ echo.
@REM Java Programs can use it. @REM Java Programs can use it.
@REM It needs the XMLBEANS libraries in order to compile. @REM It needs the XMLBEANS libraries in order to compile.
@REM @REM
set CLASSPATH=%XMLBEANS_HOME%\lib set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
@ -230,7 +232,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
echo CYGWIN_HOME: %CYGWIN_HOME% echo CYGWIN_HOME: %CYGWIN_HOME%
echo PATH: %PATH% echo PATH: %PATH%
echo. echo.
set CLASSPATH=%XMLBEANS_HOME%\lib set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar