Put the our jar files before the system's CLASSPATH
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1798 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
34ff1170bc
commit
d2f9b39f43
60
edksetup.bat
60
edksetup.bat
@ -154,13 +154,13 @@ 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=%CLASSPATH%;%XMLBEANS_HOME%\lib
|
set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%
|
||||||
|
|
||||||
call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
|
call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
|
||||||
|
|
||||||
@ -168,7 +168,7 @@ call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
|
|||||||
@REM Now we can make the other Java Programs
|
@REM Now we can make the other Java Programs
|
||||||
@REM All of the remaining Java Programs require the SurfaceArea library to compile
|
@REM All of the remaining Java Programs require the SurfaceArea library to compile
|
||||||
@REM
|
@REM
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%
|
||||||
|
|
||||||
call ant -f %WORKSPACE%\Tools\build.xml JavaCode
|
call ant -f %WORKSPACE%\Tools\build.xml JavaCode
|
||||||
|
|
||||||
@ -176,13 +176,13 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode
|
|||||||
@REM We have all of the Java Programs and add-in classes created, so we can start
|
@REM We have all of the Java Programs and add-in classes created, so we can start
|
||||||
@REM using the cpp-tasks to create our tools
|
@REM using the cpp-tasks to create our tools
|
||||||
@REM
|
@REM
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%
|
||||||
|
|
||||||
call ant -f %WORKSPACE%\Tools\build.xml C_Code
|
call ant -f %WORKSPACE%\Tools\build.xml C_Code
|
||||||
|
|
||||||
@ -233,21 +233,21 @@ 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=%CLASSPATH%;%XMLBEANS_HOME%\lib
|
set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar
|
set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\PcdTools.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH%
|
||||||
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\MigrationTools.jar
|
set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH%
|
||||||
echo CLASSPATH: %CLASSPATH%
|
echo CLASSPATH: %CLASSPATH%
|
||||||
goto end
|
goto end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user