Dear Fop-Devs, I hope this commit does not break gump - if so I'll revert it.
What this does: If you set properties to point to a java 1.4 installation, it will try to verify if fop uses only the classes available there and output a warning. The retroweaving process is currently done but unsused (unfortunately it cannot be turned of, so it just weaves to a temp directory) - so no 1.5 features are available. Experiments in separate branches are welcome (result of the discussion we had previously on that matter). As a note of success: I found two cases of "valueOf" in the code, (see my commit 687323) which slipped in there accidentally. Should this prove successfully I would like to - make the warning bigger - add a note that committers *should* have jdk 1.4 installed Max [EMAIL PROTECTED] schrieb: > Author: maxberger > Date: Wed Aug 20 06:32:19 2008 > New Revision: 687327 > > URL: http://svn.apache.org/viewvc?rev=687327&view=rev > Log: > Use retroweaver for 1.4 verification > > Modified: > xmlgraphics/fop/trunk/build.properties > xmlgraphics/fop/trunk/build.xml > > Modified: xmlgraphics/fop/trunk/build.properties > URL: > http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.properties?rev=687327&r1=687326&r2=687327&view=diff > ============================================================================== > --- xmlgraphics/fop/trunk/build.properties (original) > +++ xmlgraphics/fop/trunk/build.properties Wed Aug 20 06:32:19 2008 > @@ -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 > > Modified: xmlgraphics/fop/trunk/build.xml > URL: > http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=687327&r1=687326&r2=687327&view=diff > ============================================================================== > --- xmlgraphics/fop/trunk/build.xml (original) > +++ xmlgraphics/fop/trunk/build.xml Wed Aug 20 06:32:19 2008 > @@ -459,15 +459,31 @@ > </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 --> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] >
signature.asc
Description: OpenPGP digital signature
