cvs commit: xml-fop/lib ant.jar

[ke...@apache.org]

kellyc      01/02/28 23:22:47

  Modified:    .        build.xml
               lib      ant.jar
  Log:
  Updated build to take new xalan trax file into account.
  Upgraded to Ant 1.2 to get new filter features needed
  to fix property code generation location bug when using
  Xalan 2.
  
  Revision  Changes    Path
  1.24      +20 -4     xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	2001/02/23 08:27:28	1.23
  +++ build.xml	2001/03/01 07:22:45	1.24
  @@ -117,7 +117,7 @@
     <!-- =================================================================== -->
     <!-- Initialization target                                               -->
     <!-- =================================================================== -->
  -  <target name="init">
  +  <target name="init" depends="init-avail, init-filters-xalan1, init-filters-xalan2">
       <tstamp/>
       <property name="Name" value="Fop"/>
       <property name="name" value="fop"/>
  @@ -211,16 +211,32 @@
   
       <taskdef name="serHyph" classname="org.apache.fop.tools.anttasks.SerializeHyphPattern"/> 
       <taskdef name="xslt" classname="org.apache.fop.tools.anttasks.Xslt"/>
  +															
  +    <filter filtersfile="${build.src}/codegen/filter"/>
  +
  +  </target>
  +
  +  <target name="init-avail">
       <available property="xt.present" classname="com.jclark.xsl.sax.XSLProcessor"/>
       <available property="jimi.present" classname="com.sun.jimi.core.Jimi"/>
       <available property="jai.present" classname="javax.media.jai.JAI"/>
   
       <available property="trax.present" classname="javax.xml.transform.Transformer"/>
       <available property="xalan1.present" classname="org.apache.xalan.xslt.XSLTProcessor"/>
  +    <filter token="xalan1-replacestring" value="./build/src/org/apache/fop"/>
  +    <filter token="xalan2-replacestring" value="../org/apache/fop"/>
  +
  +  </target>
  +
  +  <target name="init-filters-xalan1" depends="init-avail" if="xalan1.present" unless="trax.present">
  +    <copy file="src/codegen/xalan1.filter" toFile="./build/src/codegen/filter" filtering="on"/>
  +  </target>
   
  -    <filter token="${replacestring}" value="${build.src}/${replacestring}"/>
  +  <target name="init-filters-xalan2" depends="init-avail" if="trax.present">
  +    <copy file="src/codegen/xalan2.filter" toFile="./build/src/codegen/filter" filtering="on"/>
     </target>
   
  +
     <!-- =================================================================== -->
     <!-- Help on usage                                                       -->
     <!-- =================================================================== -->
  @@ -316,7 +332,7 @@
         <echo message="JAXP1.1 transforms is present. Installing TRaX support"/>
         <copydir src="${src.dir}"
    	      dest="${build.src}"
  - 	      includes="**/${xsltransform},**/${trax}"/>
  + 	      includes="**/${xsltransform},**/${trax},**/apps/TraxInputHandler.java"/>
     </target>
   
   
  @@ -327,7 +343,7 @@
       <!-- copy src files -->
       <copydir src="${src.dir}"
                dest="${build.src}"
  -             excludes="**/Makefile*, **/package.html, **/XT*,**/PDFOutputHandler.java,**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/${xalan1}"/>
  +             excludes="**/Makefile*, **/package.html, **/XT*,**/PDFOutputHandler.java,**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/${xalan1},**/apps/TraxInputHandler.java"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  
  1.4       +1247 -604 xml-fop/lib/ant.jar
  
  	<<Binary file>>