svn commit: r495425 - /xmlgraphics/batik/trunk/build.xml

[ca...@apache.org]

Author: cam
Date: Thu Jan 11 15:15:11 2007
New Revision: 495425

URL: http://svn.apache.org/viewvc?view=rev&rev=495425
Log:
1. Ensure not having Forrest installed doesn't stop other build targets
   from working.

Modified:
    xmlgraphics/batik/trunk/build.xml

Modified: xmlgraphics/batik/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?view=diff&rev=495425&r1=495424&r2=495425
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Thu Jan 11 15:15:11 2007
@@ -1629,13 +1629,15 @@
     </javadoc>
   </target>
 
-  <target name="publishdoc" depends="sitedoc, deploy.svn"
+  <target name="publishdoc" depends="sitedoc"
           description="Generates the http://xmlgraphics.apache.org/batik/ site without the javadocs and commits it to SVN">
+    <antcall target="deploy.svn"/>
     <delete dir="work"/>
   </target>
 
-  <target name="publish" depends="site, deploy.svn"
+  <target name="publish" depends="site"
           description="Generates the http://xmlgraphics.apache.org/batik/ site including the javadocs and commits it to SVN">
+    <antcall target="deploy.svn"/>
     <delete dir="work"/>
   </target>
 
@@ -1644,6 +1646,7 @@
     <delete dir="${docs}"/>
     <delete dir="${site}"/>
     <delete dir="build"/>  <!-- In case it's left behind by Forrest. -->
+    <delete dir="work"/>   <!-- In case it's left behind by ForrestBot. -->
   </target>
 
   <!-- Generates splash screens for the browser ........................... -->
@@ -1689,5 +1692,6 @@
 
 
   <!-- Import ForrestBot for the "publish" target -->
-  <import file="${env.FORREST_HOME}/tools/forrestbot/core/deploy.xml"/>
+  <import file="${env.FORREST_HOME}/tools/forrestbot/core/deploy.xml"
+          optional="true"/>
 </project>