Browse Source

removed unneeded filter


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195029 13f79535-47bb-0310-9956-ffa450edef68
pull/30/head
Keiron Liddle 22 years ago
parent
commit
e0cc4e340b
4 changed files with 4 additions and 15 deletions
  1. 2
    11
      build.xml
  2. 1
    1
      src/codegen/enumgen.xsl
  3. 1
    1
      src/codegen/properties.xsl
  4. 0
    2
      src/codegen/xalan2.filter

+ 2
- 11
build.xml View File

@@ -171,7 +171,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
<!-- =================================================================== -->
<!-- Initialization target -->
<!-- =================================================================== -->
<target name="init" depends="init-avail, init-filters-xalan2">
<target name="init" depends="init-avail">
<tstamp/>
<property name="Name" value="Fop"/>
<property name="name" value="fop"/>
@@ -215,7 +215,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
<property name="viewer.resources.dest.dir" value="${build.dest}/org/apache/fop/viewer/resources"/>
<property name="viewer.images.dest.dir" value="${build.dest}/org/apache/fop/viewer/Images"/>

<!-- <property name="dist.dir" value="./dist"/> -->
<property name="dist.bin.dir" value="./dist-bin"/>
<property name="dist.src.dir" value="./dist-src"/>
<property name="dist.bin.result.dir" value="${dist.bin.dir}/${Name}-${version}"/>
@@ -267,8 +266,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
<property name="main.class" value="org.apache.fop.apps.Fop"/>
<property name="runtime.classpath" value="lib/xerces-1.4.3.jar lib/xalan-2.2D11.jar lib/batik.jar lib/jimi-1.0.jar lib/avalon-framework-cvs-20020315.jar"/>
<filter filtersfile="${build.src}/codegen/filter"/>

</target>

<target name="init-avail">
@@ -276,15 +273,9 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
<available property="jai.present" classname="javax.media.jai.JAI"/>

<available property="trax.present" classname="javax.xml.transform.Transformer"/>
<filter token="xalan2-replacestring" value="../../"/>

</target>

<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 -->
<!-- =================================================================== -->
@@ -501,7 +492,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
<fileset dir="${build.dest}" includes="org/apache/fop/svg/**"/>
<fileset dir="${build.dest}" includes="org/apache/fop/render/pdf/**"
excludes="org/apache/fop/render/pdf/PDFRenderer.class,org/apache/fop/render/pdf/PDFXMLHandler*"/>
<fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/apps/FOPException.class,org/apache/fop/apps/Version.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/configuration/**,org/apache/fop/util/StreamUtilities.class"/>
<fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/apps/Version.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/configuration/**,org/apache/fop/util/StreamUtilities.class"/>
<manifest>
<attribute name="Implementation-Title" value="${pdf-transcoder.name}"/>
<attribute name="Implementation-Version" value="${pdf-transcoder.version}"/>

+ 1
- 1
src/codegen/enumgen.xsl View File

@@ -32,7 +32,7 @@
</xsl:variable>

<xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
<redirect:write select="concat('@org/apache/fop@/fo/properties/', $classname, '.java')">
<redirect:write select="concat($classname, '.java')">
package org.apache.fop.fo.properties;

<!-- Handle enumeration values -->

+ 1
- 1
src/codegen/properties.xsl View File

@@ -204,7 +204,7 @@
<xsl:text> implements </xsl:text><xsl:value-of select="$eclassname"/></xsl:if>
</xsl:variable>

<redirect:write select="concat('@org/apache/fop@/fo/properties/', $classname, '.java')">
<redirect:write select="concat($classname, '.java')">
package org.apache.fop.fo.properties;

import java.util.Hashtable;

+ 0
- 2
src/codegen/xalan2.filter View File

@@ -1,2 +0,0 @@
org/apache/fop = @xalan2-replacestring@


Loading…
Cancel
Save