diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2008-09-28 11:38:15 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2008-09-28 11:38:15 +0000 |
| commit | c785bd37ca4848a0a0022eb9a480560c1a0b7af1 (patch) | |
| tree | 68aa661b654aa226eef94cecec8f078c955f3958 /build.xml | |
| parent | 9ef69cb34586ac529223de0e09834980e72250b6 (diff) | |
| parent | 6207a76684ee6ee373c893d6d698062647efdf64 (diff) | |
| download | xmlgraphics-fop-c785bd37ca4848a0a0022eb9a480560c1a0b7af1.tar.gz xmlgraphics-fop-c785bd37ca4848a0a0022eb9a480560c1a0b7af1.zip | |
Merge from Trunk revisions 685575-699792.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@699801 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 28 |
1 files changed, 21 insertions, 7 deletions
@@ -459,15 +459,31 @@ list of possible build targets. </manifest> </jar> </target> - <target name="retro" depends="compile"> -<!-- + <target name="retro-unavail" unless="java14.rt.lib"> + <echo message="Please set the path to a JDK 1.4 installation in your build-local.properties" /> + <echo message="to allow for verification!" /> + </target> + <target name="retro-avail" depends="compile" if="java14.rt.lib"> <taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask"> <classpath> - <path refid="libs-build-classpath"/> <path refid="libs-build-tools-classpath"/> </classpath> </taskdef> -RetroWeaver will be added here --> + <path id="verify-classpath"> + <pathelement location="${java14.rt.lib}"/> + <pathelement location="${java14.jce.lib}"/> + <pathelement location="${ant.home}/lib/ant.jar"/> + <path refid="libs-build-classpath"/> + </path> + <!-- If we decide to use retroweaver for the actual weaving, the mkdir and + destdir= will have to be removed. Also, the weaving task would additionally + need to be defined even if no jdk 14 is available. --> + <mkdir dir="${build.dir}/temp"/> + <retroweaver srcdir="${build.classes.dir}" destdir="${build.dir}/temp" + classpathref="verify-classpath" lazy="false" + verify="true" target="1.4" /> + </target> + <target name="retro" depends="retro-avail,retro-unavail,compile"> </target> <!-- =================================================================== --> <!-- main FOP JARs --> @@ -538,9 +554,6 @@ RetroWeaver will be added here --> <fileset dir="${src.java.dir}"> <patternset refid="java-only"/> </fileset> - <fileset dir="${src.java.version.dir}"> - <patternset refid="java-only"/> - </fileset> <fileset dir="${basedir}"> <include name="LICENSE"/> <include name="NOTICE"/> @@ -589,6 +602,7 @@ RetroWeaver will be added here --> <include name="org/apache/fop/util/SubInputStream.class"/> <include name="org/apache/fop/util/Finalizable.class"/> <include name="org/apache/fop/util/CharUtilities.class"/> + <include name="org/apache/fop/util/DecimalFormatCache*.class"/> </patternset> <!-- PDF transcoder --> <patternset> |