[jboss-svn-commits] JBL Code SVN: r38136 - in labs/jbosstm/branches/JBOSSTS_4_16: ArjunaCore/arjuna and 1 other directory.

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

Author: mmusgrov
Date: 2012-07-11 13:41:04 -0400 (Wed, 11 Jul 2012)
New Revision: 38136

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/build.xml
   labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml
Log:
[JBTM-1200] Remove references to tools.jar and jconsole.jar when building on MacOS

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/build.xml	2012-07-09 15:50:22 UTC (rev 38135)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaCore/arjuna/build.xml	2012-07-11 17:41:04 UTC (rev 38136)
@@ -48,10 +48,7 @@
             <additional.classpath>
                 <!-- jconsole performance graphing support
                      -->
-                <fileset dir="${sharedbuild.base.dir}/ext/" includes="orson-0.5.0.jar"/>
-                <fileset dir="${sharedbuild.base.dir}/ext/" includes="jcommon-1.0.10.jar"/>
-                <fileset dir="${sharedbuild.base.dir}/ext/" includes="jfreechart-1.0.6.jar"/>
-                <fileset dir="${java.home}/../lib/" includes="jconsole.jar"/>
+                <path refid="perf.support.lib" />
             </additional.classpath>
         </compile.macro>
     </target>

Modified: labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml	2012-07-09 15:50:22 UTC (rev 38135)
+++ labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml	2012-07-11 17:41:04 UTC (rev 38136)
@@ -81,17 +81,47 @@
 
     <property name="byteman.dir" value="${global.ext.lib.dir}" />
 
-    <path id="byteman.lib" >
-        <pathelement location="${byteman.dir}/byteman.jar" />
-        <pathelement location="${byteman.dir}/byteman-bmunit.jar" />
-        <pathelement location="${byteman.dir}/byteman-install.jar" />
-        <pathelement location="${byteman.dir}/byteman-submit.jar" />
-        <pathelement location="${byteman.dir}/byteman-dtest.jar" />
-        <pathelement location="${java.home}/../lib/tools.jar" />
-    </path>
-
     <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
 
+    <condition property="isMacOS">
+        <os family="mac"/>
+    </condition>
+    
+    <target name="path-init-mac" if="${isMacOS}">
+        <path id="byteman.lib" >
+            <pathelement location="${byteman.dir}/byteman.jar" />
+            <pathelement location="${byteman.dir}/byteman-bmunit.jar" />
+            <pathelement location="${byteman.dir}/byteman-install.jar" />
+            <pathelement location="${byteman.dir}/byteman-submit.jar" />
+            <pathelement location="${byteman.dir}/byteman-dtest.jar" />
+        </path>
+        <path id="perf.support.lib" >
+            <!-- jconsole performance graphing support
+                 -->
+            <pathelement location="${sharedbuild.base.dir}/ext/orson-0.5.0.jar"/>
+            <pathelement location="${sharedbuild.base.dir}/ext/jcommon-1.0.10.jar"/>
+            <pathelement location="${sharedbuild.base.dir}/ext/jfreechart-1.0.6.jar"/>
+        </path>
+    </target>
+    
+    <target name="path-init" unless="${isMacOS}">
+        <path id="byteman.lib" >
+            <pathelement location="${byteman.dir}/byteman.jar" />
+            <pathelement location="${byteman.dir}/byteman-bmunit.jar" />
+            <pathelement location="${byteman.dir}/byteman-install.jar" />
+            <pathelement location="${byteman.dir}/byteman-submit.jar" />
+            <pathelement location="${byteman.dir}/byteman-dtest.jar" />
+            <pathelement location="${java.home}/../lib/tools.jar" />
+        </path>
+        <path id="perf.support.lib" >
+            <!-- jconsole performance graphing support
+                 -->
+            <pathelement location="${sharedbuild.base.dir}/ext/orson-0.5.0.jar"/>
+            <pathelement location="${sharedbuild.base.dir}/ext/jcommon-1.0.10.jar"/>
+            <pathelement location="${sharedbuild.base.dir}/ext/jfreechart-1.0.6.jar"/>
+            <pathelement location="${java.home}/../lib/jconsole.jar"/>
+        </path>
+    </target>
 
     <target name="clean">
         <delete dir="${build.dir}"/>
@@ -104,7 +134,7 @@
         </for>
     </target>
 
-    <target name="init">
+    <target name="init" depends="path-init-mac,path-init">
 
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${build.dir}/lib"/>