updated build scripts for new jars and removed old targets

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

diff --git a/build.bat b/build.bat
index 9965e132646e4ca01d1d865ffcb2b4e8a982f621..0f0ddd2b2d9fe9f1acb6623f5b52589edadb0b6a 100755 (executable)
--- a/build.bat
+++ b/build.bat
@@ -6,8 +6,8 @@ echo ----------------
 if "%JAVA_HOME%" == "" goto error
 
 set LIBDIR=lib
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.2D11.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0.jar
 
 set ANT_HOME=%LIBDIR%
 
@@ -29,3 +29,4 @@ echo location of the Java Virtual Machine you want to use.
 
 rem set LOCALCLASSPATH=
 
+pause;

diff --git a/build.sh b/build.sh
index be7f1b03abcdd3d1f07b4c0499dedb96bc8694ad..4f443cc8233331fab2f8e2a54d90f78d55dfbdfd 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -13,8 +13,8 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 LIBDIR=lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/avalon-framework-4.0.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/logkit-1.0.jar
 
 ANT_HOME=$LIBDIR
 
@@ -24,3 +24,4 @@ echo Starting Ant...
 echo
 
 $JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH" org.apache.tools.ant.Main $*
+

diff --git a/build.xml b/build.xml
index 93da09454f4b8bfb117450794c470380cdd665f7..9047449e994f138a6e67fa0201551e4e21c4129b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -17,8 +17,8 @@ Introduction
 FOP is the world's first print formatter driven by XSL formatting objects. It 
 is a Java 1.1 application that reads a formatting object tree and then turns 
 it into a PDF document. The formatting object tree, can be in the form of an 
-XML document (output by an XSLT engine like XT or Xalan) or can be passed in 
-memory as a DOM Document or (in the case of XT) SAX events.
+XML document (output by an XSLT engine like Xalan) or can be passed in 
+memory as a DOM Document or SAX events.
     
 FOP is part of Apache's XML project. The homepage of FOP is 
 http:/xml.apache.org/fop 
@@ -101,11 +101,6 @@ The fop build system is very flexible: if a module requires a package that
 is not present in the classpath at build time, the module is skipped but
 the built process is not stopped.
 
-Here is a list of such modules and what you have to download to build them:
-
- org.apache.fop.apps.XTCommandLine ===>
-       James Clark's XT (http://www.jclark.com/)
-
 2) I see a lot of warnings starting like this: "Warning: file modified in the future:"
 Sometimes ant gives out this warnings, but the build is finished without any problems
 
@@ -131,12 +126,10 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     </fileset>
 
     <fileset dir="${basedir}" id="dist.bin.lib">
-       <include name="lib/xerces-1.2.3.jar"/>
-       <include name="lib/xalan-2.0.0.jar"/>
-       <include name="lib/xalanj1compat.jar"/>
+       <include name="lib/xerces-1.4.3.jar"/>
+       <include name="lib/xalan-2.2D11.jar"/>
        <include name="lib/batik.jar"/>
-       <include name="lib/logkit-1.0b4.jar"/>
-       <include name="lib/avalon-framework-4.0.jar"/>
+       <include name="lib/logkit-1.0.jar"/>
        <include name="lib/jimi*"/>
     </fileset>
 
@@ -162,11 +155,11 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
   <!-- =================================================================== -->
-  <target name="init" depends="init-avail, init-filters-xalan1, init-filters-xalan2">
+  <target name="init" depends="init-avail, init-filters-xalan2">
     <tstamp/>
     <property name="Name" value="Fop"/>
     <property name="name" value="fop"/>
-    <property name="version" value="0.20.1"/>
+    <property name="version" value="1.0dev"/>
     <filter  token="version" value="${version}"/>
     <property name="year" value="1999-2001"/>
 
@@ -215,14 +208,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="jimi" value="JimiImage.java"/>
     <property name="jai" value="JAIImage.java"/>
 
-    <property name="ignore_jdk11"
-              value="org/apache/fop/render/awt/**
-                     ,org/apache/fop/viewer/**
-                     ,**/GifJpegImage.java
-                     ,**/JimiImage.java
-                     ,**/PrintStarter.java
-                     ,**/AWTStarter.java"/>
-
     <property name="xslt" value="org.apache.xalan.xslt.Process"/>
     <property name="src.properties.xsl" value="${src.codegen}/properties.xsl"/>
     <property name="src.propmaker.xsl" value="${src.codegen}/propmaker.xsl"/>
@@ -257,7 +242,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="ZapfDingbats.xml" value="${build.codegen}/ZapfDingbats.xml"/>
     <property name="Symbol.xml" value="${build.codegen}/Symbol.xml"/>
 
-    <property name="xalan1" value="Xalan1Transform.java"/>
     <property name="trax" value="TraxTransform.java"/>
     <property name="xsltransform" value="XSLTransform.java"/>
 
@@ -275,26 +259,19 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <taskdef name="runTest" classname="org.apache.fop.tools.anttasks.RunTest"/>
 
     <property name="main.class" value="org.apache.fop.apps.Fop"/>
-    <property name="runtime.classpath" value="lib/xerces-1.2.3.jar lib/xalan-2.0.0.jar lib/xalanj1compat.jar lib/batik.jar lib/jimi-1.0.jar lib/logkit-1.0b4.jar lib/avalon-framework-4.0.jar"/>
+    <property name="runtime.classpath" value="lib/xerces-1.4.3.jar lib/xalan-2.2D11.jar lib/batik.jar lib/jimi-1.0.jar lib/logkit-1.0.jar"/>
    
     <filter filtersfile="${build.src}/codegen/filter"/>
 
   </target>
 
   <target name="init-avail">
-    <available property="xt.present" classname="com.jclark.xsl.sax.XSLProcessor"/>
     <available property="jimi.present" classname="com.sun.jimi.core.Jimi"/>
     <available property="jai.present" classname="javax.media.jai.JAI"/>
 
     <available property="trax.present" classname="javax.xml.transform.Transformer"/>
-    <available property="xalan1.present" classname="org.apache.xalan.xslt.XSLTProcessor"/>
-    <filter token="xalan1-replacestring" value="./build/src/org/apache/fop"/>
-    <filter token="xalan2-replacestring" value="../org/apache/fop"/>
-
-  </target>
+    <filter token="xalan2-replacestring" value="../../"/>
 
-  <target name="init-filters-xalan1" depends="init-avail" if="xalan1.present" unless="trax.present">
-    <copy file="src/codegen/xalan1.filter" toFile="./build/src/codegen/filter" filtering="on"/>
   </target>
 
   <target name="init-filters-xalan2" depends="init-avail" if="trax.present">
@@ -347,7 +324,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     </copy>
   </target>
 
-
   <!-- =================================================================== -->
   <!-- compiles hyphenation patterns                                       -->
   <!-- =================================================================== -->
@@ -358,16 +334,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
              targetDir="${build.dest}/hyph" /> 
   </target>
 
-
-  <!-- =================================================================== -->
-  <!-- copies some source files if xt is present                           -->
-  <!-- =================================================================== -->
-  <target name="prepare-xt" depends="prepare" if="xt.present">
-    <copy todir="${build.src}">
-      <fileset dir="${src.dir}" includes="**/XT*,**/PDFOutputHandler.java"/>
-    </copy>
-  </target>
-
   <!-- =================================================================== -->
   <!-- copies special image class only if Jimi library is present          -->
   <!-- =================================================================== -->
@@ -388,14 +354,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     </copy>
   </target>
 
-
-  <target name="prepare-xalan1" if="xalan1.present">
-      <echo message="Xalan1 is present. Installing Xalan1 support"/>
-    <copy todir="${build.src}">
-      <fileset dir="${src.dir}" includes="**/${xsltransform},**/${xalan1}"/>
-    </copy>
-  </target>
- 
   <target name="prepare-trax" if="trax.present">
       <echo message="JAXP1.1 transforms is present. Installing TRaX support"/>
     <copy todir="${build.src}">
@@ -407,11 +365,11 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <!-- =================================================================== -->
   <!-- Prepares the source code                                            -->
   <!-- =================================================================== -->
-  <target name="prepare-src" depends="prepare, prepare-xt, prepare-jimi, prepare-jai, prepare-xalan1, prepare-trax">
+  <target name="prepare-src" depends="prepare, prepare-jimi, prepare-jai, prepare-trax">
     <!-- copy src files -->
     <copy todir="${build.src}">
       <fileset dir="${src.dir}" 
-         excludes="**/Makefile*, **/package.html, **/XT*,**/PDFOutputHandler.java,**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/${xalan1},**/apps/TraxInputHandler.java"/>
+         excludes="**/Makefile*, **/package.html, **/${jimi},**/${jai},**/${xsltransform},**/${trax},**/apps/TraxInputHandler.java"/>
     </copy>
   </target>
 
@@ -522,19 +480,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
            excludes="**/*${ignore_this},${jimi}"/>
   </target>
 
-  <target name="compile-jdk11" depends="codegen, prepare-src">
-    <echo message="Compiling the sources for JDK1.1"/>
-    <!-- create directories -->
-    <mkdir dir="${build.dest}"/>
-
-    <javac srcdir="${build.src}"
-           destdir="${build.dest}"
-           debug="${debug}"
-           deprecation="${deprecation}"
-           optimize="${optimize}"
-           excludes="**/${ignore_this},${Jimi},${ignore_jdk11}"/>
-  </target>
-
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
@@ -553,32 +498,25 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <target name="test" depends="package">
     <echo message="Testing build in jar file ${build.dir}/${name}.jar against reference"/>
     <runTest testSuite="basictests.xml" basedir="test/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.20.1"/>
+         refVersion="FOP 1.0dev"/>
     <runTest testSuite="bugtests.xml" basedir="test/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.20.1"/>
+         refVersion="FOP 1.0dev"/>
 <!--
     <runTest testSuite="testsuite.xml" basedir="TestSuite/NIST/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 1.0dev"/>
     <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/IBM/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 1.0dev"/>
     <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/FOP/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 1.0dev"/>
     <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/XEP/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 1.0dev"/>
     <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/XSLFormatter/" reference="test/reference/fop.jar"
-         refVersion="FOP 0.19.0-CVS"/>
+         refVersion="FOP 1.0dev"/>
 -->
   </target>
 
   <target name="all" depends="package"/> <!-- "all" target for us Makefile converts ;-) -->
 
-  <target name="package-jdk11" depends="compile-jdk11,hyphenation">
-    <echo message="Creating the jar file ${build.dir}/${name}11.jar"/>
-    <jar jarfile="${build.dir}/${name}-jdk11.jar"
-         basedir="${build.dest}"
-         includes="org/**,conf/**,hyph/**"/>
-  </target>
-
   <!-- =================================================================== -->
   <!-- Prepares the docs                                                   -->
   <!-- =================================================================== -->
@@ -629,7 +567,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
 
   </target>
 
-
   <target name="dist-src" depends="package, javadocs">
     <echo message="Building the source distribution files (zip,tar)"/>
     <mkdir dir="${dist.src.result.dir}"/>

diff --git a/buildtools.xml b/buildtools.xml
index 37be5e051de881503790d7b2787a39b63f71213d..957045ca3e1a7573ec95380a9deefd2dd855d77e 100644 (file)
--- a/buildtools.xml
+++ b/buildtools.xml
@@ -5,8 +5,7 @@
     Instructions for building the buildtools.jar:
 
  Classpath should contain the following:
-   Xerces 1.2.x
-   Xalan  1.2.x
+   Xerces 1.4.x
    Xalan  2.x
    xml-fop/lib/ant.jar
 
@@ -25,11 +24,9 @@
    <property name="hyph"  value="org/apache/fop/layout/hyphenation"/>
    <property name="buildtools.jar" value="./lib/buildtools.jar"/>
 
-   <property name="xalan1" value="Xalan1Transform.java"/>
    <property name="trax" value="TraxTransform.java"/>
 
    <available property="trax.present" classname="javax.xml.transform.Transformer"/>
-   <available property="xalan1.present" classname="org.apache.xalan.xslt.XSLTProcessor"/>
    </target>
 
    <target name="compile" depends="init,prepare.src">
@@ -46,19 +43,11 @@
          includes="${tools}/**,${hyph}/**"/>
    </target>
 
-   <target name="prepare.src" depends="prepare.xalan1,prepare.trax">
+   <target name="prepare.src" depends="prepare.trax">
      <copy todir="${build.src}">
        <fileset dir="${src.dir}"
                includes="${tools}/**,${hyph}/**"
-               excludes="${tools}/anttasks/Fop.java,${tools}/TestConverter.java,${tools}/AreaTreeBuilder.java,${hyph}/Hyphenator.java,**/${xalan1},**/${trax}"/>
-     </copy>
-   </target>
-
-   <target name="prepare.xalan1" if="xalan1.present">
-     <echo message="Xalan1 is present. Installing Xalan1 support"/>
-     <copy todir="${build.src}">
-       <fileset dir="${src.dir}"
-             includes="**/${xalan1}"/>
+               excludes="${tools}/anttasks/Fop.java,${tools}/TestConverter.java,${tools}/AreaTreeBuilder.java,${hyph}/Hyphenator.java,**/${trax}"/>
      </copy>
    </target>