build.xml
changeset 6907 60a98816806d
parent 6807 3725f0e49097
child 6909 1fd8f4eca929
--- a/build.xml	Thu Apr 01 18:22:18 2010 +0200
+++ b/build.xml	Tue Mar 30 13:18:54 2010 +0200
@@ -212,6 +212,10 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+    <dirset dir="${base.modules}">
+      <include name="*/build/classes/" />
+    </dirset>
+    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
   </path>
   
   <macrodef name="updatesystemstatus">
@@ -318,6 +322,18 @@
     <ant dir="${base.src}" target="compile" inheritAll="true" inheritRefs="true" />
   </target>
 
+  <target name="validate" depends="init">
+    <ant dir="src-util/buildvalidation" target="validate" inheritAll="true" inheritRefs="true" />
+  </target>
+  
+  <target name="compile.buildvalidation" depends="init, core.lib">
+    <ant dir="src-util/buildvalidation" target="compile" inheritAll="true" inheritRefs="true" />
+  </target>
+  
+  <target name="compile.modulescript" depends="init, core.lib">
+    <ant dir="src-util/modulescript" target="compile" inheritAll="true" inheritRefs="true" />
+  </target>
+
   <target name="compile.complete.deploy" depends="compile.complete.development, compile.complete.war">
     
     <!-- Calculate wad checksum to enable smartbuild-->
@@ -568,14 +584,14 @@
     <antcall target="db.apply.modules.sampledata" />
   </target>
 
-  <target name="update.database" depends="init, core.lib, database.lib">
+  <target name="update.database" depends="init, core.lib, database.lib, validate">
     <ant dir="${base.db}" target="update.database.java" inheritAll="true" inheritRefs="true" />
     <updatesystemstatus v="RB21"/>
     <antcall target="generate.entities.quick" />
     <antcall target="db.apply.modules" />
   </target>
 
-  <target name="update.database.mod" depends="init, core.lib, database.lib">
+  <target name="update.database.mod" depends="init, core.lib, database.lib, validate">
     <ant dir="${base.db}" target="update.database.mod.java" inheritAll="true" inheritRefs="true" />
   </target>
 
@@ -607,8 +623,7 @@
   </target>
 
 
-  <target name="apply.modules">
-    <antcall target="update.database.mod" />
+  <target name="apply.modules" depends="update.database.mod">
     <updatesystemstatus v="RB21"/>
 
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
@@ -786,8 +801,8 @@
   </target>
 
   <target name="diagnostic">
-    <ant dir="src-diagnostics" antfile="build-create.xml" target="build" />
-    <ant dir="src-diagnostics" target="check.all" />
+    <ant dir="src-util/diagnostic" antfile="build-create.xml" target="build" />
+    <ant dir="src-util/diagnostic" target="check.all" />
   </target>
 
   <target name="setup.check.os">