aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbuild.bat6
-rwxr-xr-xbuild.sh7
-rw-r--r--build.xml33
-rwxr-xr-xdocs/examples/runtests.bat15
-rwxr-xr-xdocs/examples/runtests.sh14
-rw-r--r--fop.bat15
-rw-r--r--status.xml9
7 files changed, 78 insertions, 21 deletions
diff --git a/build.bat b/build.bat
index 86cf9d1ca..5741bfcad 100755
--- a/build.bat
+++ b/build.bat
@@ -6,7 +6,11 @@ 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%\buildtools.jar;%LIBDIR%\xercesImpl-2.0.1.jar;%LIBDIR%\xalan-2.3.1.jar;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
set ANT_HOME=%LIBDIR%
diff --git a/build.sh b/build.sh
index 3709f1c73..17cb78bcc 100755
--- a/build.sh
+++ b/build.sh
@@ -26,8 +26,11 @@ if $cygwin ; then
fi
LIBDIR=lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
ANT_HOME=$LIBDIR
# antRun must be executable (can't do this in build.xml because Ant uses antRun
diff --git a/build.xml b/build.xml
index 571543047..42e99716e 100644
--- a/build.xml
+++ b/build.xml
@@ -58,8 +58,8 @@ list of possible build targets.
</fileset>
<fileset dir="${basedir}" id="dist.bin.lib">
- <include name="lib/xercesImpl-2.0.1.jar"/>
- <include name="lib/xalan-2.3.1.jar"/>
+ <include name="lib/xercesImpl-2.2.1.jar"/>
+ <include name="lib/xalan-2.4.1.jar"/>
<include name="lib/xml-apis.jar"/>
<include name="lib/batik.jar"/>
<include name="lib/avalon-framework*.jar"/>
@@ -221,9 +221,6 @@ list of possible build targets.
<property name="tools.pkg" value="org/apache/fop/tools"/>
- <taskdef name="serHyph" classname="org.apache.fop.tools.anttasks.SerializeHyphPattern"/>
- <taskdef name="runTest" classname="org.apache.fop.tools.anttasks.RunTest"/>
-
<property name="main.class" value="org.apache.fop.apps.Fop"/>
<filter filtersfile="${build.codegen}/filter" />
@@ -266,13 +263,6 @@ list of possible build targets.
</target>
<!-- =================================================================== -->
- <!-- compiles hyphenation patterns -->
- <!-- =================================================================== -->
- <target name="hyphenation" depends="prepare">
- <serHyph includes="*.xml" sourceDir="./hyph" targetDir="${build.dest}/hyph"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Generate the source code -->
<!-- =================================================================== -->
<target name="codegen" depends="prepare" description="Generates the java files from the xml resources">
@@ -442,6 +432,20 @@ list of possible build targets.
<target name="compile" depends="compile-src,compile-jimi,compile-jai" description="Compiles the source code"/>
<!-- =================================================================== -->
+ <!-- compiles hyphenation patterns -->
+ <!-- =================================================================== -->
+ <target name="hyphenation" depends="prepare">
+ <path id="hyph-classpath">
+ <path refid="libs-build-classpath"/>
+ <pathelement location="${build.dir}/classes"/>
+ </path>
+ <taskdef name="serHyph" classname="org.apache.fop.tools.anttasks.SerializeHyphPattern" classpathref="hyph-classpath"/>
+ <serHyph includes="*.xml"
+ sourceDir="${hyph.dir}"
+ targetDir="${build.dest}/hyph"/>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Creates the class package -->
<!-- =================================================================== -->
<target name="package" depends="compile,hyphenation" description="Generates the jar files">
@@ -508,6 +512,11 @@ list of possible build targets.
<target name="test" depends="package" description="Runs the test suite">
<echo message="Testing build in jar file ${build.dir}/${name}.jar against reference"/>
<property name="ref-version" value="FOP 1.0dev"/>
+ <path id="testtask-classpath">
+ <path refid="libs-build-classpath"/>
+ <pathelement location="${build.dir}/classes"/>
+ </path>
+ <taskdef name="runTest" classname="org.apache.fop.tools.anttasks.RunTest" classpathref="testtask-classpath"/>
<runTest testSuite="basictests.xml" basedir="test/" reference="test/reference/fop.jar"
refVersion="${ref-version}"/>
<runTest testSuite="bugtests.xml" basedir="test/" reference="test/reference/fop.jar"
diff --git a/docs/examples/runtests.bat b/docs/examples/runtests.bat
index c08fbd7c4..96553c909 100755
--- a/docs/examples/runtests.bat
+++ b/docs/examples/runtests.bat
@@ -1,13 +1,24 @@
@echo off
-echo Fop Test
+echo Fop Test
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;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\..\build\fop.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-cvs-20020806.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\bsf.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\..\build\fop.jar
set ANT_HOME=%LIBDIR%
echo Starting Tests ...
diff --git a/docs/examples/runtests.sh b/docs/examples/runtests.sh
index 93dc067b9..0a22f716c 100755
--- a/docs/examples/runtests.sh
+++ b/docs/examples/runtests.sh
@@ -13,7 +13,19 @@ 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:$LIBDIR/avalon-framework-4.0.jar:$LIBDIR/logkit-1.0b4.jar:$LIBDIR/jimi-1.0.jar:$LIBDIR/../build/fop.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/batik.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/avalon-framework-cvs-20020806.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/bsf.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jai_core.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jai_codec.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/../build/fop.jar
+
ANT_HOME=$LIBDIR
echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
diff --git a/fop.bat b/fop.bat
index 648168740..3be05abed 100644
--- a/fop.bat
+++ b/fop.bat
@@ -1 +1,14 @@
-java -cp build\fop.jar;lib\batik.jar;lib\xml-apis.jar;lib\xalan-2.3.1.jar;lib\xercesImpl-2.0.1.jar;lib\avalon-framework-4.0.jar;lib\avalon-framework-cvs-20020806.jar;lib\jimi-1.0.jar org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+@ECHO OFF
+
+set LIBDIR=lib
+set LOCALCLASSPATH=build/fop.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-cvs-20020806.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\bsf.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
+java -cp %LOCALCLASSPATH% org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8 \ No newline at end of file
diff --git a/status.xml b/status.xml
index 99ba03865..7f63089bd 100644
--- a/status.xml
+++ b/status.xml
@@ -110,8 +110,13 @@ inactive??
<changes>
<release version="?" date="2002">
- <action context="fonts" dev="KL" type="fix">
- Correct ordering of loca table in embedded true type fonts (Bug 14290).
+ <action context="build" dev="JM" type="update">
+ Updated to Xerces 2.2.1 and Xalan 2.4.1. Updated all the related files
+ and made sure all contrib builds work again. Removed necessity for a
+ buildtools.jar.
+ </action>
+ <action context="code" dev="KL" type="fix" fixes-bug="14290">
+ Correct ordering of loca table in embedded true type fonts.
Fix taken over from maintenance branch.
</action>
<action context="docs" dev="KLL" type="update"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 00:24:07 +0000