Updating docs build: now the docs are deleted and regenerated, and the package is...

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352284 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/tools/centipede/targets/compile.xtarget b/tools/centipede/targets/compile.xtarget
index 28e537dce7bea508c796fbd1290bca7da6caf9b6..b63ffbcd3d4d3982dfdd3353b3311bdbab564809 100644 (file)
--- a/tools/centipede/targets/compile.xtarget
+++ b/tools/centipede/targets/compile.xtarget
@@ -158,6 +158,3 @@
     <delete dir="${build.dir}"/>
   </target>
 
-  <target name="cleandocs" depends="init" description="* Cleans the build docs directories">
-    <delete dir="${build.docs}"/>
-  </target>

diff --git a/tools/centipede/targets/docs.xtarget b/tools/centipede/targets/docs.xtarget
index 6da45ff029be97d90ddc9587a56127ec1b120375..10a670d410452fd742073a62964c787fa0369d69 100644 (file)
--- a/tools/centipede/targets/docs.xtarget
+++ b/tools/centipede/targets/docs.xtarget
@@ -38,27 +38,13 @@
 
   </target>
 
-
   <!-- =================================================================== -->
-  <!-- Set a variable if the generated docs are already up-to-date.        -->
+  <!-- Clean generated docs dir.                                           -->
   <!-- =================================================================== -->
-  <target name="docs_check" depends="init">
-    <uptodate property="docs.notrequired" targetfile="${build.docs}/index.html" >
-      <srcfiles dir="." includes="project-info.xml"/>
-      <srcfiles dir="${context.dir}/xdocs" includes="**/*.xml"/>
-    </uptodate>
+  <target name="cleandocs" depends="init" description="* Cleans the build docs directories">
+    <delete dir="${build.docs}"/>
   </target>
 
-  <!-- =================================================================== -->
-  <!-- If generated  docs is already up-to-date, print a message saying so. -->
-  <!-- =================================================================== -->
-  <target name="docs_done" if="docs.notrequired">
-    <echo message="-------------------------------------------------------------"/>
-    <echo message="Not rebuilding docs, as they are up-to-date:"/>
-    <echo message="  ${build.docs}/index.html is more recent than"/>
-    <echo message="  project-info.xml and ${context.dir}/xdocs/*.xml"/>
-    <echo message="-------------------------------------------------------------"/>
-  </target>
 
   <!-- =================================================================== -->
   <!-- If generated  docs is already up-to-date, print a message saying so. -->
@@ -72,7 +58,7 @@
   <!-- The documentation system                                            -->
   <!-- =================================================================== -->
   <target name="docs"
-          depends="package, prepare-docs, docs_check, making-docs, docs_done"
+          depends="cleandocs, prepare-docs, making-docs"
           unless="docs.notrequired"
           description="* Generates the documentation">
 
@@ -96,7 +82,7 @@
       </classpath>
     </java>
 
-    <echo message="  ...docs generated succesfully in ./build/docs ."/>
+    <echo message="  ...docs generated succesfully in ./build/${name}/docs ."/>
     <echo message="-------------------------------------------------------------"/>
     
   </target>