[MO-java-dev] CVS: no-stone-unturned build.xml,1.4,1.5

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/no-stone-unturned
In directory usw-pr-cvs1:/tmp/cvs-serv5410

Modified Files:
	build.xml 
Log Message:
Moved some filters
Factored out _Transform

Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/no-stone-unturned/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml	7 Aug 2002 21:52:27 -0000	1.4
+++ build.xml	9 Aug 2002 23:45:47 -0000	1.5
@@ -37,8 +37,6 @@
         <echo message="ant.home = ${ant.home}"/>
         <echo message=""/>
 
-        <filter token="version" value="${project.version}"/>
-        <filter token="year" value="${year}"/>
     </target>
 
     <target name="CheckXslLibrary"
@@ -114,6 +112,8 @@
     <target name="_CopyFilesWithFiltering">
         <!-- requires source.xml.file, target.xml.file -->
 
+        <filter token="version" value="${project.version}"/>
+        <filter token="year" value="${year}"/>
         <filter token="docpath" value="${basedir}/${out.xdoc.dir}"/>
         <filter token="xslpath" value="${basedir}/${xsl.dir}"/>
         <filter token="fragment.name" value="${fragment.name}"/>
@@ -140,18 +140,27 @@
       </antcall>
     </target>
 
-    <target name="html-book"
-        depends="PrepareBook"
-        description="Generate book as a single HTML file.">
-
-	<delete file="${out.doc.dir}/book.html" />
-
-	<xslt basedir="${out.xdoc.dir}"
-          in="${out.xdoc.dir}/book.xml"
-	      out="${out.doc.dir}/book.html"
-	      style="${out.xdoc.dir}/htmlbook.xsl"
+  <target name="_Transform" >
+    <!-- requires input.file, output.file -->
+
+    <delete file="${out.doc.dir}/${output.file}" />
+
+    <xslt basedir="${out.xdoc.dir}"
+          in="${out.xdoc.dir}/${input.file}"
+          out="${out.doc.dir}/${output.file}"
+          style="${out.xdoc.dir}/htmlbook.xsl"
           processor="trax" />
-    </target>
+  </target>
+
+  <target name="html-book"
+      depends="PrepareBook"
+      description="Generate book as a single HTML file.">
+
+    <antcall target="_Transform">
+      <param name="input.file" value="book.xml" />
+      <param name="output.file" value="book.html" />
+    </antcall>
+  </target>
 
   <target name="CheckFragmentProperties">
     <fail unless="fragment.name" message="Requires -Dfragment.name=&lt;fragment name&gt;" />
@@ -169,19 +178,16 @@
       depends="CheckFragmentProperties, PrepareFragment"
       description="Generate part of a book as a single HTML file.">
 
-  <delete file="${out.doc.dir}/${fragment.name}.html" />
-
-  <xslt basedir="${out.xdoc.dir}"
-        in="${out.xdoc.dir}/_template.xml"
-        out="${out.doc.dir}/${fragment.name}.html"
-        style="${out.xdoc.dir}/htmlbook.xsl"
-        processor="trax" />
+    <antcall target="_Transform">
+      <param name="input.file" value="_template.xml" />
+      <param name="output.file" value="${fragment.name}.html" />
+    </antcall>
   </target>
 
-    <target name="clean"
-            depends="CallMeFirst"
-            description="Remove all generated files">
-        <delete dir="${xsl.dir}" />
-        <delete dir="${out.dir}" />
-    </target>
+  <target name="clean"
+          depends="CallMeFirst"
+          description="Remove all generated files">
+    <delete dir="${xsl.dir}" />
+    <delete dir="${out.dir}" />
+  </target>
 </project>