Added more error check on validation to let result be more exact.

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

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 415958a4d7608786b9fcdff47b58dceb440f39eb..f6e512b5a120e78c33a6fa7c16e53ae83f4126f6 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,14 +76,14 @@ 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
   \r
   <target name="SurfaceArea.java.clean">\r
-    <delete includeemptydirs="true">\r
-      <fileset dir="${WORKSPACE}/Tools/Source/SurfaceArea" includes="**/*" excludes="build.xml"/>\r
+    <delete includeemptydirs="true" failonerror="false">\r
+      <fileset dir="${WORKSPACE}/Tools/Source/SurfaceArea/org" includes="**/*"/>\r
     </delete>\r
   </target>\r
 \r
@@ -100,7 +100,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     -->\r
     <copy file="${SURFACE_AREA_FILE}" tofile="${SURFACE_AREA_FILE}.xml"/>\r
     <java classname="org.apache.xmlbeans.impl.tool.InstanceValidator" \r
-      outputproperty="XMLBEANS_OUTPUT" >\r
+          outputproperty="XMLBEANS_OUTPUT"\r
+          errorproperty="XMLBEANS_ERROR">\r
           \r
       <classpath refid="classpath"/>\r
       <arg value="-dl"/>\r
@@ -110,7 +111,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </java>   \r
 \r
     <delete file="${SURFACE_AREA_FILE}.xml" quiet="true"/>\r
-    <echo message="Result ... ${XMLBEANS_OUTPUT}"/>\r
+    <if>\r
+      <or>\r
+        <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>\r
+        <contains string="${XMLBEANS_OUTPUT}" substring=": error:"/>\r
+        <contains string="${XMLBEANS_ERROR}" substring="XmlException"/>\r
+        <contains string="${XMLBEANS_ERROR}" substring=": error:"/>\r
+      </or>\r
+      <then>\r
+        <echo message="Result ... ${XMLBEANS_OUTPUT}&#x0d;&#x0a;${XMLBEANS_ERROR}"/>\r
+        <fail message="${SURFACE_AREA_FILE} is invalid!"/>\r
+      </then>\r
+      <else>\r
+        <echo message="Result ... ${SURFACE_AREA_FILE} is valid"/>\r
+      </else>\r
+    </if>\r
   </target>\r
   \r
   <!--\r
@@ -185,6 +200,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