svn commit: r495410 - in /xmlgraphics/batik/trunk: MAINTAIN build.sh build.xml

[ca...@apache.org]

Author: cam
Date: Thu Jan 11 14:37:30 2007
New Revision: 495410

URL: http://svn.apache.org/viewvc?view=rev&rev=495410
Log:
1. Add a "publishdoc" build target, which avoids regenerating javadocs
   before publishing.
2. Ensure ForrestBot's dependencies are on the classpath when running
   build.sh (this should be done for build.bat too).

Modified:
    xmlgraphics/batik/trunk/MAINTAIN
    xmlgraphics/batik/trunk/build.sh
    xmlgraphics/batik/trunk/build.xml

Modified: xmlgraphics/batik/trunk/MAINTAIN
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/MAINTAIN?view=diff&rev=495410&r1=495409&r2=495410
==============================================================================
--- xmlgraphics/batik/trunk/MAINTAIN (original)
+++ xmlgraphics/batik/trunk/MAINTAIN Thu Jan 11 14:37:30 2007
@@ -151,6 +151,9 @@
  3) execute "cd /www/xmlgraphics.apache.org/batik"
  4) execute "svn update"
  
+If the javadocs don't need to be regenerated, the "publishdoc" build
+target can be used instead of "publish".  This will be much quicker.
+
 Note that because of the way ForrestBot works, any files that are no
 longer part of the site will still remain in Subversion, and thus will
 still be deployed.  To delete files permanently, check out

Modified: xmlgraphics/batik/trunk/build.sh
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.sh?view=diff&rev=495410&r1=495409&r2=495410
==============================================================================
--- xmlgraphics/batik/trunk/build.sh (original)
+++ xmlgraphics/batik/trunk/build.sh Thu Jan 11 14:37:30 2007
@@ -46,6 +46,13 @@
 
 CP=$JAVA_HOME/lib/tools.jar:lib/build/ant-1.6.5.jar:lib/build/ant-launcher-1.6.5.jar:lib/build/crimson-1.1.3.jar:lib/build/jaxp.jar
 
+# If Forrest is present, add the ForrestBot dependency jars to the classpath.
+if [ "$FORREST_HOME" != "" ]; then
+  for x in $FORREST_HOME/tools/forrestbot/lib/*.jar; do
+    CP=$CP:$x
+  done
+fi
+
 if $cygwin; then
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   CP=`cygpath --path --windows "$CP"`

Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?view=diff&rev=495410&r1=495409&r2=495410
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Thu Jan 11 14:37:30 2007
@@ -1629,8 +1629,13 @@
     </javadoc>
   </target>
 
+  <target name="publishdoc" depends="sitedoc, deploy.svn"
+          description="Generates the http://xmlgraphics.apache.org/batik/ site without the javadocs and commits it to SVN">
+    <delete dir="work"/>
+  </target>
+
   <target name="publish" depends="site, deploy.svn"
-          description="Generates the http://xmlgraphics.apache.org/batik/ site and commits it to SVN">
+          description="Generates the http://xmlgraphics.apache.org/batik/ site including the javadocs and commits it to SVN">
     <delete dir="work"/>
   </target>