build.xml
changeset 7516 e1c239d44bfa
parent 7502 b349f71af836
child 7519 432ccd399d73
--- a/build.xml	Mon Apr 26 18:19:54 2010 +0200
+++ b/build.xml	Tue Apr 27 09:17:02 2010 +0200
@@ -291,6 +291,7 @@
 
     <ant dir="${base.src}" target="smartbuild" inheritAll="true" inheritRefs="true" />
 
+    <antcall inheritall="true" inheritrefs="true" target="apply.module" />
     <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" />
     <antcall target="build.deploy" />
     <updatesystemstatus v="RB51"/>
@@ -340,8 +341,8 @@
     <ant dir="src-util/modulescript" target="compile" inheritAll="true" inheritRefs="true" />
   </target>
 
-  <target name="compile.complete.deploy" depends="compile.complete.development, compile.complete.war">
-    
+  <target name="compile.complete.deploy" depends="compile.complete.development, compile.complete.war, apply.module">
+
     <!-- Calculate wad checksum to enable smartbuild-->
     <taskdef name="CheckSumCondition" classname="org.openbravo.utils.CheckSumCondition">
       <classpath refid="project.class.path" />
@@ -561,9 +562,6 @@
 
   <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" />
     <updatesystemstatus v="RB51"/> 
@@ -598,8 +596,6 @@
     <ant dir="${base.db}" target="update.database.java" inheritAll="true" inheritRefs="true" />
     <updatesystemstatus v="RB21"/>
     <antcall target="generate.entities.quick" />
-    <updatesystemstatus v="RB31"/>
-    <antcall target="db.apply.modules" />
   </target>
 
   <target name="update.database.mod" depends="init, core.lib, database.lib, buildvalidation">