fixed package core for 3.0
authorAsier Lostalé <asier.lostale@openbravo.com>
Fri, 14 Jan 2011 11:45:47 +0100
changeset 9811 7092e54834c6
parent 9810 4ebb9e16ed30
child 9812 c0122525cc3f
fixed package core for 3.0
build.xml
src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java
--- 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}"/>
     
--- 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() {