# HG changeset patch
# User Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
# Date 1241720852 -7200
# Node ID 09c843f5cf155bf878061fa95903a1a16a38006f
# Parent  39a222b6912900bbab562e6ff16293a1fedfb4cf
Fixes issue 8086: take the revision id from Hg, not SVN

diff -r 39a222b69129 -r 09c843f5cf15 build.xml
--- a/build.xml	Thu May 07 19:09:24 2009 +0200
+++ b/build.xml	Thu May 07 20:27:32 2009 +0200
@@ -103,10 +103,7 @@
   <property name="force" value="false" />
   <property name="local" value="true" />
 
-  <available file=".svn/entries" property="is.svn" />
-
-
-
+  <available file=".hg" property="is.hg" />
 
 
   <condition property="deploy.mode" value="class">
@@ -205,24 +202,11 @@
     <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." />
   </target>
 
-  <target name="code.rev" depends="set.code.rev">
-    <condition property="code.revision" value="${svn.entries}" else="0">
-      <isset property="svn.entries" />
-    </condition>
-  </target>
-
-  <target name="set.code.rev" if="is.svn">
-    <loadfile property="svn.entries" srcFile=".svn/entries" failonerror="false">
-      <filterchain>
-        <filterreader classname="org.apache.tools.ant.filters.HeadFilter">
-          <param name="skip" value="3" />
-          <param name="lines" value="1" />
-        </filterreader>
-      </filterchain>
-      <filterchain>
-        <filterreader classname="org.apache.tools.ant.filters.StripLineBreaks" />
-      </filterchain>
-    </loadfile>
+  <target name="code.rev" if="is.hg">
+    <exec executable="hg" outputproperty="code.revision">
+      <arg value="id"/>
+      <arg value="-i"/>
+    </exec>
   </target>
 
   <target name="compile.complete" depends="init">
diff -r 39a222b69129 -r 09c843f5cf15 src-db/database/build.xml
--- a/src-db/database/build.xml	Thu May 07 19:09:24 2009 +0200
+++ b/src-db/database/build.xml	Thu May 07 20:27:32 2009 +0200
@@ -322,7 +322,7 @@
           VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1, 'Default');
           DELETE FROM AD_SYSTEM_INFO;
           INSERT INTO AD_SYSTEM_INFO(AD_SYSTEM_INFO_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, ANT_VERSION, OB_VERSION, OB_INSTALLMODE, CODE_REVISION)
-          VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}', '${application.version}', 'From Sources', ${code.revision});
+          VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}', '${application.version}', 'From Sources', '${code.revision}');
           DELETE FROM AD_REGISTRATION_INFO;
           INSERT INTO AD_REGISTRATION_INFO(AD_REGISTRATION_INFO_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY)
           VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0');
@@ -347,7 +347,7 @@
           VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1, 'Default');
           DELETE FROM AD_SYSTEM_INFO;
           INSERT INTO AD_SYSTEM_INFO(AD_SYSTEM_INFO_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, ANT_VERSION, OB_VERSION, OB_INSTALLMODE, CODE_REVISION)
-          VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}', '${application.version}', 'From Sources', ${code.revision});
+          VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}', '${application.version}', 'From Sources', '${code.revision}');
           DELETE FROM AD_REGISTRATION_INFO;
           INSERT INTO AD_REGISTRATION_INFO(AD_REGISTRATION_INFO_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY)
           VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0');
@@ -371,7 +371,7 @@
           DELETE FROM AD_SYSTEM;
           INSERT INTO AD_SYSTEM (AD_SYSTEM_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, TAD_RECORDRANGE, TAD_RECORDRANGE_INFO, TAD_TRANSACTIONALRANGE, TAD_THEME)
           VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1, 'Default');
-        	UPDATE AD_SYSTEM_INFO SET CODE_REVISION=${code.revision};
+        	UPDATE AD_SYSTEM_INFO SET CODE_REVISION='${code.revision}';
         	CALL AD_UPDATE_SEQUENCE();
           CALL AD_UPDATE_ACCESS();
           UPDATE AD_MODULE SET ISINDEVELOPMENT='N', ISDEFAULT='N', SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL, ISREGISTERED='N' WHERE STATUS IS NULL OR STATUS='I';
@@ -391,7 +391,7 @@
           DELETE FROM AD_SYSTEM;
           INSERT INTO AD_SYSTEM (AD_SYSTEM_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, TAD_RECORDRANGE, TAD_RECORDRANGE_INFO, TAD_TRANSACTIONALRANGE, TAD_THEME)
           VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1, 'Default');
-          UPDATE AD_SYSTEM_INFO SET CODE_REVISION=${code.revision};
+          UPDATE AD_SYSTEM_INFO SET CODE_REVISION='${code.revision}';
           SELECT AD_UPDATE_SEQUENCE();
           SELECT AD_UPDATE_ACCESS();
           UPDATE AD_MODULE SET ISINDEVELOPMENT='N', ISDEFAULT='N', SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL, ISREGISTERED='N' WHERE STATUS IS NULL OR STATUS='I';