<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
<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
<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
-->\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
</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}
${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
</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