makes antRun exec in build.sh and adds overview for javadoc generation

Submitted by:	Victor Mote <vic@outfitr.com>
updated classpaths

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

diff --git a/build.sh b/build.sh
index d0a39960f38f7ff5086bf21ebe0b8731c3426b5b..4b2dac2c63f6e7a72477a2b9071f6052922501b1 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -26,10 +26,14 @@ 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/xerces-1.4.3.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
+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-20020315.jar
 
 ANT_HOME=$LIBDIR
+# antRun must be executable (can't do this in build.xml because Ant uses antRun
+# to do the chmod)
+chmod +rx $LIBDIR/bin/antRun
+
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then

diff --git a/build.xml b/build.xml
index 5ad5718a74be17cfe619d91ee9f15c1136a1994e..606daa487a9fbd8312eed33d30c204efc4a701e0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -125,8 +125,9 @@ 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.4.3.jar"/>
+       <include name="lib/xercesImpl-2.0.1.jar"/>
        <include name="lib/xalan-2.2D11.jar"/>
+       <include name="lib/xml-apis.jar"/>
        <include name="lib/batik.jar"/>
        <include name="lib/avalon-framework-cvs-20020315.jar"/>
        <include name="lib/jimi*"/>
@@ -367,7 +368,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <!-- copy src files -->
     <copy todir="${build.src}">
       <fileset dir="${src.dir}" 
-         excludes="**/Makefile*, **/package.html, **/${jimi},**/${jai},**/${xsltransform},**/${trax},**/apps/TraxInputHandler.java"/>
+         excludes="**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/apps/TraxInputHandler.java"/>
     </copy>
   </target>
 
@@ -492,7 +493,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <fileset dir="${build.dest}" includes="org/apache/fop/svg/**"/>
     <fileset dir="${build.dest}" includes="org/apache/fop/render/pdf/**"
              excludes="org/apache/fop/render/pdf/PDFRenderer.class,org/apache/fop/render/pdf/PDFXMLHandler*"/>
-    <fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/apps/Version.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/configuration/**,org/apache/fop/util/StreamUtilities.class"/>
+    <fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/util/StreamUtilities.class"/>
     <manifest>
         <attribute name="Implementation-Title" value="${pdf-transcoder.name}"/>
         <attribute name="Implementation-Version" value="${pdf-transcoder.version}"/>
@@ -529,8 +530,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <!-- =================================================================== -->
   <target name="prepare-docs" depends="init">
     <mkdir dir="${build.docs}"/>
-    <!-- sets exec permission for antRun on Unix systems. necessary for javadoc-->
-    <chmod file="${lib.dir}/bin/antRun" perm="ugo+rx" />
   </target>
 
 
@@ -548,6 +547,8 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
              windowtitle="${Name} API"
              doctitle="${Name}"
              bottom="Copyright &#169; ${year} Apache Software Foundation. All Rights Reserved."
+             overview="${build.src}/overview.html"
+             failonerror="true"
     />
   </target>