details: /erp/devel/pi/rev/7092e54834c6
changeset: 9811:7092e54834c6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Jan 14 11:45:47 2011 +0100
summary: fixed package core for 3.0
diffstat:
build.xml | 6 +++++-
src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java | 6 ++----
2 files changed, 7 insertions(+), 5 deletions(-)
diffs (46 lines):
diff -r 4ebb9e16ed30 -r 7092e54834c6 build.xml
--- a/build.xml Fri Jan 14 10:22:49 2011 +0100
+++ b/build.xml Fri Jan 14 11:45:47 2011 +0100
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2010 Openbravo SLU
+* All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -1028,6 +1028,10 @@
byline="true"/>
<echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/>
+
+ <delete includeEmptyDirs="true">
+ <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/>
+ </delete>
<zip destfile="${basedir}/core-${core.rev}.obx" basedir="${tmpdir}"/>
diff -r 4ebb9e16ed30 -r 7092e54834c6
src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java
--- a/src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java Fri Jan
14 10:22:49 2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java Fri Jan
14 11:45:47 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -38,9 +38,7 @@
// remove + in case there are uncommited changes
hgRevNo = hgRevNo.replace("+", "");
- Integer revNo = new Integer(hgRevNo);
- revNo += 10000;
- getProject().setProperty(revision, "2.50." + revNo.toString());
+ getProject().setProperty(revision, "3.0." + hgRevNo);
}
public String getRevision() {
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
