details:   /erp/devel/pi/rev/86885cba1239
changeset: 8000:86885cba1239
user:      Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date:      Fri Jul 30 18:48:06 2010 +0200
summary:   Fixes 9226: ant setup for OSX

diffstat:

 build.xml |  16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r c34340ca5222 -r 86885cba1239 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>
 

------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to