[validation] Separated sqlc tasks
authorAntonio Moreno <antonio.moreno@openbravo.com>
Tue, 30 Mar 2010 17:24:56 +0200
changeset 6895 a4d9cecda6bb
parent 6894 0bedd4146907
child 6896 3a18b70881ad
[validation] Separated sqlc tasks
src-util/buildvalidation/build.xml
src-util/diagnostic/.classpath
src-util/diagnostic/.project
src-util/diagnostic/.settings/.jsdtscope
src-util/diagnostic/.settings/org.eclipse.jdt.core.prefs
src-util/diagnostic/.settings/org.eclipse.jst.common.project.facet.core.prefs
src-util/diagnostic/.settings/org.eclipse.wst.common.component
src-util/diagnostic/.settings/org.eclipse.wst.common.project.facet.core.xml
src-util/diagnostic/.settings/org.eclipse.wst.jsdt.ui.superType.container
src-util/diagnostic/.settings/org.eclipse.wst.jsdt.ui.superType.name
src-util/diagnostic/WebContent/META-INF/MANIFEST.MF
src-util/diagnostic/WebContent/WEB-INF/web.xml
src-util/diagnostic/build-create.xml
src-util/diagnostic/build.xml
src-util/diagnostic/build/.keep
src-util/diagnostic/check-ob-perms.sh
src-util/diagnostic/config/diagnostics.properties
src-util/diagnostic/config/log4j.properties
src-util/diagnostic/src/Test.java
src-util/diagnostic/src/org/openbravo/check/Check.java
src-util/diagnostic/src/org/openbravo/task/CheckDB.java
src-util/diagnostic/src/org/openbravo/task/CheckEnvironmentVariables.java
src-util/diagnostic/src/org/openbravo/task/CheckJVMVersion.java
src-util/diagnostic/src/org/openbravo/task/CheckMemory.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatAntExecution.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatFilePermissions.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatMemory.java
src-util/diagnostic/src/org/openbravo/task/CheckTomcatVersion.java
src-util/diagnostic/src/org/openbravo/task/CheckX.java
src-util/diagnostic/src/org/openbravo/task/CompareVersion.java
src-util/diagnostic/src/org/openbravo/utils/PropertiesManager.java
src-util/diagnostic/src/org/openbravo/utils/ServerConnection.java
src-util/diagnostic/src/org/openbravo/utils/Version.java
src-util/modulescript/build.xml
--- a/src-util/buildvalidation/build.xml	Tue Mar 30 16:45:20 2010 +0200
+++ b/src-util/buildvalidation/build.xml	Tue Mar 30 17:24:56 2010 +0200
@@ -68,22 +68,32 @@
     <delete dir="${build.pre.sqlc}" failonerror="false" includeemptydirs="true" />
   </target>
 
-  <target name="sqlc" depends="init">
+  <target name="sqlcCore" depends="init" if="checkCore">
     <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org '${build.pre.sqlc}'" />
       <classpath refid="pre.class.path" />
     </java>
+      <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java" destdir="${build.pre}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+        <classpath refid="pre.class.path" />
+      </javac>
+  </target>
+
+  <target name="sqlcModules" depends="init" unless="checkCore">
   	
-  	<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${build.pre.sqlc}'/src */src-util/buildvalidation" />
-  	  <classpath refid="pre.class.path" />
-  	</java>
+      <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+        <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/buildvalidation/src */src-util/buildvalidation" />
+        <classpath refid="pre.class.path" />
+      </java>
+      <javac srcdir="${base.modules}/${module}/src-util/buildvalidation/src" includes="**/*.java" destdir="${base.modules}/${module}/build/classes" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+        <classpath refid="pre.class.path" />
+      </javac>
+  </target>
+
+  <target name="sqlc" depends="init, sqlcCore, sqlcModules">
+  	
   </target>
 
   <target name="compileSqlc" depends="sqlc">
-    <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java" destdir="${build.pre}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
-      <classpath refid="pre.class.path" />
-    </javac>
   </target>
 
 
--- a/src-util/modulescript/build.xml	Tue Mar 30 16:45:20 2010 +0200
+++ b/src-util/modulescript/build.xml	Tue Mar 30 17:24:56 2010 +0200
@@ -68,25 +68,34 @@
     <delete dir="${build.pre.sqlc}" failonerror="false" includeemptydirs="true" />
   </target>
 
-  <target name="sqlc" depends="init">
+  <target name="sqlcCore" depends="init" if="checkCore">
     <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
       <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org '${build.pre.sqlc}'" />
       <classpath refid="pre.class.path" />
     </java>
+      <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java" destdir="${build.pre}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+        <classpath refid="pre.class.path" />
+      </javac>
+  </target>
+
+  <target name="sqlcModules" depends="init" unless="checkCore">
   	
-  	<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${build.pre.sqlc}'/src */src-util/modulescript" />
-  	  <classpath refid="pre.class.path" />
-  	</java>
+      <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+        <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/modulescript/src */src-util/modulescript" />
+        <classpath refid="pre.class.path" />
+      </java>
+      <javac srcdir="${base.modules}/${module}/src-util/modulescript/src" includes="**/*.java" destdir="${base.modules}/${module}/build/classes" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+        <classpath refid="pre.class.path" />
+      </javac>
+  </target>
+
+  <target name="sqlc" depends="init, sqlcCore, sqlcModules" >
+  	
   </target>
 
   <target name="compileSqlc" depends="sqlc">
-    <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java" destdir="${build.pre}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
-      <classpath refid="pre.class.path" />
-    </javac>
   </target>
 
-
   <target name="javacCore" if="checkCore">
     <javac srcdir="${main.dir}" includes="src-util/modulescript/src/**/*.java" destdir="${build.pre}" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
       <classpath refid="pre.class.path" />