Reviewers: ,
Description:
http://code.google.com/p/google-web-toolkit/issues/detail?id=5588
This patch simply adds
includeantruntime="false"
to <javac ...> invocations in common.ant.xml,
tools/cldr-import/build.xml,
user/src/com/google/gwt/user/tools/project.ant.xmlsrc, and
plugins/MissingPlugin/build.xml.
Please review this at http://gwt-code-reviews.appspot.com/1105801/show
Affected files:
common.ant.xml
plugins/MissingPlugin/build.xml
tools/cldr-import/build.xml
user/src/com/google/gwt/user/tools/project.ant.xmlsrc
Index: common.ant.xml
===================================================================
--- common.ant.xml (revision 9219)
+++ common.ant.xml (working copy)
@@ -143,7 +143,7 @@
</presetdef>
<presetdef name="gwt.javac">
- <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}"
debuglevel="${javac.debuglevel}" source="${javac.source}"
target="${javac.target}" nowarn="${javac.nowarn}"
encoding="${javac.encoding}" fork="true" memoryMaximumSize="1024m" />
+ <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}"
debuglevel="${javac.debuglevel}" source="${javac.source}"
target="${javac.target}" nowarn="${javac.nowarn}"
encoding="${javac.encoding}" fork="true" memoryMaximumSize="1024m"
includeantruntime="false"/>
</presetdef>
<macrodef name="gwt.jar">
Index: tools/cldr-import/build.xml
===================================================================
--- tools/cldr-import/build.xml (revision 9219)
+++ tools/cldr-import/build.xml (working copy)
@@ -37,7 +37,7 @@
<javac srcdir="src" destdir="${javac.out}"
debug="${javac.debug}" debuglevel="${javac.debuglevel}"
source="${javac.source}" target="${javac.target}"
- nowarn="${javac.nowarn}" encoding="${javac.encoding}">
+ nowarn="${javac.nowarn}" encoding="${javac.encoding}"
includeantruntime="false">
<classpath refid="project.class.path"/>
</javac>
<copy todir="${javac.out}">
@@ -50,7 +50,7 @@
<javac srcdir="test" destdir="${javac.junit.out}"
debug="${javac.debug}" debuglevel="${javac.debuglevel}"
source="${javac.source}" target="${javac.target}"
- nowarn="${javac.nowarn}" encoding="${javac.encoding}">
+ nowarn="${javac.nowarn}" encoding="${javac.encoding}"
includeantruntime="false">
<classpath>
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.user.jar}" />
Index: user/src/com/google/gwt/user/tools/project.ant.xmlsrc
===================================================================
--- user/src/com/google/gwt/user/tools/project.ant.xmlsrc (revision 9219)
+++ user/src/com/google/gwt/user/tools/project.ant.xmlsrc (working copy)
@@ -26,7 +26,7 @@
<javac srcdir="@srcFolder" includes="**" encoding="utf-8"
destdir="@warFolder/WEB-INF/classes"
source="1.5" target="1.5" nowarn="true"
- debug="true" debuglevel="lines,vars,source">
+ debug="true" debuglevel="lines,vars,source"
includeantruntime="false">
<classpath refid="project.class.path"/>
</javac>
<copy todir="@warFolder/WEB-INF/classes">
@@ -71,7 +71,7 @@
<javac srcdir="@testFolder" includes="**" encoding="utf-8"
source="1.5" target="1.5" nowarn="true"
destdir="@warFolder/WEB-INF/classes"
- debug="true" debuglevel="lines,vars,source">
+ debug="true" debuglevel="lines,vars,source"
includeantruntime="false">
<classpath location="@junitJar"/>
<classpath refid="project.class.path"/>
</javac>
Index: plugins/MissingPlugin/build.xml
===================================================================
--- plugins/MissingPlugin/build.xml (revision 9219)
+++ plugins/MissingPlugin/build.xml (working copy)
@@ -32,7 +32,7 @@
<javac srcdir="src" includes="**" encoding="utf-8"
destdir="war/WEB-INF/classes"
source="1.5" target="1.5" nowarn="true"
- debug="true" debuglevel="lines,vars,source">
+ debug="true" debuglevel="lines,vars,source"
includeantruntime="false">
<classpath refid="project.class.path"/>
</javac>
<copy todir="war/WEB-INF/classes">
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
