Related to issue 20416. Reverted incorrect change
authorAntonio Moreno <antonio.moreno@openbravo.com>
Fri, 04 May 2012 15:01:07 +0200
changeset 16451 287d83bfc399
parent 16450 4b98b179a89f
child 16452 af3db78b6e77
Related to issue 20416. Reverted incorrect change
src-wad/build.xml
src/build.xml
--- a/src-wad/build.xml	Fri May 04 15:01:19 2012 +0200
+++ b/src-wad/build.xml	Fri May 04 15:01:07 2012 +0200
@@ -81,19 +81,10 @@
     </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 destdir="${build.wad}" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" fork="true" includeantruntime="false">
-      <src refid="my-src-wad-dirs" />
+    <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">
       <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	Fri May 04 15:01:19 2012 +0200
+++ b/src/build.xml	Fri May 04 15:01:07 2012 +0200
@@ -327,21 +327,8 @@
 	<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 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"/>
+    <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">
       <classpath refid="project.class.path" />
     </javac>