X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FSurfaceArea%2Fbuild.xml;h=7e6368386fda57d20308d59b7c3f380dcd4bf274;hb=342810920f770d7f2ad8c05507d2d6a4515dbafc;hp=48c0b5a78bbf7a195e06f5371463125846477f3d;hpb=4182ff457cf3a95c0d615fa838996b48770af61e;p=mirror_edk2.git

diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index 48c0b5a78b..7e6368386f 100644
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-out"/>
       <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
     </java>
   </target>
@@ -59,7 +59,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-src"/>
       <arg value="${WORKSPACE}/Tools/Source/SurfaceArea"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
     </java>
   </target>
@@ -76,14 +76,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <arg value="-out"/>
       <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
-      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FarManifest.xsd"/>
       <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
     </java>
   </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,9 @@ 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"
+          resultproperty="XMLBEANS_RESULT"
+          errorproperty="XMLBEANS_ERROR">
           
       <classpath refid="classpath"/>
       <arg value="-dl"/>
@@ -110,7 +112,15 @@ 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>
+      <contains string="${XMLBEANS_OUTPUT}" substring="NOT valid"/>
+      <then>
+        <fail message="Result ... ${XMLBEANS_OUTPUT}"/>
+      </then>
+      <else>
+        <echo message="Result ... ${XMLBEANS_OUTPUT}"/>
+      </else>
+    </if>
   </target>
   
   <!--
@@ -185,6 +195,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>
 
   <target name="cleanall" depends="SurfaceArea.jar.clean">
+    <delete file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
     <if>
       <available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
       <then>