[jbpm-commits] JBoss JBPM SVN: r5280 - jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd.

[do-not-reply at jboss.org]

Author: koen.aers at jboss.com
Date: 2009-07-10 00:51:11 -0400 (Fri, 10 Jul 2009)
New Revision: 5280

Modified:
   jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
Log:
fix for expansion of eclipse on mac os X

Modified: jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml
===================================================================
--- jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml	2009-07-10 04:49:26 UTC (rev 5279)
+++ jbpm4/branches/jbpm-4.0/modules/distro/src/main/files/gpd/build.xml	2009-07-10 04:51:11 UTC (rev 5280)
@@ -25,10 +25,13 @@
   <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip">
     <contains string="${os.name}" casesensitive="false" substring="win" />
   </condition>
-  <condition property="eclipse.filename" value="eclipse-jee-galileo-macosx-carbon.tar.gz">
+  <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-carbon.tar">
     <contains string="${os.name}" casesensitive="false" substring="mac" />
   </condition>
-  <condition property="eclipse.filename" value="eclipse-jee-galileo-linux-gtk.tar.gz">
+  <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
+    <contains string="${os.name}" casesensitive="false" substring="mac" />
+  </condition>
+  <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar">
     <and>
       <contains string="${os.name}" casesensitive="false" substring="linux" />
       <not>
@@ -36,12 +39,26 @@
       </not>
     </and>
   </condition>
-  <condition property="eclipse.filename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar.gz">
+  <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
     <and>
       <contains string="${os.name}" casesensitive="false" substring="linux" />
+      <not>
+        <contains string="${os.arch}" casesensitive="false" substring="64" />
+      </not>
+    </and>
+  </condition>
+  <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar">
+    <and>
+	  <contains string="${os.name}" casesensitive="false" substring="linux" />
       <contains string="${os.arch}" casesensitive="false" substring="64" />
     </and>
   </condition>
+  <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
+    <and>
+      <contains string="${os.name}" casesensitive="false" substring="linux" />
+      <contains string="${os.arch}" casesensitive="false" substring="64" />
+    </and>
+  </condition>
   <!-- general eclipse properties -->
   <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/galileo/R/${eclipse.filename}" />
   <property name="eclipse.distro.dir"  value="${jbpm.home}/downloads" />
@@ -69,7 +86,9 @@
   </target>
 
   <target name="internal.install.eclipse.non.windows" if="isNotWindows">
-    <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" />
+    <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" />
+    <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" />
+  	<delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/>
   </target>
 
   <!-- ### GET ECLIPSE ##################################################### -->