[jbpm-commits] JBoss JBPM SVN: r6067 - jbpm4/trunk/modules/distro/src/main/files/install.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2010-01-08 10:55:23 -0500 (Fri, 08 Jan 2010)
New Revision: 6067

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
JBPM-2709: fixed demo.setup on Mac OS (Eclipse didn't start)
Also change Eclipse from carbon to cocoa version.

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-01-08 14:59:40 UTC (rev 6066)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-01-08 15:55:23 UTC (rev 6067)
@@ -85,6 +85,10 @@
       <isset property="is.windows" />
     </not>
   </condition>
+	
+	<condition property="is.mac">
+		<os family="mac" />
+	</condition>
 
   <condition property="is.jboss.500">
     <equals arg1="${jboss.version}" arg2="5.0.0.GA"/>
@@ -98,7 +102,7 @@
   <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip">
     <contains string="${os.name}" casesensitive="false" substring="win" />
   </condition>
-  <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-carbon.tar">
+  <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-cocoa.tar">
     <contains string="${os.name}" casesensitive="false" substring="mac" />
   </condition>
   <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
@@ -757,10 +761,16 @@
       <fileset dir="${jbpm.home}/eclipse">
         <filename name="eclipse"/>
       </fileset>
+    	<fileset dir="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/"> <!-- Path is different for OS X -->
+        <filename name="eclipse"/>
+    	</fileset>
     </chmod>
-    <exec executable="/bin/bash" os="Linux,Mac OS X">
+    <exec executable="/bin/bash" os="Linux">
       <arg line="-c &quot;${jbpm.home}/eclipse/eclipse&quot; &quot;-data&quot; &quot;${jbpm.home}/workspace&quot;" />
     </exec>
+  	<exec executable="/bin/bash" os="Mac OS X">
+  	 <arg line="-c &quot;${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse&quot; &quot;-data&quot; &quot;${jbpm.home}/workspace&quot;" />
+    </exec>
   </target>
 
   <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir" description="installs signavio into jboss">