Merged changes 345575:345890 from branches/fop-0_90 into trunk:

"build/site" is now copied to "docs".
The build directory isn't included in either distribution anymore.
Source distribution doesn't contain fop.jar, javadocs and compiled docs anymore to make the distribution smaller.
KEYS and status.xml and lib/xalan*.txt added (Thanks, Simon).
Added version info to javadocs.
Removed limitation to build javadocs only with JDKs >= 1.4. It works fine for me on Win32 Sun JDK 1.3.1_15.
You can add "javahome.jdk14" to your build-local.properties so Forrest docs can be built during a JDK 1.3 distribution build.
Added release notes to site (Thanks, Christian, for the reminder).
Append JDK indicator to binary distribution using system property java.specification.version.
upgrade guide: new configuration format (CG)
Documented additional known issue with PS Renderer that I didn't have time to fix.
Redirects and release names cleaned up as per Simon's suggestions.
Added link to latest release branch to download page.

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

1 files changed, 39 insertions, 30 deletions

diff --git a/build.xml b/build.xml
index 24dd315c8..882db69f7 100644
--- a/build.xml
+++ b/build.xml
@@ -62,19 +62,14 @@ list of possible build targets.
 
   <fileset dir="${basedir}" id="dist.bin">
     <include name="conf/**"/>
-    <include name="build/site/**"/>
-    <!--include name="CHANGES"/-->
+    <include name="examples/**"/>
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <!--include name="STATUS"/-->
+    <include name="KEYS"/>
+    <include name="status.xml"/>
     <include name="fop.bat"/>
     <include name="fop"/>
-    <include name="examples/**"/>
-    <exclude name="docs/**"/>
-    <exclude name="src/**"/>
-    <exclude name="dist/**"/>
-    <exclude name="lib/**"/>
   </fileset>
 
   <fileset dir="${basedir}" id="dist.bin.lib">
@@ -85,17 +80,13 @@ list of possible build targets.
       <include name="lib/commons-logging*"/>
       <include name="lib/README*"/>
       <include name="lib/serializer*"/>
-      <include name="lib/xalan-*"/>
+      <include name="lib/xalan*"/>
       <include name="lib/xerces*"/>
       <include name="lib/xml-apis*"/>
     </patternset>
   </fileset>
 
   <fileset dir="${basedir}" id="dist.src">
-    <exclude name="lib/classes/**"/>
-    <exclude name="lib/org/**"/>
-    <exclude name="lib/src/**"/>
-    <include name="build/site/**"/>
     <include name="src/**"/>
     <include name="conf/**"/>
     <include name="hyph/hyphenation.dtd"/>
@@ -104,11 +95,11 @@ list of possible build targets.
     <include name="lib/servlet*"/>
     <include name="test/**"/>
     <include name="examples/**"/>
-    <!--include name="CHANGES"/-->
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <!--include name="STATUS"/-->
+    <include name="KEYS"/>
+    <include name="status.xml"/>
     <include name="build.*"/>
     <include name="fop.bat"/>
     <include name="fop"/>
@@ -830,7 +821,7 @@ NOTE:
   <!-- Creates the API documentation                                       -->
   <!-- =================================================================== -->
   <target name="javadocs" depends="codegen" description="Generates javadocs">
-    <condition property="javadoc.version.ok">
+    <!--condition property="javadoc.version.ok">
       <not>
         <or>
           <equals arg1="${ant.java.version}" arg2="1.1"/>
@@ -839,7 +830,7 @@ NOTE:
         </or>
       </not>
     </condition>
-    <fail message="Building FOP javadocs requires at least Java 1.4" unless="javadoc.version.ok"/>
+    <fail message="Building FOP javadocs requires at least Java 1.4" unless="javadoc.version.ok"/-->
     <property name="javadoc.public"  value="false"/>
     <property name="javadoc.package" value="false"/>
     <property name="javadoc.private" value="false"/>
@@ -861,7 +852,7 @@ NOTE:
         destdir="${build.javadocs.dir}"
         author="true"
         version="true"
-        windowtitle="${Name} API"
+        windowtitle="${Name} ${version} API"
         doctitle="Apache Formatting Objects Processor (FOP)"
         bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved."
         overview="${src.dir}/java/org/apache/fop/overview.html"
@@ -870,6 +861,8 @@ NOTE:
         public="${javadoc.public}"
         package="${javadoc.package}"
         private="${javadoc.private}">
+      <header><![CDATA[${name} ${version}]]></header>
+      <footer><![CDATA[${name} ${version}]]></footer>
       <classpath>
         <path refid="libs-build-classpath"/>
         <pathelement path="${java.class.path}"/>
@@ -1043,10 +1036,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}"/>
+    <exec executable="${forrest.call}">
+      <env key="JAVA_HOME" value="${javahome.jdk14.override}"/>
+    </exec>
   </target>
   
   <!-- =================================================================== -->
@@ -1054,7 +1061,7 @@ NOTE:
   <!-- =================================================================== -->
   <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/>
 
-  <target name="dist-bin" depends="all,docs">
+  <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"/>
     <fail message="A complete binary build requires JAI" unless="jai.present"/>
@@ -1064,13 +1071,20 @@ NOTE:
       <fileset refid="dist.bin"/>
       <fileset refid="dist.bin.lib"/>
     </copy>
+    <copy todir="${dist.bin.result.dir}/docs">
+      <fileset dir="${build.dir}/site"/>
+    </copy>
+    <copy todir="${dist.bin.result.dir}/javadocs">
+      <fileset dir="${build.javadocs.dir}"/>
+    </copy>
     <mkdir dir="${dist.bin.result.dir}/build"/>
     <copy todir="${dist.bin.result.dir}/build" file="build/fop.jar"/>
     <chmod file="${dist.bin.result.dir}/fop" perm="ugo+rx"/>
 
-    <zip zipfile="${name}-${version}-bin.zip" basedir="${dist.bin.dir}" includes="**"/>
+    <property name="bin.suffix" value="bin-jdk${java.specification.version}"/>
+    <zip zipfile="${name}-${version}-${bin.suffix}.zip" basedir="${dist.bin.dir}" includes="**"/>
     <tar longfile="gnu"
-         destfile="${name}-${version}-bin.tar" >
+         destfile="${name}-${version}-${bin.suffix}.tar">
       <tarfileset dir="${dist.bin.dir}" mode="755">
         <include name="${name}-${version}/fop"/>
       </tarfileset>
@@ -1079,21 +1093,16 @@ NOTE:
         <exclude name="${name}-${version}/fop"/>
       </tarfileset>
     </tar>
-    <gzip zipfile="${name}-${version}-bin.tar.gz" src="${name}-${version}-bin.tar"/>
-    <delete file="${name}-${version}-bin.tar"/>
+    <gzip zipfile="${name}-${version}-${bin.suffix}.tar.gz" src="${name}-${version}-${bin.suffix}.tar"/>
+    <delete file="${name}-${version}-${bin.suffix}.tar"/>
   </target>
 
-  <target name="dist-src" depends="all, javadocs, docs">
+  <target name="dist-src" depends="all">
     <echo message="Building the source distribution files (zip,tar)"/>
     <mkdir dir="${dist.src.result.dir}"/>
     <copy todir="${dist.src.result.dir}">
       <fileset refid="dist.src"/>
     </copy>
-    <copy todir="${dist.src.result.dir}/javadocs">
-      <fileset dir="${build.javadocs.dir}"/>
-    </copy>
-    <mkdir dir="${dist.src.result.dir}/build"/>
-    <copy todir="${dist.src.result.dir}/build" file="build/fop.jar"/>
     <chmod file="${dist.src.result.dir}/fop" perm="ugo+rx"/>
 
     <zip zipfile="${name}-${version}-src.zip" basedir="${dist.src.dir}" includes="**"/>