details: /erp/devel/main/rev/86885cba1239
changeset: 8004: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
details: /erp/devel/main/rev/ffe425ccaff9
changeset: 8005:ffe425ccaff9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Aug 02 14:41:28 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/a20e6cfc8bd9
changeset: 8006:a20e6cfc8bd9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Aug 02 14:41:29 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
build.xml | 16 +++++++++++++++-
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
2 files changed, 17 insertions(+), 3 deletions(-)
diffs (64 lines):
diff -r c34340ca5222 -r a20e6cfc8bd9 build.xml
--- a/build.xml Fri Jul 30 15:10:10 2010 +0530
+++ b/build.xml Mon Aug 02 14:41:29 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>
diff -r c34340ca5222 -r a20e6cfc8bd9 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Fri Jul 30 15:10:10 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Aug 02 14:41:29 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18005]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
------------------------------------------------------------------------------
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
