From 2ff464685fd13cf0489b0cdece98beaba283b675 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Fri, 9 Apr 2010 12:05:11 +0000
Subject: minor cleanup in build script. no review

---
 build.xml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index e3f41a098d..21bade72a1 100644
--- a/build.xml
+++ b/build.xml
@@ -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
 ============================================================================ -->
-- 
cgit v1.2.3