better classpath control for javac compile runs

setting ant's includeantruntime option makes builds more repeatable

4 files changed, 10 insertions, 8 deletions

diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml
index a3de7e92c8fb..6323c14aed2e 100644
--- a/qadevOOo/build.xml
+++ b/qadevOOo/build.xml
@@ -39,7 +39,8 @@
 
   <!-- target for building the runner -->
   <target name="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
+    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java"
+         debug="${debug}" source="${build.source}" includeantruntime="false">
         <classpath>
             <pathelement location="${qadevOOo.class}"/>
             <fileset dir="${qadevOOo.office_jars}">
@@ -55,7 +56,8 @@
 
   <!-- target for building the tests -->
   <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java" debug="${debug}" source="${build.source}">
+    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java"
+        debug="${debug}" source="${build.source}" includeantruntime="false">
         <classpath>
             <pathelement location="${qadevOOo.class}"/>
             <fileset dir="${qadevOOo.office_jars}">
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>
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index f76d6d10534c..d056217ebbb3 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -72,7 +72,7 @@
 
     <target name="compile" depends="init">
         <javac debug="${debug}" debuglevel="lines,vars,source" destdir="${classes}" classpathref="classpath"
-               source="${sourcelevel}" verbose="${verbose}">
+               source="${sourcelevel}" verbose="${verbose}" includeantruntime="false">
             <src path="src"/>
         </javac>
     </target>