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

6 files changed, 8 insertions, 8 deletions

diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Source/GenBuild/build.xml
index 38801f1495..473646bdb2 100644
--- 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}"/>

   <path id="classpath">

     <fileset dir="${WORKSPACE}/Tools/Jars" includes="SurfaceArea.jar"/>

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

+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>

   </path>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>

diff --git a/Tools/Source/ModuleEditor/build.xml b/Tools/Source/ModuleEditor/build.xml
index f78750e819..2696c71d01 100644
--- 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}"/>

   <path id="classpath">

     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>

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

+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>

   </path>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>

diff --git a/Tools/Source/PackageEditor/build.xml b/Tools/Source/PackageEditor/build.xml
index 2dd3dce273..982e159a52 100644
--- 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}"/>

   <path id="classpath">

     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>

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

+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>

   </path>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 415958a4d7..b43d335f13 100644
--- 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">

       <include name="*.jar"/>

     </fileset>

-    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib">

+    <fileset dir="${env.XMLBEANS_HOME}/lib">

       <include name="*.jar"/>

     </fileset>

     <pathelement path = "${env.CLASSPATH}"/>

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index 8a7b3badc2..0022802b4c 100644
--- 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.
 

   <path id="classpath">

     <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>

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

+    <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>

   </path>

 

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

diff --git a/edksetup.bat b/edksetup.bat
index 0742e23ed0..6f45077ba9 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -61,17 +61,17 @@ echo PATH:      %PATH%
 echo.

 

 @REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it

-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

+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

 

 call ant -f %WORKSPACE%Tools\build.xml SurfaceArea

 

 @REM Now we can make the other Java Programs

-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

+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

 

 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 using the cpp-tasks to create our tools

-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

+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

 

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