X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FSurfaceArea%2Fbuild.xml;h=f6e512b5a120e78c33a6fa7c16e53ae83f4126f6;hp=62378864bccb15ce9d831a8533acbe11f08b0826;hb=27169a56e67556796ab0410c8917436dc9aa2abf;hpb=617cc72bf4b6c9d49c5e05c474afb8a1e8f98728

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 62378864bc..f6e512b5a1 100644
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -66,7 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   
   <target name="SurfaceArea" depends="init" unless="jar.newer">
     <antcall target="SurfaceArea.java.clean"/>
-    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
       <classpath refid="classpath"/>
       <arg value="-javasource"/>
       <arg value="1.5"/>
@@ -82,8 +82,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
   
   <target name="SurfaceArea.java.clean">
-    <delete includeemptydirs="true">
-      <fileset dir="${WORKSPACE}/Tools/Source/SurfaceArea" includes="**/*" excludes="build.xml"/>
+    <delete includeemptydirs="true" failonerror="false">
+      <fileset dir="${WORKSPACE}/Tools/Source/SurfaceArea/org" includes="**/*"/>
     </delete>
   </target>
 
@@ -100,7 +100,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     -->
     <copy file="${SURFACE_AREA_FILE}" tofile="${SURFACE_AREA_FILE}.xml"/>
     <java classname="org.apache.xmlbeans.impl.tool.InstanceValidator" 
-      outputproperty="XMLBEANS_OUTPUT" >
+          outputproperty="XMLBEANS_OUTPUT"
+          errorproperty="XMLBEANS_ERROR">
           
       <classpath refid="classpath"/>
       <arg value="-dl"/>
@@ -110,7 +111,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </java>   
 
     <delete file="${SURFACE_AREA_FILE}.xml" quiet="true"/>
-    <echo message="Result ... ${XMLBEANS_OUTPUT}"/>
+    <if>
+      <or>
+        <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>
+        <contains string="${XMLBEANS_OUTPUT}" substring=": error:"/>
+        <contains string="${XMLBEANS_ERROR}" substring="XmlException"/>
+        <contains string="${XMLBEANS_ERROR}" substring=": error:"/>
+      </or>
+      <then>
+        <echo message="Result ... ${XMLBEANS_OUTPUT}&#x0d;&#x0a;${XMLBEANS_ERROR}"/>
+        <fail message="${SURFACE_AREA_FILE} is invalid!"/>
+      </then>
+      <else>
+        <echo message="Result ... ${SURFACE_AREA_FILE} is valid"/>
+      </else>
+    </if>
   </target>
   
   <!--