diff options
author | michelou <michelou@epfl.ch> | 2006-11-08 10:34:03 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-11-08 10:34:03 +0000 |
commit | 4fb358b4ae286de7dd30fd3143aeabc689636876 (patch) | |
tree | 60db62d7b16c7e17100076566bd4e6c8fef74a63 /test | |
parent | 1e1a2160bcd84fcfe58132a4da1e1f9d16fa939f (diff) | |
download | scala-4fb358b4ae286de7dd30fd3143aeabc689636876.tar.gz scala-4fb358b4ae286de7dd30fd3143aeabc689636876.tar.bz2 scala-4fb358b4ae286de7dd30fd3143aeabc689636876.zip |
added ant task "FastScalac" and updated test su...
added ant task "FastScalac" and updated test suite accordingly
Diffstat (limited to 'test')
-rw-r--r-- | test/files/ant/fsc-build.xml | 31 | ||||
-rw-r--r-- | test/files/ant/fsc.check | 13 | ||||
-rw-r--r-- | test/files/ant/fsc.scala (renamed from test/files/ant/test.scala) | 0 | ||||
-rw-r--r-- | test/files/ant/imported.xml (renamed from test/files/ant/test-build.xml) | 23 | ||||
-rw-r--r-- | test/files/ant/scalac-build.xml | 31 | ||||
-rw-r--r-- | test/files/ant/scalac.check | 13 | ||||
-rw-r--r-- | test/files/ant/scalac.scala | 6 | ||||
-rw-r--r-- | test/files/ant/test.check | 13 |
8 files changed, 98 insertions, 32 deletions
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/test.scala b/test/files/ant/fsc.scala index 47131daac6..47131daac6 100644 --- a/test/files/ant/test.scala +++ b/test/files/ant/fsc.scala diff --git a/test/files/ant/test-build.xml b/test/files/ant/imported.xml index 7d28eccb47..1bb2318a8f 100644 --- a/test/files/ant/test-build.xml +++ b/test/files/ant/imported.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id$ --> +<!-- $Id: $ --> -<project name="test" default="build" basedir="."> +<project name="imported" default="run" basedir="."> <!-- Prevents system classpath from being used --> <property name="build.sysclasspath" value="ignore"/> @@ -119,25 +119,10 @@ INITIALISATION </target> <!-- =========================================================================== -BUILD +RUN ============================================================================ --> - <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> + <target name="run" depends="build, clean"/> <!-- =========================================================================== CLEAN 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.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 |