Fixes 9226: ant setup for OSX
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Fri, 30 Jul 2010 18:48:06 +0200
changeset 8000 86885cba1239
parent 7999 c34340ca5222
child 8001 a2b32071c996
child 8087 8ffc637b9a01
child 8279 ffe425ccaff9
Fixes 9226: ant setup for OSX
build.xml
--- a/build.xml	Fri Jul 30 15:10:10 2010 +0530
+++ b/build.xml	Fri Jul 30 18:48:06 2010 +0200
@@ -949,6 +949,7 @@
         <equals arg1="${os.arch}" arg2="x86" />
         <equals arg1="${os.arch}" arg2="i386" />
         <contains string="${os.name}" substring="Windows" />
+        <contains string="${os.name}" substring="OS X" />
       </or>
     </condition>
     <condition property="osarch" value="-x64">
@@ -958,6 +959,9 @@
         <not>
           <contains string="${os.name}" substring="Windows" />
         </not>
+        <not>
+          <contains string="${os.name}" substring="OS X" />
+        </not>
       </or>
     </condition>
     <condition property="osarch" value="-ia64">
@@ -972,10 +976,20 @@
   </target>
 
   <target name="setup.exists.test">
-    <condition property="bin.ext" value="exe" else="bin">
+    <condition property="bin.ext" value="exe">
       <os family="windows" />
     </condition>
 
+    <condition property="bin.ext" value="app.tar.gz">
+      <os family="mac" />
+    </condition>
+
+    <condition property="bin.ext" value="bin">
+      <not>
+        <isset property="${bin.ext}" />
+      </not>
+    </condition>
+
     <available file="config/setup-properties-${osname}${osarch}.${bin.ext}" property="setup.exists" value="true" />
   </target>