diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 80 |
1 files changed, 15 insertions, 65 deletions
@@ -131,10 +131,6 @@ list of possible build targets. </fileset> </path> - <patternset id="exclude-jimi"> - <exclude name="org/apache/fop/image/JimiImage.java" unless="jimi.present"/> - </patternset> - <patternset id="exclude-jai"> <exclude name="org/apache/fop/image/JAIImage.java" unless="jai.present"/> <exclude name="org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java" unless="jai.present"/> @@ -148,7 +144,7 @@ list of possible build targets. <property name="name" value="fop"/> <property name="NAME" value="FOP"/> <property name="version" value="svn-trunk"/> - <property name="year" value="1999-2007"/> + <property name="year" value="1999-2008"/> <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> @@ -214,7 +210,7 @@ list of possible build targets. <!-- =================================================================== --> <!-- Initialization target --> <!-- =================================================================== --> - <target name="init" depends="init-avail, init-filters-jdk14, init-filters-jdk13"> + <target name="init" depends="init-avail"> </target> <target name="init-avail"> @@ -224,18 +220,6 @@ list of possible build targets. <echo message="VM: ${java.vm.version}, ${java.vm.vendor}"/> <echo message="JAVA_HOME: ${env.JAVA_HOME}"/> - <available property="jimi.present" classname="com.sun.jimi.core.Jimi" - classpathref="libs-build-classpath"/> - <condition property="jimi.message" value="Jimi Support PRESENT"> - <equals arg1="${jimi.present}" arg2="true"/> - </condition> - <condition property="jimi.message" value="Jimi Support NOT Present"> - <not> - <equals arg1="${jimi.present}" arg2="true"/> - </not> - </condition> - <echo message="${jimi.message}"/> - <available property="jai.present" classname="javax.media.jai.JAI" classpathref="libs-build-classpath"/> <condition property="jai.message" value="JAI Support PRESENT"> @@ -261,7 +245,8 @@ list of possible build targets. <echo message="${jce.message}"/> <available property="jdk14.present" classname="java.lang.CharSequence"/> - + <fail message="${Name} requires at least Java 1.4!" unless="jdk14.present"/> + <available property="junit.present" classname="junit.framework.TestCase" classpathref="libs-build-classpath"/> <condition property="junit.message" value="JUnit Support PRESENT"> @@ -292,22 +277,6 @@ list of possible build targets. </target> - <target name="init-filters-jdk13" depends="init-avail" unless="jdk14.present"> - <echo message="Use GraphicsConfiguration adapter for JDK 1.3 or earlier."/> - <path id="graphics-configuration-adapter"> - <pathelement location="src/java-1.3"/> - </path> - <property name="src.java.version.dir" value="${basedir}/src/java-1.3"/> - </target> - - <target name="init-filters-jdk14" depends="init-avail" if="jdk14.present"> - <echo message="Use GraphicsConfiguration adapter for JDK 1.4."/> - <path id="graphics-configuration-adapter"> - <pathelement location="src/java-1.4"/> - </path> - <property name="src.java.version.dir" value="${basedir}/src/java-1.4"/> - </target> - <!-- =================================================================== --> <!-- Help on usage --> <!-- =================================================================== --> @@ -401,12 +370,9 @@ list of possible build targets. source="${javac.source}" target="${javac.target}"> <src path="${build.gensrc.dir}"/> <src path="${src.java.dir}"/> - <src refid="graphics-configuration-adapter"/> <patternset includes="**/*.java"/> - <!--patternset includes="org/apache/fop/svg/GraphicsConfiguration.java"/--> <patternset refid="exclude-jce-dependencies"/> <patternset refid="exclude-jai"/> - <patternset refid="exclude-jimi"/> <classpath refid="libs-build-classpath"/> </javac> <copy todir="${build.classes.dir}"> @@ -543,7 +509,6 @@ list of possible build targets. <uptodate property="jar.sources.uptodate" targetfile="${build.dir}/fop-sources.jar"> <srcfiles dir="${build.gensrc.dir}"/> <srcfiles dir="${src.java.dir}"/> - <srcfiles refid="graphics-configuration-adapter"/> </uptodate> </target> @@ -1032,7 +997,6 @@ NOTE: <pathelement path="${src.java.dir}"/> <pathelement path="${src.sandbox.dir}"/> <pathelement path="${build.gensrc.dir}"/> - <path refid="graphics-configuration-adapter"/> </sourcepath> <tag name="todo" scope="all" description="To do:"/> <group title="Control and Startup"> @@ -1206,37 +1170,24 @@ NOTE: --> <echo message="Make sure you have a proper Forrest installation (see http://forrest.apache.org/)"/> - <!--<antcall target="site"/>--> - - <!-- You can provide a JDK 1.4 for a JDK 1.3 build by adding "javahome.jdk14" to build-local.properties --> - <condition property="javahome.jdk14.override" value="${javahome.jdk14}"> - <isset property="javahome.jdk14"/> - </condition> - <echo message="java home: ${javahome.jdk14.override}"/> - <condition property="javahome.jdk14.override" value="${env.JAVA_HOME}"> - <not> - <isset property="javahome.jdk14.override"/> - </not> - </condition> - <echo message="java home: ${javahome.jdk14.override}"/> <condition property="forrest.call" value="forrest.bat" else="forrest"> <os family="windows"/> </condition> - <exec executable="${forrest.call}"> - <env key="JAVA_HOME" value="${javahome.jdk14.override}"/> - </exec> + <exec executable="${forrest.call}"/> </target> <!-- =================================================================== --> <!-- Creates the distribution --> <!-- =================================================================== --> - <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/> + <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/> - <target name="dist-bin" depends="all,javadocs,docs"> - <echo message="Building the binary distribution files (zip,tar)"/> - <fail message="A complete binary build requires Jimi" unless="jimi.present"/> + <target name="dist-prereq" depends="init"> <fail message="A complete binary build requires JAI" unless="jai.present"/> <fail message="A complete binary build requires JCE" unless="jce.present"/> + </target> + + <target name="dist-bin" depends="all,javadocs,docs"> + <echo message="Building the binary distribution files (zip,tar)"/> <mkdir dir="${dist.bin.result.dir}"/> <copy todir="${dist.bin.result.dir}"> <fileset refid="dist.bin"/> @@ -1252,10 +1203,9 @@ NOTE: <copy todir="${dist.bin.result.dir}/build" file="build/fop.jar"/> <chmod file="${dist.bin.result.dir}/fop" perm="ugo+rx"/> - <property name="bin.suffix" value="bin-jdk${java.specification.version}"/> - <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/> + <zip zipfile="${name}-${version}-bin.zip" basedir="${dist.bin.dir}" includes="**"/> <tar longfile="gnu" - destfile="${name}-${version}-${bin.suffix}.tar"> + destfile="${name}-${version}-bin.tar"> <tarfileset dir="${dist.bin.dir}" mode="755"> <include name="${name}-${version}/fop"/> </tarfileset> @@ -1264,8 +1214,8 @@ NOTE: <exclude name="${name}-${version}/fop"/> </tarfileset> </tar> - <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/> - <delete file="${name}-${version}-${bin.suffix}.tar"/> + <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/> + <delete file="${name}-${version}-bin.tar"/> </target> <target name="dist-src" depends="all"> |