Streamline the tools build and make it friendlier to gcc.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 23c2acdb871f365864e932726867b03512f82d42..be35f978ea9ced511ae96867fde23b6b8f252b81 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -60,8 +60,7 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME%
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin\r
 \r
 \r
-if "%PATHBACKUP%"=="" set PATHBACKUP=%PATH%\r
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATHBACKUP%;%CYGWIN_HOME%\bin\r
+set PATH=%Framework_Tools_Path%;%PATH%\r
 \r
 echo PATH:      %PATH%\r
 echo.\r
@@ -71,17 +70,22 @@ if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
 echo Building the Tiano Tools\r
 \r
 @REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar\r
+@REM It needs the xmlbeans libaries in order to compile.\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml SurfaceArea\r
 \r
 @REM Now we can make the other Java Programs\r
-set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar\r
+@REM All of the remaining Java Programs require the SurfaceArea library to compile\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%Tools\Jars\SurfaceArea.jar\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml JavaCode\r
 \r
 @REM We have all of the Java Programs and add-in classes created, so we can start using the cpp-tasks to create our tools\r
-set CLASSPATH=%WORKSPACE%Tools\Jars\SurfaceArea.jar;%WORKSPACE%Tools\Jars\GenBuild.jar;%WORKSPACE%Tools\Jars\cpptasks.jar;%WORKSPACE%Tools\Jars\frameworktasks.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%Tools\Jars\SurfaceArea.jar;%WORKSPACE%Tools\Jars\GenBuild.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%Tools\Jars\cpptasks.jar;%WORKSPACE%Tools\Jars\frameworktasks.jar\r
 \r
 call ant -f %WORKSPACE%Tools\build.xml C_Code\r
 \r