Reduced the classpath in build.bat/sh to a minimum for easier maintenance. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@195568 13f79535-47bb-0310-9956-ffa450edef68tags/fop-0_20_5rc
@@ -7,16 +7,10 @@ if "%JAVA_HOME%" == "" goto error | |||
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% | |||
@@ -31,14 +31,8 @@ LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar | |||
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) |
@@ -136,15 +136,15 @@ 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/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 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
<!--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 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
</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 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
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 @@ Sometimes ant gives out this warnings, but the build is finished without any pro | |||
</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 +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 | |||
@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 |