[jboss-cvs] JBossAS SVN: r110212 - in projects/jboss-jca/trunk: sjc and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2010-12-24 05:37:06 -0500 (Fri, 24 Dec 2010)
New Revision: 110212

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/sjc/build.xml
   projects/jboss-jca/trunk/tools/docant/
Log:
[JBJCA-473] new docbook manual into release file

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-12-24 09:03:45 UTC (rev 110211)
+++ projects/jboss-jca/trunk/build.xml	2010-12-24 10:37:06 UTC (rev 110212)
@@ -289,22 +289,34 @@
        Target: manual
 
        ================================= -->
-  <target name="manual"  depends="manual-support">
-    <ant antfile="doc/build.xml" inheritRefs="false" inheritAll="false">
+  <target name="manual" depends="manual-init">
+    <antcall target="manual-support"/>
+    <antcall target="manual-generate"/>
+  </target>
+
+  <target name="manual-init">
+    <available file="${tools.dir}/docant/target/docbook/staging" type="dir" property="docant.support" value="true"/>
+    <available file="${target.dir}/docbook" type="dir" property="docant.gen" value="true"/>
+  </target>
+
+  <target name="manual-support" unless="docant.support">
+    <ant antfile="${tools.dir}/docant/build.xml" target="clean" inheritRefs="false" inheritAll="false">
       <property name="docant.dir" value="${tools.dir}/docant"/>
-      <property name="docant.target.dir" value="${build.dir}"/>
-<!--
-      <property name="staging.dir" value="${build.dir}/docbook/staging"/>
--->
-      <property name="target.dir" value="${target.dir}"/>
     </ant>
+
+    <ant antfile="${tools.dir}/docant/build.xml" inheritRefs="false" inheritAll="false">
+      <property name="docant.dir" value="${tools.dir}/docant"/>
+    </ant>
   </target>
 
-  <target name="manual-support">
-    <ant antfile="tools/docant/build.xml" inheritRefs="false" inheritAll="false">
+  <target name="manual-generate" unless="docant.gen">
+    <copy todir="${build.dir}">
+      <fileset dir="${tools.dir}/docant/target"/>
+    </copy>
+    <ant antfile="${doc.dir}/build.xml" inheritRefs="false" inheritAll="false">
       <property name="docant.dir" value="${tools.dir}/docant"/>
       <property name="docant.target.dir" value="${build.dir}"/>
-      <property name="staging.dir" value="${build.dir}/docbook/staging"/>
+      <property name="target.dir" value="${target.dir}"/>
     </ant>
   </target>
 
@@ -387,20 +399,17 @@
     <mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc" />
     <mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc/spec" />
 
-    <ant dir="sjc" inheritRefs="true" target="war"/>
-    <delete dir="${build.dir}/sjc"/>
-
-    <ant dir="doc/userguide" target="pdf"/>
-    <ant dir="doc/developerguide" target="pdf"/>
-
+    <antcall target="manual"/>
     <move flatten="true" todir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc">
-      <fileset dir="${build.dir}">
+      <fileset dir="${target.dir}/docbook">
         <include name="**/*.pdf"/>
       </fileset>
     </move>
+    <delete dir="${build.dir}/docbook"/>
 
-    <delete dir="${build.dir}/en-US"/>
-    
+    <ant dir="sjc" inheritRefs="true" target="war"/>
+    <delete dir="${build.dir}/sjc"/>
+
     <ant dir="api" inheritRefs="true" target="docs"/>
     <move todir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc/spec">
       <fileset dir="${target.dir}/docs/spec">

Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2010-12-24 09:03:45 UTC (rev 110211)
+++ projects/jboss-jca/trunk/sjc/build.xml	2010-12-24 10:37:06 UTC (rev 110212)
@@ -305,19 +305,17 @@
       </fileset>
     </move>
 
-    <ant dir="${doc.dir}/userguide" target="html"/>
-    <move todir="${build.dir}/sjc/war/userguide">
-      <fileset dir="${build.dir}/en-US/html">
+    <ant dir="${doc.dir}/.." target="manual" inheritRefs="false" inheritAll="false"/>
+    <copy todir="${build.dir}/sjc/war/userguide">
+      <fileset dir="${target.dir}/docbook/userguide/en-US/html">
         <include name="**/*"/>
       </fileset>
-    </move>
-
-    <ant dir="${doc.dir}/developerguide" target="html"/>
-    <move todir="${build.dir}/sjc/war/developerguide">
-      <fileset dir="${build.dir}/en-US/html">
+    </copy>
+    <copy todir="${build.dir}/sjc/war/developerguide">
+      <fileset dir="${target.dir}/docbook/developerguide/en-US/html">
         <include name="**/*"/>
       </fileset>
-    </move>
+    </copy>
 
     <copy todir="${build.dir}/sjc/war">
       <fileset dir="src/main/resources/root/">


Property changes on: projects/jboss-jca/trunk/tools/docant
___________________________________________________________________
Name: svn:ignore
   - lib
down
support.xml

   + lib
down
target
support.xml