diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-04-09 12:05:11 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-04-09 12:05:11 +0000 |
| commit | 2ff464685fd13cf0489b0cdece98beaba283b675 (patch) | |
| tree | a11ef27814243f655e27aba31c0f53273fa801a8 /build.xml | |
| parent | 3cc8af6179ac7b1778c19d96bfacd01120407d26 (diff) | |
| download | scala-2ff464685fd13cf0489b0cdece98beaba283b675.tar.gz scala-2ff464685fd13cf0489b0cdece98beaba283b675.tar.bz2 scala-2ff464685fd13cf0489b0cdece98beaba283b675.zip | |
minor cleanup in build script. no review
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 28 |
1 files changed, 17 insertions, 11 deletions
@@ -204,7 +204,9 @@ INITIALISATION <property name="scalac.args.quickonly" value=""/> <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> - <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> + <echo message="Using scalac.args.all: ${scalac.args.all}"/> + <echo message="Using javac.args: ${javac.args}"/> + <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> <!-- This is the start time for the distribution --> @@ -1115,7 +1117,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/continuations-plugin" compilerpathref="pack.classpath" - params="${scalac.args.quick}" + params="${scalac.args.all}" srcdir="${src.dir}/continuations/plugin" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1136,7 +1138,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/plugins -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.all} -Xpluginsdir ${build-quick.dir}/plugins -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1504,14 +1506,6 @@ BOOTRAPING TEST AND TEST SUITE </same> </target> - <target name="test.suite.clean.checkinit"> - <antcall target="all.clean" /> - <antcall target="test.suite" inheritAll="false"> - <param name="scalac.args.optimise" value="-Xcheckinit" /> - <param name="partest.scalacopts" value="-Xcheckinit" /> - </antcall> - </target> - <target name="test.suite" depends="pack.done"> <partest classpathref="pack.classpath"> <env key="PATH" path="${build-pack.dir}/bin:${env.PATH}" /> @@ -1738,6 +1732,18 @@ FORWARDED TARGETS FOR NIGHTLY BUILDS <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/> </target> + <target name="nightly.checkinit"> + <antcall target="nightly-nopt"> + <param name="scalac.args.optimise" value="-Xcheckinit"/> + </antcall> + </target> + + <target name="nightly.checkall"> + <antcall target="nightly-nopt"> + <param name="partest.scalacopts" value="-Ycheck:all"/> + </antcall> + </target> + <!-- =========================================================================== POSITIONS ============================================================================ --> |