Use retroweaver for 1.4 verification

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@687327 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties b/build.properties
index 2a8b4c80c010367e5d52a789acc4c1b01bbe526d..c5e483204c2e702e9436714d461449674b50b36d 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -17,6 +17,13 @@
 ## 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
 
@@ -44,4 +51,4 @@
 
 ## Specify an alternate directory to scan for user supplied
 ## hyphenation pattern files.
-# user.hyph.dir = /home/bart/offo
\ No newline at end of file
+# user.hyph.dir = /home/bart/offo

diff --git a/build.xml b/build.xml
index a328e95dfd9b9d6523a7c0446300a2a5037f9394..593da49c7a0ddab992f45d39796bfbb4e3cca55e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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                                                       -->