diff options
| -rw-r--r-- | build.properties | 7 | ||||
| -rw-r--r-- | build.xml | 44 | ||||
| -rw-r--r-- | lib/build/asm-commons-3.1.jar | bin | 32694 -> 0 bytes | |||
| -rw-r--r-- | lib/build/asm-util-3.1.jar | bin | 34444 -> 0 bytes | |||
| -rw-r--r-- | lib/build/backport-util-concurrent-3.1.jar | bin | 331716 -> 0 bytes | |||
| -rw-r--r-- | lib/build/backport-util-concurrent.LICENSE.txt | 2 | ||||
| -rw-r--r-- | lib/build/retroweaver-2.0.6-patched.jar | bin | 91557 -> 0 bytes | |||
| -rw-r--r-- | lib/build/retroweaver-rt-2.0.6-patched.jar | bin | 179445 -> 0 bytes | |||
| -rw-r--r-- | lib/build/retroweaver.LICENSE.txt | 25 |
9 files changed, 7 insertions, 71 deletions
diff --git a/build.properties b/build.properties index 9c6472cee..0beb3fa68 100644 --- a/build.properties +++ b/build.properties @@ -17,13 +17,6 @@ ## checkstyle binary distribution. # checkstyle.home.dir = /home/bart/stuff/checkstyle-4.0-beta6 -## Path to the java 1.4 runtime libary (rt.jar on most systems) -## On OS X this is /System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar -#java14.rt.lib=/opt/j2re1.4.2_07/lib/rt.jar -## Path to the java 1.4 jce libary (jce.jar on most systems) -## On OS X this is /System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/jce.jar -#java14.jce.lib=/opt/j2re1.4.2_07/lib/jce.jar - ## =================================================================== ## 2. Switches for common tasks @@ -90,8 +90,7 @@ list of possible build targets. <include name="lib/build/jaxen*"/> <include name="lib/build/pmd*"/> <include name="lib/build/qdox*"/> - <include name="lib/build/retroweaver*"/> - <include name="lib/build/xmlunit*"/> + <include name="lib/build/xmlunit*"/> </patternset> <fileset dir="${basedir}" id="dist.src"> <include name="src/**"/> @@ -476,44 +475,15 @@ list of possible build targets. </manifest> </jar> </target> - <!-- =================================================================== --> - <!-- Retroweaver --> - <!-- =================================================================== --> - <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-tools-build-classpath"/> - </classpath> - </taskdef> - <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" - classpath="${toString:verify-classpath}" lazy="false" - verify="true" target="1.4" /> - </target> - <target name="retro" depends="retro-avail,retro-unavail,compile"> - </target> <!-- =================================================================== --> <!-- main FOP JARs --> <!-- =================================================================== --> - <target name="uptodate-jar-main" depends="retro"> + <target name="uptodate-jar-main" depends="compile"> <uptodate property="jar.main.uptodate" targetfile="${build.dir}/fop.jar"> <srcfiles dir="${build.classes.dir}"/> </uptodate> </target> - <target name="jar-main" depends="retro,uptodate-jar-main" description="Generates the main jar file" unless="jar.main.uptodate"> + <target name="jar-main" depends="compile,uptodate-jar-main" description="Generates the main jar file" unless="jar.main.uptodate"> <tstamp> <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> </tstamp> @@ -537,12 +507,12 @@ list of possible build targets. <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> </target> - <target name="uptodate-jar-sandbox" depends="retro"> + <target name="uptodate-jar-sandbox" depends="compile"> <uptodate property="jar.sandbox.uptodate" targetfile="${build.dir}/fop-sandbox.jar"> <srcfiles dir="${build.sandbox-classes.dir}"/> </uptodate> </target> - <target name="jar-sandbox" depends="retro,uptodate-jar-sandbox" description="Generates the sandbox jar file" unless="jar.sandbox.uptodate"> + <target name="jar-sandbox" depends="compile,uptodate-jar-sandbox" description="Generates the sandbox jar file" unless="jar.sandbox.uptodate"> <tstamp> <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> </tstamp> @@ -645,13 +615,13 @@ list of possible build targets. <include name="commons-logging*.jar"/> <include name="xmlgraphics-commons*.jar"/> </fileset> - <target name="uptodate-transcoder-pkg" depends="retro"> + <target name="uptodate-transcoder-pkg" depends="compile"> <uptodate property="transcoder.pkg.uptodate" targetfile="${build.dir}/fop-transcoder.jar"> <srcfiles refid="transcoder-classes-files"/> <srcfiles refid="transcoder-lib-files"/> </uptodate> </target> - <target name="transcoder-pkg" depends="uptodate-transcoder-pkg, retro" description="Generates the jar for the transcoder package for Batik" unless="transcoder.pkg.uptodate"> + <target name="transcoder-pkg" depends="uptodate-transcoder-pkg, compile" description="Generates the jar for the transcoder package for Batik" unless="transcoder.pkg.uptodate"> <echo message="Creating the jar file ${build.dir}/fop-transcoder.jar"/> <property name="fop-transcoder.name" value="FOP Transcoder Package"/> <property name="fop-transcoder.version" value="1.0beta2"/> diff --git a/lib/build/asm-commons-3.1.jar b/lib/build/asm-commons-3.1.jar Binary files differdeleted file mode 100644 index 5f696aefc..000000000 --- a/lib/build/asm-commons-3.1.jar +++ /dev/null diff --git a/lib/build/asm-util-3.1.jar b/lib/build/asm-util-3.1.jar Binary files differdeleted file mode 100644 index 3702a14d8..000000000 --- a/lib/build/asm-util-3.1.jar +++ /dev/null diff --git a/lib/build/backport-util-concurrent-3.1.jar b/lib/build/backport-util-concurrent-3.1.jar Binary files differdeleted file mode 100644 index 3a4c2797a..000000000 --- a/lib/build/backport-util-concurrent-3.1.jar +++ /dev/null diff --git a/lib/build/backport-util-concurrent.LICENSE.txt b/lib/build/backport-util-concurrent.LICENSE.txt deleted file mode 100644 index c721bde03..000000000 --- a/lib/build/backport-util-concurrent.LICENSE.txt +++ /dev/null @@ -1,2 +0,0 @@ -Public Domain -http://creativecommons.org/licenses/publicdomain diff --git a/lib/build/retroweaver-2.0.6-patched.jar b/lib/build/retroweaver-2.0.6-patched.jar Binary files differdeleted file mode 100644 index 94b3b739d..000000000 --- a/lib/build/retroweaver-2.0.6-patched.jar +++ /dev/null diff --git a/lib/build/retroweaver-rt-2.0.6-patched.jar b/lib/build/retroweaver-rt-2.0.6-patched.jar Binary files differdeleted file mode 100644 index e6b8483b8..000000000 --- a/lib/build/retroweaver-rt-2.0.6-patched.jar +++ /dev/null diff --git a/lib/build/retroweaver.LICENSE.txt b/lib/build/retroweaver.LICENSE.txt deleted file mode 100644 index 5e9b12a61..000000000 --- a/lib/build/retroweaver.LICENSE.txt +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) February 2004, Toby Reyelts -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. -Neither the name of Toby Reyelts nor the names of his contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |