build.xml
changeset 7535 0911fd2387bb
parent 7528 1537a5d4d386
child 7537 7322f78a67ae
--- a/build.xml	Tue Jun 01 10:36:57 2010 +0200
+++ b/build.xml	Tue Jun 01 18:08:35 2010 +0200
@@ -323,7 +323,7 @@
   </target>
 
   <target name="buildvalidation" depends="init, core.lib">
-    <updatesystemstatus v="RB10"/> 
+    <updatesystemstatus v="RB11"/> 
     <ant dir="src-util/buildvalidation" target="buildvalidation" inheritAll="true" inheritRefs="true" />
   </target>
   
@@ -335,7 +335,7 @@
     <ant dir="src-util/modulescript" target="compile" inheritAll="true" inheritRefs="true" />
   </target>
 
-  <target name="compile.complete.deploy" depends="compile.complete.development, compile.complete.war, apply.module">
+  <target name="compile.complete.deploy" depends="compile.complete.development, compile.complete.war">
 
     <!-- Calculate wad checksum to enable smartbuild-->
     <taskdef name="CheckSumCondition" classname="org.openbravo.utils.CheckSumCondition">
@@ -348,12 +348,12 @@
   </target>
 
   <target name="compile.complete.development" depends="init" unless="mode.war">
-    <updatesystemstatus v="RB22"/>
+    <updatesystemstatus v="RB43"/>
     <ant dir="${base.src}" target="compile.complete.development" inheritAll="true" inheritRefs="true" />
   </target>
 
   <target name="compile.complete.war" depends="init" if="mode.war">
-    <updatesystemstatus v="RB22"/>
+    <updatesystemstatus v="RB43"/>
     <antcall target="compile.complete" />
     <antcall target="war" />
   </target>
@@ -558,6 +558,8 @@
   </target>
 
   <target name="install.source" depends="init, create.database, wad.lib, trl.lib, compile.complete.deploy">
+    <echo message="applying modules" />    
+    <antcall inheritall="true" inheritrefs="true" target="apply.module" />
 
     <antcall target="import.sample.data" />
     <antcall target="load.logoimages" />
@@ -590,14 +592,17 @@
   </target>
 
   <target name="update.database" depends="init, core.lib, database.lib, buildvalidation">
-    <updatesystemstatus v="RB21"/>
+    <updatesystemstatus v="RB12"/>
     <ant dir="${base.db}" target="update.database.java" inheritAll="true" inheritRefs="true" />
     <antcall target="generate.entities.quick" />
+    <antcall target="apply.module" />
   </target>
 
   <target name="update.database.mod" depends="init, core.lib, database.lib, buildvalidation">
-    <updatesystemstatus v="RB21"/>
+    <updatesystemstatus v="RB12"/>
     <ant dir="${base.db}" target="update.database.mod.java" inheritAll="true" inheritRefs="true" />
+    <antcall target="generate.entities.quick" />
+    <antcall target="apply.module" />
   </target>
 
   <target name="create.database.script" depends="init, core.lib">
@@ -638,10 +643,9 @@
       <isfalse value="${apply.modules.complete.compilation.var}" />
     </condition>
 
-    <updatesystemstatus v="RB22"/>
+    <updatesystemstatus v="RB43"/>
     <antcall target="apply.modules.compile"/>
 
-    <antcall inheritall="true" inheritrefs="true" target="apply.module" />
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />
 
   </target>
@@ -658,9 +662,13 @@
     </taskdef>
     <applyModule userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties"/>
   </target>
-
-  <target name="apply.module">
-    <updatesystemstatus v="RB23"/>
+  
+  <target name="compile.apply.module" depends="init">
+    <ant dir="${base.src}" target="compile.apply.module" inheritAll="true" inheritRefs="true" />
+  </target>
+  
+  <target name="apply.module" depends="compile.apply.module">
+    <updatesystemstatus v="RB31"/>
     <java classname="org.openbravo.erpCommon.modules.ApplyModuleTask" fork="true" maxmemory="${build.maxmemory}" failonerror="true">
       <arg line="'${base.src}'" />
       <classpath refid="project.class.path" />