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

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

Author: mmusgrov
Date: 2011-05-17 13:30:35 -0400 (Tue, 17 May 2011)
New Revision: 37011

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Support different locations for tools.jar and jconsole.jar

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2011-05-17 16:06:00 UTC (rev 37010)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2011-05-17 17:30:35 UTC (rev 37011)
@@ -51,7 +51,7 @@
                 <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"/>
+                <pathelement location="${jconsole.jar}"/>
             </additional.classpath>
         </compile.macro>
     </target>

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2011-05-17 16:06:00 UTC (rev 37010)
+++ labs/jbosstm/trunk/sharedbuild.xml	2011-05-17 17:30:35 UTC (rev 37011)
@@ -81,15 +81,6 @@
 
     <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" />
 
 
@@ -110,6 +101,30 @@
         <mkdir dir="${build.dir}/lib"/>
         <mkdir dir="${build.dir}/lib/ext"/>
 
+		<!-- tools.jar and jconsole.jar are in different locations depending on the platform
+		     -->
+        <condition property="tools.jar" value="${java.home}/../lib/tools.jar">
+            <available file="${java.home}/../lib/tools.jar"/>
+        </condition>
+        <condition property="tools.jar" value="${java.home}/lib/tools.jar">
+            <available file="${java.home}/lib/tools.jar"/>
+        </condition>
+        <condition property="jconsole.jar" value="${java.home}/../lib/jconsole.jar">
+            <available file="${java.home}/../lib/jconsole.jar"/>
+        </condition>
+        <condition property="jconsole.jar" value="${java.home}/lib/jconsole.jar">
+            <available file="${java.home}/lib/jconsole.jar"/>
+        </condition>
+
+        <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="${tools.jar}" />
+        </path>
+
     </target>
 
     <target name="compile" depends="init">