jeremias 2002/11/22 10:07:14
Modified: . status.xml fop.bat build.xml build.sh build.bat
Log:
Adjusted to new JARs
Revision Changes Path
1.17 +7 -2 xml-fop/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-fop/status.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- status.xml 22 Nov 2002 16:06:33 -0000 1.16
+++ status.xml 22 Nov 2002 18:07:13 -0000 1.17
@@ -110,8 +110,13 @@
<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"
1.7 +14 -1 xml-fop/fop.bat
Index: fop.bat
===================================================================
RCS file: /home/cvs/xml-fop/fop.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fop.bat 7 Aug 2002 12:50:30 -0000 1.6
+++ fop.bat 22 Nov 2002 18:07:13 -0000 1.7
@@ -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
1.67 +21 -12 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 1 Nov 2002 06:44:14 -0000 1.66
+++ build.xml 22 Nov 2002 18:07:13 -0000 1.67
@@ -58,8 +58,8 @@
</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 @@
<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 @@
</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 @@
<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 @@
<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"
1.22 +5 -2 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.sh 7 Aug 2002 12:50:30 -0000 1.21
+++ build.sh 22 Nov 2002 18:07:13 -0000 1.22
@@ -26,8 +26,11 @@
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
1.19 +5 -1 xml-fop/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/build.bat,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.bat 7 Aug 2002 12:50:30 -0000 1.18
+++ build.bat 22 Nov 2002 18:07:13 -0000 1.19
@@ -6,7 +6,11 @@
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%
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
