This is a patch from Yizhong to fix the XMLBEANS location.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Source/GenBuild/build.xml
index 38801f1495a4ab047a2944767746de1616a4d3e5..473646bdb2d011284f03c05ffeaad60e14e04ce7 100644 (file)
--- a/Tools/Source/GenBuild/build.xml
+++ b/Tools/Source/GenBuild/build.xml
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="SurfaceArea.jar"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="SurfaceArea.jar"/>\r

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r

   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r
   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>\r

diff --git a/Tools/Source/ModuleEditor/build.xml b/Tools/Source/ModuleEditor/build.xml
index f78750e819ac6932dc344db17d3883a8b9c7f326..2696c71d0113b7332534cf1784bf1efb92b404e6 100644 (file)
--- a/Tools/Source/ModuleEditor/build.xml
+++ b/Tools/Source/ModuleEditor/build.xml
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r

   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>\r
   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>\r

diff --git a/Tools/Source/PackageEditor/build.xml b/Tools/Source/PackageEditor/build.xml
index 2dd3dce273774d17327e84d0b823b5529e4651b3..982e159a52f32df752e4f81c5cc131c3555571c7 100644 (file)
--- a/Tools/Source/PackageEditor/build.xml
+++ b/Tools/Source/PackageEditor/build.xml
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r

   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>\r
   </path>\r
   <property name="buildDir" value="build"/>\r
   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>\r

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 415958a4d7608786b9fcdff47b58dceb440f39eb..b43d335f130723ecd305731f8be04458ef3e63d0 100644 (file)
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${WORKSPACE}/Tools/Jars">\r
       <include name="*.jar"/>\r
     </fileset>\r
     <fileset dir="${WORKSPACE}/Tools/Jars">\r
       <include name="*.jar"/>\r
     </fileset>\r

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib">\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib">\r

       <include name="*.jar"/>\r
     </fileset>\r
     <pathelement path = "${env.CLASSPATH}"/>\r
       <include name="*.jar"/>\r
     </fileset>\r
     <pathelement path = "${env.CLASSPATH}"/>\r

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 8a7b3badc28308b3989107841f6c141ca1c764dc..0022802b4c23d850b028565231ed45b84f87c65d 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r
 \r
   <path id="classpath">\r
     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>\r

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r

   </path>\r
 \r
   <target name="all" depends="init, Tools" />\r
   </path>\r
 \r
   <target name="all" depends="init, Tools" />\r

diff --git a/edksetup.bat b/edksetup.bat
index 0742e23ed06286c258a525b2394415a5071481fe..6f45077ba9b32010da3973545b4a2d74d281117e 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -61,17 +61,17 @@ echo PATH:      %PATH%
 echo.\r
 \r
 @REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it\r
 echo.\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;%WORKSPACE%Tools\Jars\saxon8.jar\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

 \r
 call ant -f %WORKSPACE%Tools\build.xml SurfaceArea\r
 \r
 @REM Now we can make the other Java Programs\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;%WORKSPACE%Tools\Jars\saxon8.jar\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

 \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
 \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;%WORKSPACE%Tools\Jars\saxon8.jar\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

 \r
 call ant -f %WORKSPACE%Tools\build.xml C_Code\r
 \r
 \r
 call ant -f %WORKSPACE%Tools\build.xml C_Code\r
 \r