Kaydet (Commit) 6603c1e8 authored tarafından Herbert Dürr's avatar Herbert Dürr

better classpath control for javac compile runs

setting ant's includeantruntime option makes builds more repeatable
üst 68e4de94
......@@ -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}">
......
......@@ -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"/>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment