Fixed issue 20416. Fixed incremental compile of files inside modules
authorAntonio Moreno <antonio.moreno@openbravo.com>
Mon, 07 May 2012 11:56:08 +0200
changeset 16458 b97198212bc3
parent 16457 57a7b1e4a6a9
child 16459 82b87eb26514
Fixed issue 20416. Fixed incremental compile of files inside modules
src-wad/build.xml
src/build.xml
--- a/src-wad/build.xml	Mon May 07 11:48:33 2012 +0200
+++ b/src-wad/build.xml	Mon May 07 11:56:08 2012 +0200
@@ -81,10 +81,19 @@
     </javac>
   </target>
 
+  <path id="my-src-wad-dirs">
+    <pathelement path="src" />
+    <dirset dir="../modules">
+      <include name="*/src-wad/*" />
+    </dirset>
+  </path>
+
   <target name="compile" depends="compileSqlc">
-    <javac srcdir="${main.dir}" includes="src-wad/src/**/*.java,modules/*/src-wad/**/*.java" destdir="${build.wad}" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" fork="true" includeantruntime="false">
+    <javac destdir="${build.wad}" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" fork="true" includeantruntime="false">
+      <src refid="my-src-wad-dirs" />
       <classpath refid="wad.class.path" />
     </javac>
+
     <copy todir="${build.wad}" encoding="UTF-8">
       <fileset dir="${build.wad.src}" includes="**/*xml" />
       <fileset dir="${build.wad.src}" includes="**/*html" />
--- a/src/build.xml	Mon May 07 11:48:33 2012 +0200
+++ b/src/build.xml	Mon May 07 11:56:08 2012 +0200
@@ -326,9 +326,26 @@
 	<property name="export" value="no" />
 	<jstest apiDetailsPath="${api.test.javascript.details}" jsPath="${base.web}/js" export="${export}" />
   </target>
-  
+
+  <path id="my-src-dirs">
+    <pathelement path="${basedir}" />
+    <pathelement path="${build.sqlc}/src" />
+    <pathelement path="${build.sqlc}/srcAD" />
+    <pathelement path="${base.src.test}" />
+    <dirset dir="${base.modules}">
+      <include name="*/*" />
+      <exclude name="*/src-util" />
+      <exclude name="*/src-wad" />
+    </dirset>
+  </path>
+ 
   <target name="compileSqlc" depends="sqlc">
-    <javac  srcdir="${basedir}:${build.sqlc}/src:${build.sqlc}/srcAD:${base.src.test}:${base.modules}" excludes="*/src-wad/**,*/src-util/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" nowarn="${friendlyWarnings}" includeantruntime="false">
+    <javac excludes="*/src-wad/**,*/src-util/**,**/org/openbravo/erpWindows/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" nowarn="${friendlyWarnings}" includeantruntime="false">
+      <src refid="my-src-dirs"/>
+      <classpath refid="project.class.path" />
+    </javac>
+
+    <javac srcdir="${build.sqlc}/srcAD" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" nowarn="${friendlyWarnings}" includeantruntime="false">
       <classpath refid="project.class.path" />
     </javac>