Fix for EDKT9.

[mirror_edk2.git] / Tools / Source / SurfaceArea / build.xml

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 415958a4d7608786b9fcdff47b58dceb440f39eb..66a811a2acb08269a6c3fb6fd9972319bde2fc74 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/bin/xmlbeans/lib">\r
+    <fileset dir="${env.XMLBEANS_HOME}/lib">\r
       <include name="*.jar"/>\r
     </fileset>\r
     <pathelement path = "${env.CLASSPATH}"/>\r
@@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-out"/>\r
       <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>\r
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>\r
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>\r
     </java>\r
   </target>\r
@@ -59,14 +59,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-src"/>\r
       <arg value="${WORKSPACE}/Tools/Source/SurfaceArea"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>\r
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>\r
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>\r
     </java>\r
   </target>\r
   \r
   <target name="SurfaceArea" depends="init" unless="jar.newer">\r
     <antcall target="SurfaceArea.java.clean"/>\r
-    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">\r
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">\r
       <classpath refid="classpath"/>\r
       <arg value="-javasource"/>\r
       <arg value="1.5"/>\r
@@ -76,7 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-out"/>\r
       <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>\r
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>\r
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>\r
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>\r
     </java>\r
   </target>\r
@@ -185,6 +185,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall" depends="SurfaceArea.jar.clean">\r
+    <delete file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r
     <if>\r
       <available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>\r
       <then>\r