- use Ant now !

17 files changed, 0 insertions, 664 deletions

diff --git a/README.ant-nsc b/README.ant-nsc
deleted file mode 100644
index d9eb15edce..0000000000
--- a/README.ant-nsc
+++ /dev/null
@@ -1,22 +0,0 @@
-Create a build.properties file (e.g. copy from the build.properties.SAMPLE). This file will be cvs-ignored, you'll keep your settings.
-
-Note that you can create a directory developer/${user.name} in which you can add
-* custom.properties      (property file for ant, e.g. to set nscArgs)
-* build-nsc-excludes.xml (list of <exclude ...> elements, to be used for &userExclude; in build-nsc.xml)
-* test-nsc-excludes.xml  (list of <exclude ...> elements, to be used for &userExclude; in test-nsc.xml)
-
-Have a look at developer/emir/... for examples.
-
-Building nsc:
-
-  sh ant-build-sh [target]
-
-calls ant on file build-nsc.xml (after setting classpath).
-
-Testing nsc:
-
-  sh ant-test-sh [target]
-
-calls ant on file test-nsc.xml (after setting classpath)
-
-The scripts check that some mandatory files are present, and do some replacement on ...-nsc.xml to handle userExcludes.
diff --git a/ant-build-nsc.bat b/ant-build-nsc.bat
deleted file mode 100644
index 863ac308bb..0000000000
--- a/ant-build-nsc.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off 
-rem ####################################################-*-Batch-script-*-####
-rem # Build nsc
-rem ##########################################################################
-rem # $Id$
-
-if "%OS%"=="Windows_NT" @setlocal
-
-set _ANTCMD_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set _ANTCMD_ARGS=%_ANTCMD_ARGS% %1
-shift
-goto setupArgs
-
-:doneStart
-call ant-common.bat build-nsc
-
-rem ##########################################################################
-rem # ant build
-
-set CLASSPATH=%nsc_fjbg_jar%;%nsc_scala_jar%;%nsc_tools_jar%;%nsc_jaco_jar%;%nsc_ant_jar%
-%_ANTCMD% -Dplatform=win -f %ANT_BUILDFILE% %_ANTCMD_ARGS%
-
-%RM% %ANT_BUILDFILE%
-
-rem ##########################################################################
-
-if "%OS%"=="Windows_NT" @endlocal
diff --git a/ant-build-nsc.sh b/ant-build-nsc.sh
deleted file mode 100755
index 43550f7832..0000000000
--- a/ant-build-nsc.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-########################################################-*-Shell-script-*-####
-# Build nsc
-##############################################################################
-# $Id$
-
-. ant-common.sh build-nsc
-
-##############################################################################
-# ant build
-
-CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_jar:$nsc_ant_jar
-PLATFORM=unix
-
-# For Cygwin, switch paths to appropriate format before running ant
-if $cygwin; then
-    if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-        format=mixed
-    else
-        format=windows
-    fi
-    CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
-    PLATFORM=win
-fi
-
-# for debugging your classpath
-#echo CLASSPATH=$CLASSPATH
-
-CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=$PLATFORM -f "$ANT_BUILDFILE" $*
-$RM "$ANT_BUILDFILE"
-
-##############################################################################
diff --git a/ant-common.bat b/ant-common.bat
deleted file mode 100644
index 565f09ffb6..0000000000
--- a/ant-common.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-@echo off
-rem ####################################################-*-Batch-script-*-####
-rem # Common settings
-rem ##########################################################################
-rem # $Id$
-
-rem ##########################################################################
-rem # Apache Ant
-
-set _ANTCMD=ant
-set ANT_OPTS=-Xmx256M
-rem set ANT_ARGS=-verbose
-
-rem ##########################################################################
-rem # Shell commands
-
-set CP=copy /y
-set ECHO=echo
-set RM=del /s /q
-
-rem ##########################################################################
-rem # environment setup
-
-echo Setting up the build environment..
-echo.
-call %_ANTCMD% -Dplatform=win -q -f setenv-nsc.xml >NUL
-call env.bat
-
-rem ##########################################################################
-
-set ANT_CONFIG_BUILDFILE=%1.xml
-set ANT_BUILDFILE=concrete-%ANT_CONFIG_BUILDFILE%
-set ANT_EXCLUDEFILE=developer/%USERNAME%/%1-excludes.xml
-
-if exist "%ANT_EXCLUDEFILE%" goto exclude
-%CP% %ANT_CONFIG_BUILDFILE% %ANT_BUILDFILE%
-goto next
-:exclude
-echo %ANT_EXCLUDEFILE% file not yet supported
-%CP% %ANT_CONFIG_BUILDFILE% %ANT_BUILDFILE%
-:next
-
-rem ##########################################################################
diff --git a/ant-common.sh b/ant-common.sh
deleted file mode 100755
index d486072dce..0000000000
--- a/ant-common.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-########################################################-*-Shell-script-*-####
-# Common settings
-##############################################################################
-# $Id$
-
-cygwin=false;
-darwin=false;
-case "`uname`" in
-    CYGWIN*) cygwin=true ;;
-    Darwin*) darwin=true ;;
-esac
-
-##############################################################################
-# Apache Ant
-
-ANT_CMD=ant
-export ANT_OPTS='-Xmx256M'
-
-##############################################################################
-# Shell commands
-
-CP=cp
-ECHO=echo
-RM='rm -f'
-SED=sed
-
-##############################################################################
-# set user environment
-
-$ANT_CMD -Dplatform=unix -q -f setenv-nsc.xml
-. env.sh
-
-ANT_CONFIG_BUILDFILE=$1.xml
-ANT_BUILDFILE=concrete-$ANT_CONFIG_BUILDFILE
-ANT_EXCLUDEFILE=developer/${USER}/$1-excludes.xml
-
-if [ -f "$ANT_EXCLUDEFILE" ]; then
-  $SED -e "s#userExcludes\ \"\"#userExcludes\ SYSTEM\ \"$ANT_EXCLUDEFILE\"#" \
-    < $ANT_CONFIG_BUILDFILE > $ANT_BUILDFILE;
- else
-  $CP $ANT_CONFIG_BUILDFILE $ANT_BUILDFILE;
-fi
-
-##############################################################################
diff --git a/ant-test-nsc.bat b/ant-test-nsc.bat
deleted file mode 100644
index d232ff5f06..0000000000
--- a/ant-test-nsc.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem #####################################################-*-Bash-script-*-####
-rem # Test nsc
-rem ##########################################################################
-rem # $Id$
-
-if "%OS%"=="Windows_NT" @setlocal
-
-set _ANTCMD_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set _ANTCMD_ARGS=%_ANTCMD_ARGS% %1
-shift
-goto setupArgs
-
-:doneStart
-call ant-common.bat test-nsc
-
-rem ##########################################################################
-rem # ant build
-
-set CLASSPATH=%nsc_fjbg_jar%;%nsc_scala_jar%;%nsc_tools_jar%;%nsc_nsc_jar%;%nsc_nsc4ant_jar%
-%_ANTCMD% -Dplatform=win -f %ANT_BUILDFILE% %_ANTCMD_ARGS%
-
-%RM% %ANT_BUILDFILE%
-
-##############################################################################
-
-if "%OS%"=="Windows_NT" @endlocal
diff --git a/ant-test-nsc.sh b/ant-test-nsc.sh
deleted file mode 100755
index 3b131d3da1..0000000000
--- a/ant-test-nsc.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-########################################################-*-Shell-script-*-####
-# Test nsc
-##############################################################################
-# $Id$
-
-. ant-common.sh test-nsc
-
-##############################################################################
-# ant build
-
-CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_nsc_jar:$nsc_nsc4ant_jar
-PLATFORM=unix
-
-# For Cygwin, switch paths to appropriate format before running ant
-if $cygwin; then
-    if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-        format=mixed
-    else
-        format=windows
-    fi
-    CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
-    PLATFORM=win
-fi
-
-# for debugging your classpath
-#echo CLASSPATH=$CLASSPATH
-
-CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=$PLATFORM -f "$ANT_BUILDFILE" $*
-$RM "$ANT_BUILDFILE"
-
-##############################################################################
diff --git a/bin/build-nsc b/bin/build-nsc
deleted file mode 100755
index 6855e25af4..0000000000
--- a/bin/build-nsc
+++ /dev/null
@@ -1,2 +0,0 @@
-scalac -d /tmp/classes tools/nsc/*.scala tools/nsc/ast/*.scala tools/nsc/ast/parser/*.scala tools/nsc/symtab/*.scala tools/nsc/symtab/classfile/*.scala tools/nsc/util/*.scala tools/nsc/typechecker/*.scala tools/nsc/transform/*.scala tools/nsc/matching/*.scala $*
-
diff --git a/bin/test-nsc b/bin/test-nsc
deleted file mode 100755
index 94b0cc46a9..0000000000
--- a/bin/test-nsc
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/tcsh
-alias scala      java -Xms16m -ea -classpath /home/linuxsoft/apps/java-1.4.2_08/jre/lib/rt.jar:$HOME/scala/objects/main/lib/scala:$HOME/scala/objects/main/lib/tools:/tmp/classes
-alias scala-debug scala -Djava.compiler=NONE
-alias nsc        "scala scala.tools.nsc.Main -classpath "/tmp/newclasses:$HOME/scala/sources:$HOME/scala/newsources" -d /tmp/newclasses"
-nsc -verbose -prompt -nopredefs Predef.scala runtime/ScalaRunTime.scala -check:term $*
-nsc -verbose -prompt *.scala -check:term $*
-nsc -verbose -prompt collection/*.scala -check:term $*
-nsc -verbose -prompt collection/mutable/*.scala -check:term $*
-nsc -verbose -prompt collection/immutable/*.scala -check:term $*
-nsc -verbose -prompt concurrent/*.scala -check:term $*
-nsc -verbose -prompt io/*.scala -check:term $*
-nsc -verbose -prompt mobile/*.scala -check:term $*
-nsc -verbose -prompt runtime/*.scala runtime/*/*.scala -check:term $*
-nsc -verbose -prompt text/*.scala -check:term $*
-nsc -verbose -prompt testing/*.scala -check:term $*
-nsc -verbose -prompt util/*/*.scala -check:term $*
-nsc -verbose -prompt xml*.scala xml/*/*.scala -check:term $*
-rm -r /tmp/newclasses/scala/tools/nsc
-nsc -verbose -prompt tools/nsc/*.scala tools/nsc/matching/*.scala -check:term $*
-
diff --git a/build-nsc.properties.SAMPLE b/build-nsc.properties.SAMPLE
deleted file mode 100644
index f79245aa77..0000000000
--- a/build-nsc.properties.SAMPLE
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-# 
-# this file serves two purposes 
-#
-# 1. properties file for ant
-# 2. environment variables for shell-scripts (e.g. ant-build-nsc.sh)
-#
-# don't use characters like '.' in variable names, and
-# don't run commands here
-#
-##############################################################################
-# directories
-#
-apps_dir    = /home/linuxsoft/apps
-main_dir    = /home/michelou/projects/scala/objects/main/lib
-jars_dir    = /home/michelou/projects/scala/objects/nsc/lib
-tmp_dir	    = /tmp
-#
-##############################################################################
-# jar archives
-#
-scala_jar   = ${main_dir}/scala.jar
-tools_jar   = ${main_dir}/tools.jar
-#
-nsc_jar     = ${jars_dir}/nsc.jar
-nsrt_jar    = ${jars_dir}/nsrt.jar
-nsc4ant_jar = ${jars_dir}/nsc4ant.jar
-#
-ant_jar     = ${apps_dir}/ant/lib/ant.jar
-fjbg_jar    = ${apps_dir}/fjbg/jars/fjbg.jar
-jaco_jar    = ${apps_dir}/jaco/lib/jaco.jar
-#
-##############################################################################
-# build directories
-#
-nsc_dir                = ${tmp_dir}/classes_nsc
-nsc4ant_dir            = ${tmp_dir}/classes_nsc4ant
-nsc_output_dir         = ${tmp_dir}/classes_new
-tools_util_runtime_dir = ${tmp_dir}/classes_runtime
-#
-##############################################################################
diff --git a/build-nsc.properties.unix.SAMPLE b/build-nsc.properties.unix.SAMPLE
deleted file mode 100644
index 307361a05a..0000000000
--- a/build-nsc.properties.unix.SAMPLE
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-# 
-# this file serves two purposes 
-#
-# 1. properties file for ant
-# 2. environment variables for shell-scripts (e.g. ant-build-nsc.sh)
-#
-# don't use characters like '.' in variable names, and
-# don't run commands here
-#
-##############################################################################
-# directories
-#
-apps_dir    = /home/linuxsoft/apps
-main_dir    = /home/michelou/projects/scala/objects/main/lib
-jars_dir    = /home/michelou/projects/scala/objects/nsc/lib
-tmp_dir	    = /tmp
-#
-##############################################################################
-# jar archives
-#
-scala_jar   = ${main_dir}/scala.jar
-tools_jar   = ${main_dir}/tools.jar
-#
-nsc_jar     = ${jars_dir}/nsc.jar
-nsrt_jar    = ${jars_dir}/nsrt.jar
-nsc4ant_jar = ${jars_dir}/nsc4ant.jar
-#
-ant_jar     = ${apps_dir}/ant/lib/ant.jar
-fjbg_jar    = ${apps_dir}/fjbg/jars/fjbg.jar
-jaco_jar    = ${apps_dir}/jaco/lib/jaco.jar
-#
-##############################################################################
-# build directories
-#
-nsc_dir                = ${tmp_dir}/classes_nsc_${user.name}
-nsc4ant_dir            = ${tmp_dir}/classes_nsc4ant_${user.name}
-nsc_output_dir         = ${tmp_dir}/classes_new_${user.name}
-tools_util_runtime_dir = ${tmp_dir}/classes_nsrt_${user.name}
-#
-##############################################################################
diff --git a/build-nsc.properties.win.SAMPLE b/build-nsc.properties.win.SAMPLE
deleted file mode 100644
index 2796450efd..0000000000
--- a/build-nsc.properties.win.SAMPLE
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-# 
-# this file serves two purposes 
-#
-# 1. properties file for ant
-# 2. environment variables for shell-scripts (e.g. ant-build-sh)
-#
-# don't use characters like '.' in variable names, and
-# don't run commands here
-#
-##############################################################################
-# directories
-#
-apps_dir    = c:\\localhome\\linuxsoft\\apps
-main_dir    = c:\\localhome\\michelou\\projects\\scala\\objects\\main\\lib
-jars_dir    = c:\\localhome\\michelou\\projects\\scala\\objects\\nsc\\lib
-tmp_dir	    = c:\\tmp
-#
-##############################################################################
-# jar archives
-#
-scala_jar   = ${main_dir}\\scala.jar
-tools_jar   = ${main_dir}\\tools.jar
-#
-nsc_jar     = ${jars_dir}\\nsc.jar
-nsrt_jar    = ${jars_dir}\\nsrt.jar
-nsc4ant_jar = ${jars_dir}\\nsc4ant.jar
-#
-ant_jar     = ${apps_dir}\\apache-ant-1.6.5\\lib\\ant.jar
-fjbg_jar    = ${apps_dir}\\fjbg\\jars\\fjbg.jar
-jaco_jar    = ${apps_dir}\\jaco-20050730\\lib\\jaco.jar
-#
-##############################################################################
-# build directories
-#
-nsc_dir	               = ${tmp_dir}\\classes_nsc_${user.name}
-nsc4ant_dir            = ${tmp_dir}\\classes_nsc4ant_${user.name}
-nsc_output_dir         = ${tmp_dir}\\classes_new_${user.name}
-tools_util_runtime_dir = ${tmp_dir}\\classes_nsrt_${user.name}
-#
-##############################################################################
diff --git a/build-nsc.xml b/build-nsc.xml
deleted file mode 100644
index 95b5a9d630..0000000000
--- a/build-nsc.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE project [
-  <!ENTITY userExcludes "">
-]>
-<project name="scala.nsc" default="build.nsc">
-
-  <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-                                    nsc 
-
-                               new scala compiler
-
-       %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-       %%%
-       %%%  Preliminaries
-       %%%
-
-	   1) working scala compiler ($fjbg.jar, $scala.jar and $tools.jar)
-
-	   if you want to use the latest CVS one, type 
-
-       make jar target=LIBRARY
-       make jar target=TOOLS
-
-	   and set the variables to the places in your projectoutputdir
-
-	   2) working pizza compiler ($jaco.jar)
-
-   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
-
-  <!-- %%% properties and taskdefs %%%-->
-
-  <property file="build-nsc.properties.${platform}" prefix="nsc." />
-
-  <target name="check.env">
-    <fail>
-      <condition><not><available file="${nsc.fjbg_jar}" /></not></condition>
-      Missing library file ${nsc.fjbg_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.scala_jar}" /></not></condition>
-      Missing library file ${nsc.scala_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.tools_jar}" /></not></condition>
-      Missing library file ${nsc.tools_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.jaco_jar}" /></not></condition>
-      Missing library file ${nsc.jaco_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.ant_jar}" /></not></condition>
-      Missing library file ${nsc.ant_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-  </target>
-
-  <target name="init" depends="check.env">
-    <mkdir dir="${nsc.tools_util_runtime_dir}" />
-    <mkdir dir="${nsc.jars_dir}" />
-    <mkdir dir="${nsc.nsc_dir}" />
-    <mkdir dir="${nsc.nsc4ant_dir}" />    
-  </target>
-
-  
-  <!-- taskdef for nsc comes later, because has to be compiled before -->
-
-  <target name="build.nsc" depends="init">
-    <taskdef name="scalac" classname="scala.tools.scala4ant.ScalacTask$class"/>
-    <taskdef name="pico"   classname="jaco.pizza.AntTask"/>
-
-    <pico srcdir="sources" destdir="${nsc.tools_util_runtime_dir}" source="1.4" scalaHack="true">
-      <include name="scala/*.java"/>
-      <include name="scala/runtime/*.java"/>
-      <include name="scala/runtime/**/*.java"/>
-      <include name="scala/tools/util/*.java"/>
-
-      <exclude name="scala/ScalaObject.java"/>
-      <exclude name="scala/Array.java"/>
-    </pico> 
-
-    <!-- we do *not* want the ScalaObject.class file,
-         because in nsc's eyes ScalaObject is a scala file. -->
-
-    <delete file="${nsc.tools_util_runtime_dir}/scala/ScalaObject.class"/>
-    <delete file="${nsc.tools_util_runtime_dir}/scala/Array.class"/>
-
-    <jar destfile="${nsc.nsrt_jar}" basedir="${nsc.tools_util_runtime_dir}"/>
-
-    <scalac srcdir="sources" destdir="${nsc.nsc_dir}" debug="on"
-            classpath="${nsc.tools_util_runtime_dir}:${nsc.fjbg_jar}:${nsc.ant_jar}"
-            sourcePath="sources" force="true">
-      <!-- force = "true" always recompiles all source files, because 
-           scalac does not always go find the latest source file (*3) -->
-
-      <include name="scala/tools/nsc/**/*.scala"/>
-
-    </scalac>
-
-    <jar destfile="${nsc.nsc_jar}" basedir="${nsc.nsc_dir}"/>
-
-  </target>
-
-  <target name="clean">
-    <delete dir="${nsc.tools_util_runtime_dir}" />
-    <delete dir="${nsc.jars_dir}" />
-    <delete dir="${nsc.nsc_dir}" />
-    <delete dir="${nsc.nsc4ant_dir}" />
-  </target>
-
-
-  <!-- builds NscTask for use in this ant file -->
-
-  <target name="build.nsc4ant" depends="init">
-    <taskdef name="scalac" classname="scala.tools.scala4ant.ScalacTask$class"/>
-
-    <scalac srcdir="sources" destdir="${nsc.nsc4ant_dir}/" sourcePath="sources"
-            classpath="${nsc.ant_jar}:${nsc.nsc_dir}:${nsc.tools_util_runtime_dir}:${nsc.scala_jar}" >
-      <include name="scala/tools/scala4ant/NscAdaptor.scala"/>
-      <include name="scala/tools/scala4ant/NscTask.scala"/>
-    </scalac>
-
-    <jar destfile="${nsc.nsc4ant_jar}" basedir="${nsc.nsc4ant_dir}"/>
-  </target>
-
-  <!--
-    (*3) for Java, and pico, files are only recompiled if the source file is
-    newer than the class file. This would work for scala, but mixin
-    composition sometimes needs additional source files. These can
-    be unavailable for some reason.
-  -->
-</project>
diff --git a/developer/emir/build-nsc-excludes.xml b/developer/emir/build-nsc-excludes.xml
deleted file mode 100644
index 544d00954d..0000000000
--- a/developer/emir/build-nsc-excludes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<exclude name="scala/io/UTF8String"/>
-<exclude name="scala/tools/nsc/backend/**"/>
diff --git a/developer/emir/custom.properties b/developer/emir/custom.properties
deleted file mode 100644
index e98c83c24b..0000000000
--- a/developer/emir/custom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#nscArgs = -check:term;-check:transmatch;-debug;-log:transmatch
-#nscArgs = -check:term;-check:transmatch;-log:transmatch
-#nscArgs = -check:term;-print:transmatch
-nscArgs = -check:term
-
diff --git a/developer/emir/test-nsc-excludes.xml b/developer/emir/test-nsc-excludes.xml
deleted file mode 100644
index 30be526911..0000000000
--- a/developer/emir/test-nsc-excludes.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<exclude name="scala/io/UTF8String"/>
-<!--
-<exclude name="scala/io/**"/>
-<exclude name="scala/*.scala"/>
-<exclude name="scala/text/**"/>
-<exclude name="scala/util/**"/>
-<exclude name="scala/collection/**"/>
-<exclude name="scala/runtime/**"/>
-<exclude name="scala/testing/**"/>
-<exclude name="scala/concurrent/**"/>
-<exclude name="scala/mobile/**"/>
--->
diff --git a/test-nsc.xml b/test-nsc.xml
deleted file mode 100644
index 5ef3ddf05e..0000000000
--- a/test-nsc.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE project [
-  <!ENTITY userExcludes "">
-]>
-<project name="scala.nsc" default="test">
-
-  <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-                                    nsc 
-
-                               new scala compiler
-
-       %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-       %%%
-       %%%  Preliminaries
-       %%%
-
-	   1) working nsc compiler (see build-nsc.xml)
-
-   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
-
-  <property file="build-nsc.properties.${platform}" prefix="nsc." />
-
-  <property file="developer/${user.name}/custom.properties" />
-
-  <target name="init.args" if="nscArgs">
-     <property name="moreNscArgs" value="${nscArgs}" />
-  </target>
-
-  <target name="init.noargs">
-    <property name="moreNscArgs" value="" />
-  </target>
-
-   <target name="init" depends="init.args, init.noargs">
-     <echo> Hi, I am your helpful test script. Passing options to nsc?</echo>
-     <echo> Either, add a line to developer/${user.name}/custom.properties</echo>
-     <echo>   nscArgs = -check:term;-debug </echo>
-     <echo> or set a property nscArgs on the cmd line</echo>
-     <echo>   sh ant-test-nsc.sh -DnscArgs="-check:term;-debug" </echo>
-     <echo/>
-     <echo> Note the hyphens, the quotes on the cmd line, no spaces between options, the ';' separator</echo>
-   </target>
-
-  <target name="check.env">
-    <fail>
-      <condition><not><available file="${nsc.fjbg_jar}" /></not></condition>
-      Missing library file ${nsc.fjbg_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.scala_jar}" /></not></condition>
-      Missing library file ${nsc.scala_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.tools_jar}" /></not></condition>
-      Missing library file ${nsc.tools_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.nsc_jar}" /></not></condition>
-      Missing library file ${nsc.nsc_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-    <fail>
-      <condition><not><available file="${nsc.nsc4ant_jar}" /></not></condition>
-      Missing library file ${nsc.nsc4ant_jar}.
-      Check your property file build-nsc.properties.${platform}.
-    </fail>
-  </target>
-
-  <target name="test" depends="init,check.env">
-    <mkdir dir="${nsc.nsc_output_dir}" />
-
-    <taskdef name="nsc" classname="scala.tools.scala4ant.NscTask$class" />
-
-    <echo>==== running nsc on predef and runtime</echo>
-    <nsc srcdir="sources" destdir="${nsc.nsc_output_dir}" 
-         classpath="sources:newsources:${nsc.nsrt_jar}"
-		 nscArgs="-nopredefs;${moreNscArgs}">
-
-      <include name="scala/Predef.scala"/>
-      <include name="scala/runtime/ScalaRunTime.scala"/>
-    </nsc>
-
-    <echo>===== running nsc on the rest</echo>
-    <nsc srcdir="sources" destdir="${nsc.nsc_output_dir}" 
-         classpath="sources:newsources:${nsc.nsrt_jar}:${nsc.nsc_output_dir}"
-         nscArgs="${moreNscArgs}" force="true"> 
-
-      <include name="scala/**/*.scala"/>
-      <include name="../newsources/**.scala"/>
-
-      <exclude name="scala/Predef.scala"/>
-      <exclude name="scala/runtime/ScalaRunTime.scala"/>
-
-      <exclude name="scala/tools/**"/>
-	  &userExcludes;
-    </nsc>
-
-    <jar destfile="${nsc.nsrt_jar}">
-      <fileset dir="${nsc.tools_util_runtime_dir}" />
-      <fileset dir="${nsc.nsc_output_dir}" />
-    </jar>
-
-  </target>
-
-  <target name="nscOnNsc" depends="init,check.env">
-    <taskdef name="nsc" classname="scala.tools.scala4ant.NscTask$class" />
-
-    <echo>===== running nsc on itself</echo>
-    <nsc srcdir="sources" destdir="${nsc.nsc_output_dir}" 
-         classpath="sources:newsources:${nsc.nsrt_jar}:${nsc.fjbg_jar}:${nsc.nsc_output_dir}"
-         nscArgs="${moreNscArgs}" force="true"> 
-
-      <include name="scala/tools/nsc/**/*.scala"/>
-	  &userExcludes;
-    </nsc>
-  </target>
-
-  <target name="clean">
-    <delete dir="${nsc.nsc_output_dir}" />
-  </target>
-
-</project>