From 4fb358b4ae286de7dd30fd3143aeabc689636876 Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Wed, 8 Nov 2006 10:34:03 +0000
Subject: added ant task "FastScalac" and updated test su...

added ant task "FastScalac" and updated test suite accordingly
---
 test/files/ant/fsc-build.xml    |  31 ++++++++
 test/files/ant/fsc.check        |  13 ++++
 test/files/ant/fsc.scala        |   6 ++
 test/files/ant/imported.xml     | 143 ++++++++++++++++++++++++++++++++++++
 test/files/ant/scalac-build.xml |  31 ++++++++
 test/files/ant/scalac.check     |  13 ++++
 test/files/ant/scalac.scala     |   6 ++
 test/files/ant/test-build.xml   | 158 ----------------------------------------
 test/files/ant/test.check       |  13 ----
 test/files/ant/test.scala       |   6 --
 10 files changed, 243 insertions(+), 177 deletions(-)
 create mode 100644 test/files/ant/fsc-build.xml
 create mode 100644 test/files/ant/fsc.check
 create mode 100644 test/files/ant/fsc.scala
 create mode 100644 test/files/ant/imported.xml
 create mode 100644 test/files/ant/scalac-build.xml
 create mode 100644 test/files/ant/scalac.check
 create mode 100644 test/files/ant/scalac.scala
 delete mode 100644 test/files/ant/test-build.xml
 delete mode 100644 test/files/ant/test.check
 delete mode 100644 test/files/ant/test.scala

(limited to 'test/files/ant')

diff --git a/test/files/ant/fsc-build.xml b/test/files/ant/fsc-build.xml
new file mode 100644
index 0000000000..5941ae8568
--- /dev/null
+++ b/test/files/ant/fsc-build.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: $ -->
+
+<project name="fsc" default="run" basedir=".">
+
+  <import file="${basedir}/imported.xml"/>
+
+<!-- ===========================================================================
+BUILD
+============================================================================ -->
+
+  <target name="build" depends="init">
+    <echo level="verbose" message="build.dir=${build.dir}"/>
+    <mkdir dir="${build.dir}"/>
+    <fsc
+      srcdir="${source.dir}"
+      includes="**/${ant.project.name}*.scala"
+      destdir="${build.dir}"
+      classpathref="build.classpath"
+    />
+    <dirname property="log.dir" file="${build.dir}"/>
+    <echo level="verbose" message="log.dir=${log.dir}"/>
+    <replace
+      file="${log.dir}/${ant.project.name}-ant.log"
+      token="${log.dir}"
+      value="[...]/files/ant"
+    />
+  </target>
+
+</project>
+
diff --git a/test/files/ant/fsc.check b/test/files/ant/fsc.check
new file mode 100644
index 0000000000..d6c4f9078f
--- /dev/null
+++ b/test/files/ant/fsc.check
@@ -0,0 +1,13 @@
+Buildfile: [...]/files/ant/fsc-build.xml
+
+quick.init:
+
+latest.init:
+
+installed.init:
+
+init:
+
+build:
+    [mkdir] Created dir: [...]/files/ant/fsc-ant.obj
+      [fsc] Compiling 1 source file to [...]/files/ant/fsc-ant.obj
diff --git a/test/files/ant/fsc.scala b/test/files/ant/fsc.scala
new file mode 100644
index 0000000000..47131daac6
--- /dev/null
+++ b/test/files/ant/fsc.scala
@@ -0,0 +1,6 @@
+package test
+
+object Main {
+  def main(args: Array[String]): Unit =
+    Console.println(args.toList)
+}
diff --git a/test/files/ant/imported.xml b/test/files/ant/imported.xml
new file mode 100644
index 0000000000..1bb2318a8f
--- /dev/null
+++ b/test/files/ant/imported.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: $ -->
+
+<project name="imported" default="run" basedir=".">
+
+  <!-- Prevents system classpath from being used -->
+  <property name="build.sysclasspath" value="ignore"/>
+
+<!-- ===========================================================================
+PROPERTIES
+============================================================================ -->
+
+  <property name="source.dir" value="${basedir}"/>
+
+  <property file="./build.properties"/>
+
+  <condition property="quick.binary">
+    <equals arg1="${binary}" arg2="quick"/>
+  </condition>
+  <condition property="latest.binary">
+    <equals arg1="${binary}" arg2="latest"/>
+  </condition>
+  <condition property="installed.binary">
+    <equals arg1="${binary}" arg2="installed"/>
+  </condition>
+
+  <fail message="Property 'binary' must be set to either 'quick', 'lastest' or 'installed'.">
+    <condition><not><or>
+      <isset property="quick.binary"/>
+      <isset property="latest.binary"/>
+      <isset property="installed.binary"/>
+    </or></not></condition>
+  </fail>
+  <echo level="verbose" message="binary=${binary}"/>
+
+  <property name="build.dir" value="${java.io.tmpdir}/classes-${user.name}"/>
+  <echo level="verbose" message="build.dir=${build.dir}"/>
+
+<!-- ===========================================================================
+INITIALISATION
+============================================================================ -->
+
+  <target name="quick.init" if="quick.binary">
+    <property name="quick.dir" value="../../../build/quick"/>
+    <available file="${quick.dir}" property="quick.present"/>
+    <fail
+       message="Quick build could not be found."
+       unless="quick.present"
+    />
+    <property name="scala.dir" value="${quick.dir}"/>
+    <property name="scala-library.lib" value="${scala.dir}/lib/library/"/>
+    <property name="scala-compiler.lib" value="${scala.dir}/lib/compiler/"/>
+    <property name="fjbg.lib" value="${scala.dir}/lib/fjbg.jar"/>
+  </target>
+
+  <target name="latest.init" if="latest.binary">
+    <property name="latest.dir" value="../../../dists/latest"/>
+    <available file="${latest.dir}" property="latest.present"/>
+    <fail
+      message="Latest build could not be found."
+      unless="latest.present"
+    />
+    <property name="scala.dir" value="${latest.dir}"/>
+    <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/>
+    <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/>
+    <property name="fjbg.lib" value=""/>
+  </target>
+
+  <target name="installed.init" if="installed.binary">
+    <property name="installed.dir" value="/home/linuxsoft/apps/scala/share/scala"/>
+    <available file="${installed.dir}" property="installed.present"/>
+    <fail
+      message="Installed distribution could not be found."
+      unless="installed.present"
+    />
+    <property name="scala.dir" value="${installed.dir}"/>
+    <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/>
+    <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/>
+    <property name="fjbg.lib" value=""/>
+  </target>
+
+  <target name="init" depends="quick.init, latest.init, installed.init">
+    <echo level="verbose" message="scala.dir=${scala.dir}"/>
+    <fail message="Scala library '${scala-library.lib}' is not available">
+      <condition><not><and>
+        <available classname="scala.Predef"
+                   classpath="${scala-library.lib}"/>
+        <available classname="scala.List"
+                   classpath="${scala-library.lib}"/>
+        <available classname="scala.runtime.ObjectRef"
+                   classpath="${scala-library.lib}"/>
+      </and></not></condition>
+    </fail>
+    <fail message="Scala library '${scala-compiler.lib}' is not available">
+      <condition><not><and>
+        <available classname="scala.tools.ant.Scalac"
+                   classpath="${scala-compiler.lib}"/>
+        <available classname="scala.tools.nsc.Main"
+                   classpath="${scala-compiler.lib}"/>
+        <available classname="scala.tools.util.StringOps"
+                   classpath="${scala-compiler.lib}"/>
+      </and></not></condition>
+    </fail>
+    <path id="scala.classpath">
+      <pathelement location="${scala-library.lib}"/>
+      <pathelement location="${scala-compiler.lib}"/>
+      <pathelement location="${fjbg.lib}"/> <!-- only present for 'quick' -->
+    </path>
+    <taskdef resource="scala/tools/ant/antlib.xml">
+      <classpath>
+        <path refid="scala.classpath"/>
+      </classpath>
+    </taskdef>
+    <path id="build.classpath">
+      <!--<pathelement location="${scala-actors.lib}"/>-->
+      <pathelement location="${scala-library.lib}"/>
+      <pathelement location="${build.dir}"/>
+    </path>
+  </target>
+
+<!-- ===========================================================================
+RUN
+============================================================================ -->
+
+  <target name="run" depends="build, clean"/>
+
+<!-- ===========================================================================
+CLEAN
+============================================================================ -->
+
+  <macrodef name="remove">
+    <attribute name="dir"/>
+    <sequential>
+      <delete dir="@{dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
+    </sequential>
+  </macrodef>
+
+  <target name="clean">
+    <remove dir="${build.dir}"/>
+  </target>
+
+</project>
+
diff --git a/test/files/ant/scalac-build.xml b/test/files/ant/scalac-build.xml
new file mode 100644
index 0000000000..dcbc420800
--- /dev/null
+++ b/test/files/ant/scalac-build.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: $ -->
+
+<project name="scalac" default="run" basedir=".">
+
+  <import file="${basedir}/imported.xml"/>
+
+<!-- ===========================================================================
+BUILD
+============================================================================ -->
+
+  <target name="build" depends="init">
+    <echo level="verbose" message="build.dir=${build.dir}"/>
+    <mkdir dir="${build.dir}"/>
+    <scalac
+      srcdir="${source.dir}"
+      includes="**/${ant.project.name}*.scala"
+      destdir="${build.dir}"
+      classpathref="build.classpath"
+    />
+    <dirname property="log.dir" file="${build.dir}"/>
+    <echo level="verbose" message="log.dir=${log.dir}"/>
+    <replace
+      file="${log.dir}/${ant.project.name}-ant.log"
+      token="${log.dir}"
+      value="[...]/files/ant"
+    />
+  </target>
+
+</project>
+
diff --git a/test/files/ant/scalac.check b/test/files/ant/scalac.check
new file mode 100644
index 0000000000..c7bd156484
--- /dev/null
+++ b/test/files/ant/scalac.check
@@ -0,0 +1,13 @@
+Buildfile: [...]/files/ant/scalac-build.xml
+
+quick.init:
+
+latest.init:
+
+installed.init:
+
+init:
+
+build:
+    [mkdir] Created dir: [...]/files/ant/scalac-ant.obj
+   [scalac] Compiling 1 source file to [...]/files/ant/scalac-ant.obj
diff --git a/test/files/ant/scalac.scala b/test/files/ant/scalac.scala
new file mode 100644
index 0000000000..47131daac6
--- /dev/null
+++ b/test/files/ant/scalac.scala
@@ -0,0 +1,6 @@
+package test
+
+object Main {
+  def main(args: Array[String]): Unit =
+    Console.println(args.toList)
+}
diff --git a/test/files/ant/test-build.xml b/test/files/ant/test-build.xml
deleted file mode 100644
index 7d28eccb47..0000000000
--- a/test/files/ant/test-build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
-
-<project name="test" default="build" basedir=".">
-
-  <!-- Prevents system classpath from being used -->
-  <property name="build.sysclasspath" value="ignore"/>
-
-<!-- ===========================================================================
-PROPERTIES
-============================================================================ -->
-
-  <property name="source.dir" value="${basedir}"/>
-
-  <property file="./build.properties"/>
-
-  <condition property="quick.binary">
-    <equals arg1="${binary}" arg2="quick"/>
-  </condition>
-  <condition property="latest.binary">
-    <equals arg1="${binary}" arg2="latest"/>
-  </condition>
-  <condition property="installed.binary">
-    <equals arg1="${binary}" arg2="installed"/>
-  </condition>
-
-  <fail message="Property 'binary' must be set to either 'quick', 'lastest' or 'installed'.">
-    <condition><not><or>
-      <isset property="quick.binary"/>
-      <isset property="latest.binary"/>
-      <isset property="installed.binary"/>
-    </or></not></condition>
-  </fail>
-  <echo level="verbose" message="binary=${binary}"/>
-
-  <property name="build.dir" value="${java.io.tmpdir}/classes-${user.name}"/>
-  <echo level="verbose" message="build.dir=${build.dir}"/>
-
-<!-- ===========================================================================
-INITIALISATION
-============================================================================ -->
-
-  <target name="quick.init" if="quick.binary">
-    <property name="quick.dir" value="../../../build/quick"/>
-    <available file="${quick.dir}" property="quick.present"/>
-    <fail
-       message="Quick build could not be found."
-       unless="quick.present"
-    />
-    <property name="scala.dir" value="${quick.dir}"/>
-    <property name="scala-library.lib" value="${scala.dir}/lib/library/"/>
-    <property name="scala-compiler.lib" value="${scala.dir}/lib/compiler/"/>
-    <property name="fjbg.lib" value="${scala.dir}/lib/fjbg.jar"/>
-  </target>
-
-  <target name="latest.init" if="latest.binary">
-    <property name="latest.dir" value="../../../dists/latest"/>
-    <available file="${latest.dir}" property="latest.present"/>
-    <fail
-      message="Latest build could not be found."
-      unless="latest.present"
-    />
-    <property name="scala.dir" value="${latest.dir}"/>
-    <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/>
-    <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/>
-    <property name="fjbg.lib" value=""/>
-  </target>
-
-  <target name="installed.init" if="installed.binary">
-    <property name="installed.dir" value="/home/linuxsoft/apps/scala/share/scala"/>
-    <available file="${installed.dir}" property="installed.present"/>
-    <fail
-      message="Installed distribution could not be found."
-      unless="installed.present"
-    />
-    <property name="scala.dir" value="${installed.dir}"/>
-    <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/>
-    <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/>
-    <property name="fjbg.lib" value=""/>
-  </target>
-
-  <target name="init" depends="quick.init, latest.init, installed.init">
-    <echo level="verbose" message="scala.dir=${scala.dir}"/>
-    <fail message="Scala library '${scala-library.lib}' is not available">
-      <condition><not><and>
-        <available classname="scala.Predef"
-                   classpath="${scala-library.lib}"/>
-        <available classname="scala.List"
-                   classpath="${scala-library.lib}"/>
-        <available classname="scala.runtime.ObjectRef"
-                   classpath="${scala-library.lib}"/>
-      </and></not></condition>
-    </fail>
-    <fail message="Scala library '${scala-compiler.lib}' is not available">
-      <condition><not><and>
-        <available classname="scala.tools.ant.Scalac"
-                   classpath="${scala-compiler.lib}"/>
-        <available classname="scala.tools.nsc.Main"
-                   classpath="${scala-compiler.lib}"/>
-        <available classname="scala.tools.util.StringOps"
-                   classpath="${scala-compiler.lib}"/>
-      </and></not></condition>
-    </fail>
-    <path id="scala.classpath">
-      <pathelement location="${scala-library.lib}"/>
-      <pathelement location="${scala-compiler.lib}"/>
-      <pathelement location="${fjbg.lib}"/> <!-- only present for 'quick' -->
-    </path>
-    <taskdef resource="scala/tools/ant/antlib.xml">
-      <classpath>
-        <path refid="scala.classpath"/>
-      </classpath>
-    </taskdef>
-    <path id="build.classpath">
-      <!--<pathelement location="${scala-actors.lib}"/>-->
-      <pathelement location="${scala-library.lib}"/>
-      <pathelement location="${build.dir}"/>
-    </path>
-  </target>
-
-<!-- ===========================================================================
-BUILD
-============================================================================ -->
-
-  <target name="build" depends="init">
-    <echo level="verbose" message="build.dir=${build.dir}"/>
-    <mkdir dir="${build.dir}"/>
-    <scalac
-      srcdir="${source.dir}"
-      includes="**/*.scala"
-      destdir="${build.dir}"
-      classpathref="build.classpath"
-    />
-    <dirname property="log.dir" file="${build.dir}"/>
-    <replace
-      file="${log.dir}/${ant.project.name}-ant.log"
-      token="${log.dir}"
-      value="[...]/files/ant"
-    />
-  </target>
-
-<!-- ===========================================================================
-CLEAN
-============================================================================ -->
-
-  <macrodef name="remove">
-    <attribute name="dir"/>
-    <sequential>
-      <delete dir="@{dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
-    </sequential>
-  </macrodef>
-
-  <target name="clean">
-    <remove dir="${build.dir}"/>
-  </target>
-
-</project>
-
diff --git a/test/files/ant/test.check b/test/files/ant/test.check
deleted file mode 100644
index 6675558506..0000000000
--- a/test/files/ant/test.check
+++ /dev/null
@@ -1,13 +0,0 @@
-Buildfile: [...]/files/ant/test-build.xml
-
-quick.init:
-
-latest.init:
-
-installed.init:
-
-init:
-
-build:
-    [mkdir] Created dir: [...]/files/ant/test-ant.obj
-   [scalac] Compiling 1 source file to [...]/files/ant/test-ant.obj
diff --git a/test/files/ant/test.scala b/test/files/ant/test.scala
deleted file mode 100644
index 47131daac6..0000000000
--- a/test/files/ant/test.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-object Main {
-  def main(args: Array[String]): Unit =
-    Console.println(args.toList)
-}
-- 
cgit v1.2.3