[jboss-svn-commits] JBL Code SVN: r36920 - in labs/jbosstm/trunk: ArjunaCore and 1 other directories.

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

Author: tomjenkinson
Date: 2011-04-13 12:39:01 -0400 (Wed, 13 Apr 2011)
New Revision: 36920

Modified:
   labs/jbosstm/trunk/ArjunaCore/build.xml
   labs/jbosstm/trunk/build-release-pkgs.xml
   labs/jbosstm/trunk/build.xml
   labs/jbosstm/trunk/docs/build.xml
Log:
JBTM-830 make sure we put the common docs in the jta and jts distributions

Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml	2011-04-13 16:34:24 UTC (rev 36919)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml	2011-04-13 16:39:01 UTC (rev 36920)
@@ -35,7 +35,6 @@
                 <packageset dir="../common/classes" excludes="**/internal/**"/>
                 <packageset dir="arjuna/classes" excludes="**/internal/**"/>
                 <packageset dir="txoj/classes" excludes="**/internal/**"/>
-                <packageset dir="tsmx/classes" excludes="**/internal/**"/>
             </packagesets>
         </htdocs.composite.macro>
     </target>

Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml	2011-04-13 16:34:24 UTC (rev 36919)
+++ labs/jbosstm/trunk/build-release-pkgs.xml	2011-04-13 16:39:01 UTC (rev 36920)
@@ -148,10 +148,6 @@
             <property name="com.hp.mw.sourceid" value="${tag}"/>
         </ant>
 
-        <ant dir="${workdir}/build/${tag}/ArjunaCore/tsmx/sar" antfile="build.xml" target="build-sar"/>
-        <copy file="${workdir}/build/${tag}/ArjunaCore/tsmx/sar/build/mbean/jbossts-tools.sar"
-              todir="${workdir}/build/${tag}/install/bin"/>
-
         <ant dir="${workdir}/build/${tag}/XTS" antfile="build.xml" target="install">
             <!-- build the jbossxts.sar with 1.1 only, not 1.0 (which is unsupported) -->
             <property  name="sartype" value="sar-11"/>

Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml	2011-04-13 16:34:24 UTC (rev 36919)
+++ labs/jbosstm/trunk/build.xml	2011-04-13 16:39:01 UTC (rev 36920)
@@ -55,12 +55,18 @@
         <ant dir="ArjunaJTS"/>
         <install.macro src.module="ArjunaJTS"/>
         <ant dir="qa"/>
+        <ant dir="docs" target="install.common.docs">
+            <property name="dest.dir" value="../install/docs"/>
+        </ant>
     </target>
 
     <target name="jta" depends="clean, init_dependencies, antbuildsystem">
         <ant dir="ArjunaJTA"/>
         <install.macro src.module="ArjunaJTA"/>
         <ant dir="qa"/>
+        <ant dir="docs" target="install.common.docs">
+            <property name="dest.dir" value="../install/docs"/>
+        </ant>
     </target>
 
     <target name="core" depends="clean, init_dependencies, antbuildsystem">

Modified: labs/jbosstm/trunk/docs/build.xml
===================================================================
--- labs/jbosstm/trunk/docs/build.xml	2011-04-13 16:34:24 UTC (rev 36919)
+++ labs/jbosstm/trunk/docs/build.xml	2011-04-13 16:39:01 UTC (rev 36920)
@@ -29,9 +29,7 @@
     </target>
 
     <target name="install.docs">
-
         <property name="dest.dir" value="${build.dir}/install/docs"/>
-
         <if>
             <istrue value="${publican}" />
             <then>
@@ -40,6 +38,18 @@
                     <arg value="--langs=en-US"/>
                     <arg value="--formats=pdf,html"/>
                 </exec>
+                <copy todir="${dest.dir}/release_notes" overwrite="true" flatten="true">
+                    <fileset dir="${build.dir}" includes="*/en-US/pdf/*.pdf"/>
+                </copy>
+            </then>
+        </if>
+    </target>
+
+    <target name="install.common.docs">
+        <property name="dest.dir" value="${build.dir}/install/docs"/>
+        <if>
+            <istrue value="${publican}" />
+            <then>
                 <exec dir="failure_recovery_guide" executable="publican">
                     <arg value="build"/>
                     <arg value="--langs=en-US"/>
@@ -50,16 +60,11 @@
                     <arg value="--langs=en-US"/>
                     <arg value="--formats=pdf,html"/>
                 </exec>
-            </then>
-        </if>
-                <copy todir="${dest.dir}/release_notes" overwrite="true" flatten="true">
-                    <fileset dir="${build.dir}" includes="*/en-US/pdf/*.pdf"/>
-                </copy>
                 <copy todir="${dest.dir}" overwrite="true" flatten="true">
                     <fileset dir="." includes="**/*.pdf" excludes="**/*Release*.pdf"/>
                 </copy>
-
-
+            </then>
+        </if>
     </target>
 
 </project>