jeremias 2002/11/19 05:42:55
Modified: . Tag: fop-0_20_2-maintain fop.bat build.xml build.sh
build.bat
Log:
Adjust classpath
Reduced the classpath in build.bat/sh to a minimum for easier maintenance.
Revision Changes Path
No revision
No revision
1.4.2.7 +14 -1 xml-fop/fop.bat
Index: fop.bat
===================================================================
RCS file: /home/cvs/xml-fop/fop.bat,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- fop.bat 18 Nov 2002 21:04:58 -0000 1.4.2.6
+++ fop.bat 19 Nov 2002 13:42:55 -0000 1.4.2.7
@@ -1 +1,14 @@
-java -cp
build\fop.jar;lib\batik.jar;lib\xalan-2.4.1.jar;lib\xercesImpl-2.2.0.jar;lib\xml-apis.jar;lib\avalon-framework-cvs-20020806.jar;lib\logkit-1.0.jar;lib\jimi-1.0.jar
org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
\ No newline at end of file
+@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.44.2.28 +15 -9 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.44.2.27
retrieving revision 1.44.2.28
diff -u -r1.44.2.27 -r1.44.2.28
--- build.xml 18 Nov 2002 14:37:45 -0000 1.44.2.27
+++ build.xml 19 Nov 2002 13:42:55 -0000 1.44.2.28
@@ -136,15 +136,15 @@
</fileset>
<fileset dir="${basedir}" id="dist.bin.lib">
- <include name="lib/xercesImpl-2.0.1.jar"/>
+ <include name="lib/xerces*.jar"/>
<include name="lib/xerces.LICENSE.txt"/>
<include name="lib/xml-apis.jar"/>
<include name="lib/xml-apis.README.txt"/>
- <include name="lib/xalan-2.3.1.jar"/>
+ <include name="lib/xalan*.jar"/>
<include name="lib/xalan.LICENSE.txt"/>
<include name="lib/batik.jar"/>
<include name="lib/batik.LICENSE.txt"/>
- <include name="lib/avalon-framework-cvs-20020806.jar"/>
+ <include name="lib/avalon-framework*.jar"/>
<include name="lib/avalon.LICENSE.txt"/>
<include name="lib/readme"/>
</fileset>
@@ -172,7 +172,11 @@
<!--include name="stylebook*.jar"/-->
<include name="xalan*.jar"/>
<include name="xerces*.jar"/>
- <include name="xml-apis*.jar"/>
+ <include name="xml-apis.jar"/>
+ <include name="avalon-framework*.jar"/>
+ <include name="batik*.jar"/>
+ <include name="jimi*.jar"/>
+ <include name="jai*.jar"/>
</fileset>
</path>
@@ -295,10 +299,10 @@
</target>
<target name="init-avail">
- <available property="jimi.present" classname="com.sun.jimi.core.Jimi"/>
- <available property="jai.present" classname="javax.media.jai.JAI"/>
+ <available property="jimi.present" classname="com.sun.jimi.core.Jimi"
classpathref="libs-build-classpath"/>
+ <available property="jai.present" classname="javax.media.jai.JAI"
classpathref="libs-build-classpath"/>
- <available property="trax.present" classname="javax.xml.transform.Transformer"/>
+ <available property="trax.present" classname="javax.xml.transform.Transformer"
classpathref="libs-build-classpath"/>
<available property="jdk14.present" classname="java.lang.CharSequence"/>
</target>
@@ -539,7 +543,9 @@
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"
- excludes="**/*${ignore_this},${jimi}"/>
+ excludes="**/*${ignore_this},${jimi}">
+ <classpath refid="libs-build-classpath"/>
+ </javac>
</target>
<!-- =================================================================== -->
@@ -553,7 +559,7 @@
</path>
<taskdef name="serHyph"
classname="org.apache.fop.tools.anttasks.SerializeHyphPattern"
classpathref="hyph-classpath"/>
<serHyph includes="*.xml"
- sourceDir="./hyph"
+ sourceDir="${hyph.dir}"
targetDir="${build.dest}/hyph" />
</target>
1.15.2.13 +1 -7 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.15.2.12
retrieving revision 1.15.2.13
diff -u -r1.15.2.12 -r1.15.2.13
--- build.sh 18 Nov 2002 14:37:45 -0000 1.15.2.12
+++ build.sh 19 Nov 2002 13:42:55 -0000 1.15.2.13
@@ -31,14 +31,8 @@
LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant-1.5.1.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
-LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.0.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
# antRun must be executable (can't do this in build.xml because Ant uses antRun
# to do the chmod)
1.14.2.10 +2 -8 xml-fop/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/build.bat,v
retrieving revision 1.14.2.9
retrieving revision 1.14.2.10
diff -u -r1.14.2.9 -r1.14.2.10
--- build.bat 18 Nov 2002 14:37:45 -0000 1.14.2.9
+++ build.bat 19 Nov 2002 13:42:55 -0000 1.14.2.10
@@ -7,16 +7,10 @@
set LIBDIR=lib
set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant-1.5.1.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.0.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant-1.5.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 ANT_HOME=%LIBDIR%
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
