svn commit: r526505 - in /forrest/trunk: etc/xmlformat.conf main/build.xml

[cr...@apache.org]

Author: crossley
Date: Sat Apr  7 18:52:05 2007
New Revision: 526505

URL: http://svn.apache.org/viewvc?view=rev&rev=526505
Log:
Add Ant target 'xmlformat' and initial xmlformat.conf for FOR-644

Added:
    forrest/trunk/etc/xmlformat.conf
Modified:
    forrest/trunk/main/build.xml

Added: forrest/trunk/etc/xmlformat.conf
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/xmlformat.conf?view=auto&rev=526505
==============================================================================
--- forrest/trunk/etc/xmlformat.conf (added)
+++ forrest/trunk/etc/xmlformat.conf Sat Apr  7 18:52:05 2007
@@ -0,0 +1,21 @@
+*DEFAULT
+  subindent 2
+
+p, abstract, description, note, warning, fixme, quote
+  normalize yes
+  wrap-length 80
+
+title, li, dt, dd
+  entry-break 0
+  exit-break 0
+
+strong, a, link, jump, fork, em, code, sub, sup, tt
+  format inline
+
+source, pre, blockcode
+  format block
+  normalize no
+
+xsl:text
+  format verbatim
+# FIXME: xsl:text elements are then left-aligned to column 1

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?view=diff&rev=526505&r1=526504&r2=526505
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Sat Apr  7 18:52:05 2007
@@ -160,7 +160,44 @@
     depends="clean,dist-shbat" />
 
   <!-- =================================================================== -->
-  <!-- Use tidy.sf.net on a single xml-type file                           -->
+  <!-- Use xmlformat on various xml-type files                             -->
+  <!-- =================================================================== -->
+<!-- Notes:
+You need 'xmlformat' locally installed.
+Change the fileset/@dir to the tree that you want to clean.
+If you encounter invalid xml, uncomment the -v (not xmlformat job to validate).
+Remove any build directories in a tree before running.
+-->
+  <target name="xmlformat" depends="init">
+    <apply executable="xmlformat" parallel="false" verbose="yes">
+      <arg value="-f${forrest.home}/etc/xmlformat.conf"/>
+      <arg value="-i"/>
+<!--
+      <arg value="-v"/>
+-->
+      <srcfile/>
+      <fileset dir="${forrest.home}/etc/test-whitespace">
+        <patternset>
+          <include name="**/*.xml"/>
+          <include name="**/*.xsl"/>
+          <include name="**/*.xslt"/>
+          <include name="**/*.xmap"/>
+          <include name="**/*.jx"/>
+          <include name="**/*.ft"/>
+          <include name="**/*.fv"/>
+          <include name="**/*.html"/>
+          <include name="**/*.rdf"/>
+          <include name="**/*.xcat"/>
+          <include name="**/*.xhtml"/>
+          <include name="**/*.xhtml2"/>
+          <include name="**/*.xxe"/>
+        </patternset>
+      </fileset>
+    </apply>
+  </target>
+
+  <!-- =================================================================== -->
+  <!-- Test tidy.sf.net on a single xml-type file                          -->
   <!-- See also etc/tidy-xml.pl                                            -->
   <!-- =================================================================== -->
   <target name="tidy-xml-file" depends="init">