Attached Files | ant18.patch [^] (16,810 bytes) 2010-10-04 12:07 [Show Content] [Hide Content]diff --git a/src-core/build.xml b/src-core/build.xml
--- a/src-core/build.xml
+++ b/src-core/build.xml
@@ -44,7 +44,7 @@
</target>
<target name="compile" depends="init">
- <javac srcdir="${build.core.src}" destdir="${build.core}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.core.src}" destdir="${build.core}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="core.class.path"/>
</javac>
</target>
diff --git a/src-db/build.xml b/src-db/build.xml
--- a/src-db/build.xml
+++ b/src-db/build.xml
@@ -39,7 +39,7 @@
</target>
<target name="compile" depends="init">
- <javac srcdir="${build.db.src}" destdir="${build.db.classes}" deprecation="on" encoding="UTF-8" fork="true" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.db.src}" destdir="${build.db.classes}" deprecation="on" encoding="UTF-8" fork="true" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="db.class.path" />
</javac>
<copy todir="${build.db.classes}">
diff --git a/src-trl/build.xml b/src-trl/build.xml
--- a/src-trl/build.xml
+++ b/src-trl/build.xml
@@ -66,13 +66,13 @@
</target>
<target name="compileSqlc" depends="sqlc">
- <javac srcdir="${build.trl.sqlc}/src" destdir="${build.trl}" encoding="UTF-8" fork="true" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.trl.sqlc}/src" destdir="${build.trl}" encoding="UTF-8" fork="true" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="trl.class.path"/>
</javac>
</target>
<target name="compile" depends="compileSqlc">
- <javac srcdir="${build.trl.src}" destdir="${build.trl}" deprecation="on" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.trl.src}" destdir="${build.trl}" deprecation="on" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="trl.class.path"/>
</javac>
</target>
diff --git a/src-util/buildvalidation/build.xml b/src-util/buildvalidation/build.xml
--- a/src-util/buildvalidation/build.xml
+++ b/src-util/buildvalidation/build.xml
@@ -66,7 +66,7 @@
<propertyref name="java.security.egd" />
</syspropertyset>
</java>
- <javac srcdir="${build.validation.sqlc}/src" includes="**/*.java" destdir="${build.validation}" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.validation.sqlc}/src" includes="**/*.java" destdir="${build.validation}" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="buildvalidation.class.path" />
</javac>
</target>
@@ -79,19 +79,19 @@
<propertyref name="java.security.egd" />
</syspropertyset>
</java>
- <javac srcdir="${base.modules}/${module}/src-util/buildvalidation/src" includes="**/*.java" destdir="${base.modules}/${module}/build/classes" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${base.modules}/${module}/src-util/buildvalidation/src" includes="**/*.java" destdir="${base.modules}/${module}/build/classes" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="buildvalidation.class.path" />
</javac>
</target>
<target name="javacCore" if="checkCore">
- <javac srcdir="${main.dir}" includes="src-util/buildvalidation/src/**/*.java" destdir="${build.validation}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${main.dir}" includes="src-util/buildvalidation/src/**/*.java" destdir="${build.validation}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="buildvalidation.class.path" />
</javac>
</target>
<target name="javacModule" unless="checkCore">
- <javac srcdir="${main.dir}" includes="modules/${module}/src-util/buildvalidation/**/*.java" fork="true" destdir="${base.modules}/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${main.dir}" includes="modules/${module}/src-util/buildvalidation/**/*.java" fork="true" destdir="${base.modules}/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="buildvalidation.class.path" />
</javac>
</target>
diff --git a/src-util/diagnostic/build.xml b/src-util/diagnostic/build.xml
--- a/src-util/diagnostic/build.xml
+++ b/src-util/diagnostic/build.xml
@@ -222,6 +222,6 @@
<target name="test2" description="simple compilation task">
<delete file="build/classes/Test.class" failonerror="false" />
- <javac srcdir="src" destdir="build/classes" includes="**/Test*" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" deprecation="on" />
+ <javac srcdir="src" destdir="build/classes" includes="**/Test*" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false" />
</target>
</project>
diff --git a/src-util/modulescript/build.xml b/src-util/modulescript/build.xml
--- a/src-util/modulescript/build.xml
+++ b/src-util/modulescript/build.xml
@@ -66,7 +66,7 @@
<propertyref name="java.security.egd" />
</syspropertyset>
</java>
- <javac srcdir="${build.module.sqlc}/src" includes="**/*.java" destdir="${build.module}" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${build.module.sqlc}/src" includes="**/*.java" destdir="${build.module}" fork="true" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="modulescript.class.path" />
</javac>
</target>
@@ -79,19 +79,19 @@
<propertyref name="java.security.egd" />
</syspropertyset>
</java>
- <javac srcdir="${base.modules}/${module}/src-util/modulescript/src" includes="**/*.java" fork="true" destdir="${base.modules}/${module}/build/classes" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${base.modules}/${module}/src-util/modulescript/src" includes="**/*.java" fork="true" destdir="${base.modules}/${module}/build/classes" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="modulescript.class.path" />
</javac>
</target>
<target name="javacCore" if="checkCore">
- <javac srcdir="${main.dir}" includes="src-util/modulescript/src/**/*.java" destdir="${build.module}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${main.dir}" includes="src-util/modulescript/src/**/*.java" destdir="${build.module}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="modulescript.class.path" />
</javac>
</target>
<target name="javacModule" unless="checkCore">
- <javac srcdir="${main.dir}" includes="modules/${module}/src-util/modulescript/**/*.java" fork="true" destdir="${main.dir}/modules/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${main.dir}" includes="modules/${module}/src-util/modulescript/**/*.java" fork="true" destdir="${main.dir}/modules/${module}/build/classes" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="modulescript.class.path" />
</javac>
</target>
diff --git a/src-wad/build.xml b/src-wad/build.xml
--- a/src-wad/build.xml
+++ b/src-wad/build.xml
@@ -76,13 +76,13 @@
</target>
<target name="compileSqlc" depends="sqlc">
- <javac srcdir="${build.wad.sqlc}/src" includes="**/*.java" destdir="${build.wad}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" fork="true" >
+ <javac srcdir="${build.wad.sqlc}/src" includes="**/*.java" destdir="${build.wad}" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" fork="true" includeantruntime="false" >
<classpath refid="wad.class.path" />
</javac>
</target>
<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" >
+ <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">
diff --git a/src/build.xml b/src/build.xml
--- a/src/build.xml
+++ b/src/build.xml
@@ -174,7 +174,7 @@
<propertyref name="java.security.egd" />
</syspropertyset>
</java>
- <javac includes="org/openbravo/erpCommon/modules/ApplyModuleTask.java" destdir="${build.apply.module}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" verbose="false" nowarn="${friendlyWarnings}">
+ <javac includes="org/openbravo/erpCommon/modules/ApplyModuleTask.java" destdir="${build.apply.module}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" verbose="false" nowarn="${friendlyWarnings}" includeantruntime="false">
<src path="${base.src}"/>
<src path="../build/javasqlc/src"/>
<src path="../src-gen"/>
@@ -259,10 +259,10 @@
<classpath refid="project.class.path" />
</javac>
-->
- <javac srcdir="${base.src}:${base.src.gen}" includes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${base.src}:${base.src.gen}" includes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
- <javac srcdir="${base.src.gen}" excludes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${base.src.gen}" excludes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
</target>
@@ -298,10 +298,10 @@
<classpath refid="project.class.path" />
</javac>
-->
- <javac srcdir="${base.src}:${base.src.gen}" includes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${base.src}:${base.src.gen}" includes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
- <javac srcdir="${base.src.gen}" excludes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${base.src.gen}" excludes="org/openbravo/model/**,org/openbravo/base/structure/**,org/openbravo/dal/**,org/openbravo/service/dataset/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
</target>
@@ -367,11 +367,11 @@
</target>
<target name="compileSqlc" depends="sqlc">
- <javac srcdir="${basedir}:${build.sqlc}/src:${build.sqlc}/srcAD:${base.src.test}:${base.modules}" excludes="${base.modules}/*/src-wad/**,${base.modules}/*/src-util/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" nowarn="${friendlyWarnings}">
+ <javac srcdir="${basedir}:${build.sqlc}/src:${build.sqlc}/srcAD:${base.src.test}:${base.modules}" excludes="${base.modules}/*/src-wad/**,${base.modules}/*/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>
- <javac srcdir="${build.AD}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" nowarn="${friendlyWarnings}">
+ <javac srcdir="${build.AD}" 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>
<antcall target="calculate.version"/>
@@ -411,7 +411,7 @@
</target>
<target name="compile.src.gen" depends="init">
- <javac srcdir="${basedir}" includes="org/openbravo/base/exception/**,org/openbravo/base/gen/**,org/openbravo/base/expression/**,org/openbravo/base/provider/**,org/openbravo/base/model/**,org/openbravo/base/session/**,org/openbravo/base/validation/**,org/openbravo/base/util/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${basedir}" includes="org/openbravo/base/exception/**,org/openbravo/base/gen/**,org/openbravo/base/expression/**,org/openbravo/base/provider/**,org/openbravo/base/model/**,org/openbravo/base/session/**,org/openbravo/base/validation/**,org/openbravo/base/util/**" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
<copy todir="${build}">
@@ -422,7 +422,7 @@
</copy>
<!-- also compile the domaintypes in modules -->
- <javac srcdir="${basedir}/../" includes="modules/*/src/**/model/domaintype/**/*.java" destdir="${build}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <javac srcdir="${basedir}/../" includes="modules/*/src/**/model/domaintype/**/*.java" destdir="${build}" fork="true" deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
<classpath refid="project.class.path" />
</javac>
@@ -539,7 +539,7 @@
</target>
<target name="compileSqlcmod" depends="sqlcmod">
- <javac srcdir="${build.sqlc}/src:${base.modules}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on">
+ <javac srcdir="${build.sqlc}/src:${base.modules}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="true" debuglevel="lines,vars,source" deprecation="on" includeantruntime="false">
<classpath refid="project.class.path" />
<syspropertyset>
<propertyref name="java.security.egd" />
|