summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-01-25 12:59:34 +0000
committerHerbert Dürr <hdu@apache.org>2013-01-25 12:59:34 +0000
commit6603c1e8fb14f555efc6d13f0741a2a1eb77d1ff (patch)
treecad748f2241de5aa5804b15e11b46307b12af57a /scripting
parent68e4de9420ea062e0ddda9f290b115491c394799 (diff)
better classpath control for javac compile runs
setting ant's includeantruntime option makes builds more repeatable
Notes
Notes: ignore: obsolete
Diffstat (limited to 'scripting')
-rw-r--r--scripting/examples/java/build.xml6
-rw-r--r--scripting/java/build.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml
index 3a4a69837fd0..b2cfeaccfdc0 100644
--- a/scripting/examples/java/build.xml
+++ b/scripting/examples/java/build.xml
@@ -42,7 +42,7 @@
<mkdir dir="${outdir}/HelloWorld"/>
<javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
- includes="**/*.java" classpathref="idlclasspath"
+ includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
debug="${debug}" optimize="${optimize}" deprecation="on"/>
<copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
@@ -64,7 +64,7 @@
<mkdir dir="${outdir}/Highlight"/>
<javac srcdir="Highlight" destdir="${outdir}/Highlight"
- includes="**/*.java" classpathref="idlclasspath"
+ includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
debug="${debug}" optimize="${optimize}" deprecation="on"/>
<copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
@@ -86,7 +86,7 @@
<mkdir dir="${outdir}/MemoryUsage"/>
<javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
- includes="**/*.java" classpathref="idlclasspath"
+ includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
debug="${debug}" optimize="${optimize}" deprecation="on"/>
<copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
diff --git a/scripting/java/build.xml b/scripting/java/build.xml
index 05f7e77866e3..8b4ce13a1a12 100644
--- a/scripting/java/build.xml
+++ b/scripting/java/build.xml
@@ -102,7 +102,7 @@
<!-- ======================== Compile Classes ========================== -->
<target name="compile" depends="prepare, eval_environment">
<javac srcdir="com" destdir="${jardir}"
- includes="**/*.java" classpathref="idlclasspath"
+ includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
debug="${debug}" optimize="${optimize}" deprecation="off">
<exclude name="**/provider/javascript/*.java" unless="with_rhino" />
<exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
@@ -110,7 +110,7 @@
</javac>
<javac srcdir="Framework/" destdir="${jardir}"
includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
- optimize="${optimize}" deprecation="off">
+ optimize="${optimize}" deprecation="off" includeantruntime="false">
<compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
</target>