[jboss-cvs] JBossAS SVN: r110256 - in projects/jboss-jca/trunk/doc: userguide and 1 other directory.

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

Author: jeff.zhang
Date: 2011-01-04 05:26:41 -0500 (Tue, 04 Jan 2011)
New Revision: 110256

Modified:
   projects/jboss-jca/trunk/doc/developerguide/build.xml
   projects/jboss-jca/trunk/doc/userguide/build.xml
Log:
[JBJCA-473] move all docant temp file to build directory

Modified: projects/jboss-jca/trunk/doc/developerguide/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/build.xml	2011-01-04 08:49:25 UTC (rev 110255)
+++ projects/jboss-jca/trunk/doc/developerguide/build.xml	2011-01-04 10:26:41 UTC (rev 110256)
@@ -12,20 +12,17 @@
   <property name="pdfName" value="IronJacamarDeveloperGuide.pdf" />
 
   <target name="docant-init" >
-    <available file="${docant.dir}/target/docbook/staging" type="dir" property="docant.support" value="true"/>
+    <available file="${docant.target.dir}/docbook/staging" type="dir" property="docant.support" value="true"/>
   </target>
 
   <target name="docant-support" unless="docant.support">
     <ant antfile="${docant.dir}/build.xml" inheritRefs="false" inheritAll="false">
       <property name="docant.dir" value="${docant.dir}"/>
+      <property name="docant.target.dir" value="${docant.target.dir}"/>
     </ant>
   </target>
 
   <target name="docant-prepare" depends="docant-init, docant-support">
-    <copy todir="${docant.target.dir}">
-      <fileset dir="${docant.dir}/target"/>
-    </copy>
-
     <copy todir="${docant.target.dir}/docbook/staging/images/images">
         <fileset dir="${basedir}/${srcDir}/en-US/images/"/>
     </copy>
@@ -34,7 +31,9 @@
   <target name="docant-post">
     <mkdir dir="${target.dir}/docs/${srcDocName}"/>
     <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docs/${srcDocName}" failonerror="false"/>
-    <delete dir="${docant.target.dir}/docbook/"/>
+    <delete includeemptydirs="true">
+      <fileset dir="${docant.target.dir}/docbook/staging/images/images/" excludes="community/**"/>
+    </delete>
   </target>
 
   <target name="html">

Modified: projects/jboss-jca/trunk/doc/userguide/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/build.xml	2011-01-04 08:49:25 UTC (rev 110255)
+++ projects/jboss-jca/trunk/doc/userguide/build.xml	2011-01-04 10:26:41 UTC (rev 110256)
@@ -12,20 +12,17 @@
   <property name="pdfName" value="IronJacamarUserGuide.pdf" />
 
   <target name="docant-init" >
-    <available file="${docant.dir}/target/docbook/staging" type="dir" property="docant.support" value="true"/>
+    <available file="${docant.target.dir}/docbook/staging" type="dir" property="docant.support" value="true"/>
   </target>
 
   <target name="docant-support" unless="docant.support">
     <ant antfile="${docant.dir}/build.xml" inheritRefs="false" inheritAll="false">
       <property name="docant.dir" value="${docant.dir}"/>
+      <property name="docant.target.dir" value="${docant.target.dir}"/>
     </ant>
   </target>
 
   <target name="docant-prepare" depends="docant-init, docant-support">
-    <copy todir="${docant.target.dir}">
-      <fileset dir="${docant.dir}/target"/>
-    </copy>
-
     <copy todir="${docant.target.dir}/docbook/staging/images/images">
         <fileset dir="${basedir}/${srcDir}/en-US/images/"/>
     </copy>
@@ -34,7 +31,9 @@
   <target name="docant-post">
     <mkdir dir="${target.dir}/docs/${srcDocName}"/>
     <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docs/${srcDocName}" failonerror="false"/>
-    <delete dir="${docant.target.dir}/docbook/"/>
+    <delete includeemptydirs="true">
+      <fileset dir="${docant.target.dir}/docbook/staging/images/images/" excludes="community/**"/>
+    </delete>
   </target>
 
   <target name="html">