CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 02 Aug 2010 14:41:28 +0200
changeset 8005 ffe425ccaff9
parent 8003 a2a477578cf4 (current diff)
parent 8004 86885cba1239 (diff)
child 8006 a20e6cfc8bd9
CI: promote changesets from pi to main
--- a/build.xml	Fri Jul 30 19:32:16 2010 +0200
+++ b/build.xml	Mon Aug 02 14:41:28 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>