- removed nsc-specific code (use build.xml !).

4 files changed, 38 insertions, 276 deletions

diff --git a/Makefile b/Makefile
index 206fa598f9..72808d701f 100644
--- a/Makefile
+++ b/Makefile
@@ -59,18 +59,18 @@ test_SCALAC		 = $(main_OBJECTDIR)/bin/scalac
 test_SCALADOC		 = $(test_OBJECTDIR)/bin/scaladoc
 test_SCALA_CMD		 = $(test_OBJECTDIR)/bin/scala
 
-tnsc_PREFIX		 = tnsc
-tnsc_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(tnsc_PREFIX)
-tnsc_LIBRARY_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(LIBRARY_NAME)
-tnsc_TOOLS_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(TOOLS_NAME)
-tnsc_JC_OUTPUTDIR	 = $(tnsc_TOOLS_CLASSDIR)
-tnsc_JC_CLASSPATH	 = $(tnsc_JC_OUTPUTDIR):$(tnsc_LIBRARY_CLASSDIR)
-tnsc_RMIC_OUTPUTDIR	 = $(tnsc_LIBRARY_CLASSDIR)
-tnsc_RMIC_CLASSPATH	 = $(tnsc_RMIC_OUTPUTDIR)
-tnsc_SC_BOOTCLASSPATH	 = $(JRE_JARFILE)
-tnsc_SCALAC		 = $(main_OBJECTDIR)/bin/scalansc
-tnsc_SCALADOC		 = $(tnsc_OBJECTDIR)/bin/scaladoc
-tnsc_SCALA_CMD		 = $(tnsc_OBJECTDIR)/bin/scala
+#tnsc_PREFIX		 = tnsc
+#tnsc_OBJECTDIR		 = $(PROJECT_OBJECTDIR)/$(tnsc_PREFIX)
+#tnsc_LIBRARY_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(LIBRARY_NAME)
+#tnsc_TOOLS_CLASSDIR	 = $(tnsc_OBJECTDIR)/lib/$(TOOLS_NAME)
+#tnsc_JC_OUTPUTDIR	 = $(tnsc_TOOLS_CLASSDIR)
+#tnsc_JC_CLASSPATH	 = $(tnsc_JC_OUTPUTDIR):$(tnsc_LIBRARY_CLASSDIR)
+#tnsc_RMIC_OUTPUTDIR	 = $(tnsc_LIBRARY_CLASSDIR)
+#tnsc_RMIC_CLASSPATH	 = $(tnsc_RMIC_OUTPUTDIR)
+#tnsc_SC_BOOTCLASSPATH	 = $(JRE_JARFILE)
+#tnsc_SCALAC		 = $(main_OBJECTDIR)/bin/scalansc
+#tnsc_SCALADOC		 = $(tnsc_OBJECTDIR)/bin/scaladoc
+#tnsc_SCALA_CMD		 = $(tnsc_OBJECTDIR)/bin/scala
 
 ##############################################################################
 # Variables
@@ -109,10 +109,6 @@ fastclean		:
 clean			:
 	$(RM) -r $(main_OBJECTDIR)
 
-clean-nsc		:
-	$(RM) $(LATEST_PREFIX)-main-*nsc*
-#	$(RM) -r $(main_OBJECTDIR)/lib/nsc
-
 distclean		:
 	$(RM) $(LATEST_PREFIX)-*
 	$(RM) -r $(PROJECT_OBJECTDIR)
@@ -124,14 +120,13 @@ meta			: meta.all
 boot			: boot.all
 main			: main.all
 test			: test.all
-tnsc			: tnsc.all
+#tnsc			: tnsc.all
 
 scripts			: main.scripts
 lamplib			: main.lamplib
 library			: main.library
 library-msil		: main.library-msil
 library-doc		: main.library-doc
-library-nsc		: main.library-nsc
 util			: main.util
 scalac			: main.scalac
 scalai			: main.scalai
@@ -139,10 +134,8 @@ scaladoc		: main.scaladoc
 scalap			: main.scalap
 #dtd2scala		: main.dtd2scala
 scala4ant		: main.scala4ant
-scala4ant-nsc		: main.scala4ant-nsc
 scalatest		: main.scalatest
 tools			: main.tools
-tools-nsc		: main.tools-nsc
 
 $(prefix).all		: $(latest)all
 $(prefix).scripts	: $(latest)scripts
@@ -151,7 +144,6 @@ $(prefix).meta		: $(latest)meta
 $(prefix).library	: $(latest)library
 $(prefix).library-msil	: $(latest)library-msil
 $(prefix).library-doc	: $(latest)library-sdc
-$(prefix).library-nsc	: $(latest)library-nsc
 $(prefix).util		: $(latest)util
 $(prefix).scalac	: $(latest)scalac
 $(prefix).scalai	: $(latest)scalai
@@ -159,29 +151,26 @@ $(prefix).scaladoc	: $(latest)scaladoc
 $(prefix).scalap	: $(latest)scalap
 #$(prefix).dtd2scala	: $(latest)dtd2scala
 $(prefix).scala4ant	: $(latest)scala4ant
-$(prefix).scala4ant-nsc	: $(latest)scala4ant-nsc
 $(prefix).scalatest	: $(latest)scalatest
 $(prefix).tools		: $(latest)tools
-$(prefix).tools-nsc	: $(latest)tools-nsc
 
 meta.%			: ; @$(make) prefix="meta" $@;
 boot.% 			: ; @$(make) prefix="boot" $@;
 main.%			: ; @$(make) prefix="main" $@;
 test.%			: ; @$(make) prefix="test" $@;
-tnsc.%			: ; @$(make) prefix="tnsc" $@;
+#tnsc.%			: ; @$(make) prefix="tnsc" $@;
 
 .PHONY			: meta
 .PHONY			: boot
 .PHONY			: main
 .PHONY			: test
-.PHONY			: tnsc
+#.PHONY			: tnsc
 
 .PHONY			: scripts
 .PHONY			: lamplib
 .PHONY			: library
 .PHONY			: library-msil
 .PHONY			: library-doc
-.PHONY			: library-nsc
 .PHONY			: util
 .PHONY			: scalac
 .PHONY			: scalai
@@ -189,10 +178,8 @@ tnsc.%			: ; @$(make) prefix="tnsc" $@;
 .PHONY			: scalap
 #.PHONY			: dtd2scala
 .PHONY			: scala4ant
-.PHONY			: scala4ant-nsc
 .PHONY			: scalatest
 .PHONY			: tools
-.PHONY			: tools-nsc
 
 .PHONY			: $(prefix).all
 .PHONY			: $(prefix).scripts
@@ -201,19 +188,15 @@ tnsc.%			: ; @$(make) prefix="tnsc" $@;
 .PHONY			: $(prefix).library
 .PHONY			: $(prefix).library-msil
 .PHONY			: $(prefix).library-doc
-.PHONY			: $(prefix).library-nsc
 .PHONY			: $(prefix).util
 .PHONY			: $(prefix).scalac
-.PHONY			: $(prefix).nsc4ant
 .PHONY			: $(prefix).scalai
 .PHONY			: $(prefix).scaladoc
 .PHONY			: $(prefix).scalap
 #.PHONY			: $(prefix).dtd2scala
 .PHONY			: $(prefix).scala4ant
-.PHONY			: $(prefix).scala4ant-nsc
 .PHONY			: $(prefix).scalatest
 .PHONY			: $(prefix).tools
-.PHONY			: $(prefix).tools-nsc
 
 ##############################################################################
 # Commands - version management
@@ -292,11 +275,11 @@ $(latest)all		: $(latest)library
 $(latest)all		: $(latest)tools
 endif
 
-ifeq ($(prefix),tnsc)
-$(latest)all		: $(latest)lamplib
-$(latest)all		: $(latest)library
-$(latest)all		: $(latest)tools
-endif
+#ifeq ($(prefix),tnsc)
+#$(latest)all		: $(latest)lamplib
+#$(latest)all		: $(latest)library
+#$(latest)all		: $(latest)tools
+#endif
 
 $(latest)all		:
 	$(TOUCH) $@
@@ -305,7 +288,7 @@ $(LATEST_PREFIX)-meta-%	: ; @$(make) prefix="meta" $@
 $(LATEST_PREFIX)-boot-%	: ; @$(make) prefix="boot" $@
 $(LATEST_PREFIX)-main-%	: ; @$(make) prefix="main" $@
 $(LATEST_PREFIX)-test-%	: ; @$(make) prefix="test" $@
-$(LATEST_PREFIX)-tnsc-%	: ; @$(make) prefix="tnsc" $@
+#$(LATEST_PREFIX)-tnsc-%	: ; @$(make) prefix="tnsc" $@
 
 ##############################################################################
 # Targets - scala scripts
@@ -321,8 +304,8 @@ SCRIPTS_ALIASES_NAMES	+= scala-debug
 SCRIPTS_ALIASES_NAMES	+= scala-info
 SCRIPTS_ALIASES_NAMES	+= scalac
 SCRIPTS_ALIASES_NAMES	+= scalac-debug
-SCRIPTS_ALIASES_NAMES	+= scalansc
-SCRIPTS_ALIASES_NAMES	+= scalansc-debug
+#SCRIPTS_ALIASES_NAMES	+= scalansc
+#SCRIPTS_ALIASES_NAMES	+= scalansc-debug
 SCRIPTS_ALIASES_NAMES	+= scaladoc
 SCRIPTS_ALIASES_NAMES	+= scaladoc-debug
 SCRIPTS_ALIASES_NAMES	+= scalarun
@@ -332,7 +315,7 @@ SCRIPTS_ALIASES_NAMES	+= scalaint-debug
 #SCRIPTS_ALIASES_NAMES	+= dtd2scala
 SCRIPTS_ALIASES_NAMES	+= scalap
 SCRIPTS_ALIASES_NAMES	+= scalatest
-SCRIPTS_ALIASES_NAMES	+= scalanstest
+#SCRIPTS_ALIASES_NAMES	+= scalanstest
 SCRIPTS_ALIASES_FILES	+= $(SCRIPTS_ALIASES_NAMES:%=$(SCRIPTS_BINARYDIR)/%)
 SCRIPTS_MACRO		 = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(SCRIPTS_PREFIX)/%=$$PREFIX/%)"'@g
 
@@ -348,9 +331,7 @@ $(SCRIPTS_WRAPPER_FILE)	: ROOT                    := $(shell cd $(ROOT) && pwd)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_VERSION           ?= $(PROJECT_VERSION)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_LIBRARY_SOURCES   ?= $(PROJECT_SOURCEDIR)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_LIBRARY_CLASSES   ?= $(LIBRARY_CLASSDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_NLIBRARY_CLASSES  ?= $(NLIBRARY_JAR_ARCHIVE)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_TOOLS_CLASSES     ?= $(TOOLS_CLASSDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_NTOOLS_CLASSES    ?= $(NTOOLS_JAR_ARCHIVE)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_FJBG_CLASSES      ?= $(FJBG_JARFILE)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_MSIL_CLASSES      ?= $(MSIL_JARFILE)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_JAVA_CMD          ?= java
@@ -358,7 +339,6 @@ $(SCRIPTS_WRAPPER_FILE)	: MACRO_JAVA_ARGS         ?= -enableassertions
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_SCALA_CMD         ?= $($(prefix)_SCALA_CMD)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_SCALA_ARGS        ?= -enableassertions
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_SRCDIR       ?= $(PROJECT_TESTDIR)
-$(SCRIPTS_WRAPPER_FILE)	: MACRO_NTEST_SRCDIR      ?= $(PROJECT_NTESTDIR)
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_OBJDIR       ?= ""
 $(SCRIPTS_WRAPPER_FILE)	: MACRO_TEST_ASSEMBLIES   ?= $(MSIL_HOME)
 $(SCRIPTS_WRAPPER_FILE)	: $(VERSION_FILE)
@@ -374,9 +354,7 @@ $(SCRIPTS_WRAPPER_FILE)	: $(SCRIPTS_TEMPLATE_FILE)
 	    $(call SCRIPTS_MACRO,VERSION) \
 	    $(call SCRIPTS_MACRO,LIBRARY_SOURCES) \
 	    $(call SCRIPTS_MACRO,LIBRARY_CLASSES) \
-	    $(call SCRIPTS_MACRO,NLIBRARY_CLASSES) \
 	    $(call SCRIPTS_MACRO,TOOLS_CLASSES) \
-	    $(call SCRIPTS_MACRO,NTOOLS_CLASSES) \
 	    $(call SCRIPTS_MACRO,FJBG_CLASSES) \
 	    $(call SCRIPTS_MACRO,MSIL_CLASSES) \
 	    $(call SCRIPTS_MACRO,JAVA_CMD) \
@@ -384,7 +362,6 @@ $(SCRIPTS_WRAPPER_FILE)	: $(SCRIPTS_TEMPLATE_FILE)
 	    $(call SCRIPTS_MACRO,SCALA_CMD) \
 	    $(call SCRIPTS_MACRO,SCALA_ARGS) \
 	    $(call SCRIPTS_MACRO,TEST_SRCDIR) \
-	    $(call SCRIPTS_MACRO,NTEST_SRCDIR) \
 	    $(call SCRIPTS_MACRO,TEST_OBJDIR) \
 	    $(call SCRIPTS_MACRO,TEST_ASSEMBLIES) \
 	    $(SCRIPTS_TEMPLATE_FILE) > $@
@@ -477,10 +454,10 @@ $(latest)library-rmic	: $(LIBRARY_RMIC_FILES)
 	$(TOUCH) $@
 
 $(latest)library-sc	: $(LIBRARY_SC_FILES)
-	@if [ "$(prefix)" = tnsc ]; then \
-	  $(make) sc target=LIBRARY LIBRARY_SC_FLAGS='$$(SC_FLAGS) -nopredefs'\
-	  LIBRARY_SC_FILES='$(NLIBRARY_ROOT)/ScalaObject.scala $(LIBRARY_ROOT)/Predef.scala $(LIBRARY_ROOT)/runtime/ScalaRunTime.scala'; \
-	fi
+#	@if [ "$(prefix)" = tnsc ]; then \
+#	  $(make) sc target=LIBRARY LIBRARY_SC_FLAGS='$$(SC_FLAGS) -nopredefs'\
+#	  LIBRARY_SC_FILES='$(NLIBRARY_ROOT)/ScalaObject.scala $(LIBRARY_ROOT)/Predef.scala $(LIBRARY_ROOT)/runtime/ScalaRunTime.scala'; \
+#	fi
 	@$(make) sc target=LIBRARY LIBRARY_SC_FILES='$(subst $$,$$$$,$?)'
 	$(TOUCH) $@
 
@@ -628,114 +605,6 @@ $(latest)scalac-sc	: $(SCALAC_SC_FILES)
 	$(TOUCH) $@
 
 ##############################################################################
-# Targets - scala tools - new compiler
-
-NTOOLS_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/nsc
-NTOOLS_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/nsc.lst)
-NTOOLS_OUTPUTDIR	 = /tmp/classes_$(NTOOLS_JAR_NAME)_$(USER)
-NTOOLS_OBJECTDIR	 = $(PROJECT_OBJECTDIR)/nsc/lib
-NTOOLS_SOURCES		+= $(NTOOLS_LIST:%=$(NTOOLS_ROOT)/%)
-NTOOLS_SC_FILES		+= $(filter %.scala,$(NTOOLS_SOURCES))
-NTOOLS_SC_SOURCEPATH	 = $(PROJECT_SOURCEDIR)
-NTOOLS_SC_CLASSPATH	 = $(SC_CLASSPATH):$(FJBG_JARFILE):$(ANT_JARFILE)
-NTOOLS_SC_OUTPUTDIR	 = $(NTOOLS_OUTPUTDIR)
-
-NTOOLS_CLASSDIR		 = $(NTOOLS_OBJECTDIR)/$(NTOOLS_JAR_NAME)
-NTOOLS_JAR_NAME		 = nsc
-NTOOLS_JAR_ARCHIVE	 = $(NTOOLS_CLASSDIR).jar
-NTOOLS_JAR_INPUTDIR	 = $(NTOOLS_OUTPUTDIR)
-NTOOLS_JAR_FILES	+= .
-
-$(latest)tools-nsc	: $(latest)library-nsc
-$(latest)tools-nsc	: $(latest)tools-nsc-jar
-$(latest)tools-nsc	: $(latest)scala4ant-nsc
-$(latest)tools-nsc	: $(latest)tools-nsc-nsc
-$(latest)tools-nsc	:
-	@$(TOUCH) $@
-
-$(latest)tools-nsc-jar	: $(latest)tools-nsc-sc
-$(latest)tools-nsc-jar	:
-	@$(ECHO) "      [jar] Building jar: $(NTOOLS_JAR_ARCHIVE)"
-	@$(make) jar target=NTOOLS \
-	    NTOOLS_JAR=@$(JAR)
-	@$(TOUCH) $@
-
-$(latest)tools-nsc-sc	: $(NTOOLS_SC_FILES)
-# !!!	@$(make) sc target=NTOOLS NTOOLS_SC_FILES='$?'
-	@n=`$(ECHO) $? | $(WC) -w`; \
-	$(ECHO) "   [scalac] Compiling $$n source files to $(NTOOLS_SC_OUTPUTDIR)"
-	@$(make) sc target=NTOOLS \
-	    main_SCALAC=@$(main_SCALAC) \
-	    SCALA_JAVA_ARGS='-Xmx512M -Xms256M'
-	@$(TOUCH) $@
-
-$(latest)tools-nsc-nsc	: $(LIBRARY_JAR_ARCHIVE)
-$(latest)tools-nsc-nsc	: $(TOOLS_JAR_ARCHIVE)
-$(latest)tools-nsc-nsc	:
-# !!! following line is a workaround for non-working dependency 2 (why?) !
-	@$(make) jar target=TOOLS
-	@$(PROJECT_ROOT)/ant-test-nsc.sh
-	@$(TOUCH) $@
-
-ifneq ($(NTOOLS_JAR_ARCHIVE),.jar)
-
-$(NTOOLS_JAR_ARCHIVE)	: $(latest)tools-nsc
-$(NTOOLS_JAR_ARCHIVE)	:
-	@$(ECHO) "      [jar] Building jar: $(NTOOLS_JAR_ARCHIVE)"
-	@$(make) jar target=NTOOLS \
-	    NTOOLS_JAR=@$(JAR)
-
-endif
-
-##############################################################################
-# Targets - scala library - new compiler
-
-NLIBRARY_ROOT		 = $(PROJECT_SOURCEDIR)/scala
-NLIBRARY_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/library-nsc.lst)
-NLIBRARY_OUTPUTDIR	 = /tmp/classes_$(NLIBRARY_JAR_NAME)_$(USER)
-NLIBRARY_OBJECTDIR	 = $(PROJECT_OBJECTDIR)/nsc/lib
-NLIBRARY_SOURCES	+= $(NLIBRARY_LIST:%=$(NLIBRARY_ROOT)/%)
-NLIBRARY_JC_FILES	+= $(filter %.java,$(NLIBRARY_SOURCES))
-NLIBRARY_JC_CLASSPATH	 = $(JC_CLASSPATH)
-NLIBRARY_JC_FLAGS	+= $(JC_FLAGS) -scala-hack
-NLIBRARY_JC_OUTPUTDIR	 = $(NLIBRARY_OUTPUTDIR)
-
-NLIBRARY_CLASSDIR	 = $(NLIBRARY_OBJECTDIR)/$(NLIBRARY_JAR_NAME)
-NLIBRARY_JAR_NAME	 = nsrt
-NLIBRARY_JAR_ARCHIVE	 = $(NLIBRARY_CLASSDIR).jar
-NLIBRARY_JAR_INPUTDIR	 = $(NLIBRARY_OUTPUTDIR)
-NLIBRARY_JAR_FILES	+= .
-
-$(latest)library-nsc	: $(latest)library-nsc-jar
-$(latest)library-nsc	:
-	@$(TOUCH) $@
-
-$(latest)library-nsc-jar	: $(latest)library-nsc-jc
-$(latest)library-nsc-jar	:
-	@$(ECHO) "      [jar] Building jar: $(NLIBRARY_JAR_ARCHIVE)"
-	@$(make) jar target=NLIBRARY \
-	    NLIBRARY_JAR=@$(JAR)
-	@$(TOUCH) $@
-
-$(latest)library-nsc-jc	: $(NLIBRARY_JC_FILES)
-	@n=`$(ECHO) '$?' | $(WC) -w`; \
-	$(ECHO) "     [pico] Compiling $$n source files to $(NLIBRARY_JC_OUTPUTDIR)"
-	@$(make) jc target=NLIBRARY \
-	    NLIBRARY_JC_PREPEND='@' \
-	    NLIBRARY_JC_FILES='$?'
-	@$(TOUCH) $@
-
-ifneq ($(NLIBRARY_JAR_ARCHIVE),.jar)
-
-$(NLIBRARY_JAR_ARCHIVE)	: $(latest)library-nsc
-$(NLIBRARY_JAR_ARCHIVE)	:
-	@$(ECHO) "      [jar] Building jar: $(NLIBRARY_JAR_ARCHIVE)"
-	@$(make) jar target=NLIBRARY \
-	    NLIBRARY_JAR=@$(JAR)
-
-endif
-
-##############################################################################
 # Targets - scala tools - interpreter
 
 PROJECT_SOURCES		+= $(SCALAI_SOURCES)
@@ -858,48 +727,6 @@ $(latest)scala4ant-sc	: $(SCALA4ANT_SC_FILES)
 	$(TOUCH) $@
 
 ##############################################################################
-# Targets - scala tools - nsc4ant
-
-PROJECT_SOURCES		+= $(SCALA4ANT_SOURCES)
-NSC4ANT_ROOT		 = $(PROJECT_SOURCEDIR)/scala/tools/scala4ant
-NSC4ANT_OUTPUTDIR	 = /tmp/classes_$(NSC4ANT_JAR_NAME)_$(USER)
-NSC4ANT_OBJECTDIR	 = $(PROJECT_OBJECTDIR)/nsc/lib
-NSC4ANT_LIST		+= NscAdaptor.scala
-NSC4ANT_LIST		+= NscTask.scala
-NSC4ANT_LIST		+= ScalaRuntime.scala
-NSC4ANT_SOURCES		+= $(NSC4ANT_LIST:%=$(NSC4ANT_ROOT)/%)
-NSC4ANT_SC_FILES	+= $(NSC4ANT_SOURCES)
-NSC4ANT_SC_SOURCPATH	 = $(PROJECT_SOURCEDIR)
-NSC4ANT_SC_CLASSPATH	 = $(SC_CLASSPATH):$(NTOOLS_OUTPUTDIR):$(ANT_JARFILE)
-NSC4ANT_SC_OUTPUTDIR	 = $(NSC4ANT_OUTPUTDIR)
-
-NSC4ANT_CLASSDIR	 = $(NSC4ANT_OBJECTDIR)/$(NSC4ANT_JAR_NAME)
-NSC4ANT_JAR_NAME	 = nsc4ant
-NSC4ANT_JAR_ARCHIVE	 = $(NSC4ANT_CLASSDIR).jar
-NSC4ANT_JAR_INPUTDIR	 = $(NSC4ANT_OUTPUTDIR)
-NSC4ANT_JAR_FILES	+= .
-
-$(latest)scala4ant-nsc	: $(latest)tools-nsc-jar
-$(latest)scala4ant-nsc	: $(latest)scala4ant-nsc-jar
-$(latest)scala4ant-nsc	:
-	@$(TOUCH) $@
-
-$(latest)scala4ant-nsc-jar	: $(latest)scala4ant-nsc-sc
-$(latest)scala4ant-nsc-jar	:
-	@$(ECHO) "      [jar] Building jar: $(NSC4ANT_JAR_ARCHIVE)"
-	@$(make) jar target=NSC4ANT \
-	    NSC4ANT_JAR=@$(JAR)
-	@$(TOUCH) $@
-
-$(latest)scala4ant-nsc-sc	: $(NSC4ANT_SC_FILES)
-	@n=`$(ECHO) '$?' | $(WC) -w`; \
-	$(ECHO) "   [scalac] Compiling $$n source files to $(NSC4ANT_SC_OUTPUTDIR)"
-	@$(make) sc target=NSC4ANT \
-	    main_SCALAC=@$(main_SCALAC) \
-	    NSC4ANT_SC_FILES='$?'
-	@$(TOUCH) $@
-
-##############################################################################
 # Targets - scala tools - scalatest
 
 PROJECT_SOURCES		+= $(SCALATEST_SOURCES)
@@ -927,13 +754,13 @@ TOOLS_JAR_FILES		+= .
 
 $(latest)tools		: $(latest)lamplib
 $(latest)tools		: $(latest)util
-ifneq ($(prefix),tnsc)
+#ifneq ($(prefix),tnsc)
 $(latest)tools		: $(latest)scalac
 $(latest)tools		: $(latest)scalai
 $(latest)tools		: $(latest)scaladoc
-else
-$(latest)tools		: $(latest)nsc
-endif
+#else
+#$(latest)tools		: $(latest)nsc
+#endif
 $(latest)tools		: $(latest)scalap
 #$(latest)tools		: $(latest)dtd2scala
 $(latest)tools		: $(latest)scala4ant
diff --git a/Makefile.config b/Makefile.config
index e307eee51c..13469a55ce 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -25,10 +25,6 @@ PROJECT_DISTRIBDIR	?= $(PROJECT_ROOT)/distribs
 PROJECT_ARCHIVEDIR	?= $(PROJECT_DISTRIBDIR)
 PROJECT_LISTDIR		?= $(PROJECT_CONFIGDIR)/list
 
-# NSC
-PROJECT_NSOURCEDIR	?= $(PROJECT_ROOT)/newsources
-PROJECT_NTESTDIR	?= $(PROJECT_ROOT)/test-nsc/files
-
 ##############################################################################
 # External libraries
 
@@ -46,10 +42,6 @@ MSIL_JARFILE		?= $(MSIL_HOME)/msil.jar
 MSIL_DLLFILE		?= $(MSIL_HOME)/scala.dll
 MSIL_KEYFILE		?= lamp.key
 
-# NSC
-NSCALA_JARFILE		?= $(PROJECT_LIBRARYDIR)/nsrt.jar
-NTOOLS_JARFILE		?= $(PROJECT_LIBRARYDIR)/nsc.jar
-
 # Ant
 ANT_HOME		?= $(PROJECT_LIBDIR)/ant
 ANT_JARFILE		?= $(ANT_HOME)/lib/ant.jar
diff --git a/Makefile.distrib b/Makefile.distrib
index d95de9760c..7a53c03b8d 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -87,11 +87,6 @@ TEST_ROOT		 = $(PROJECT_TESTDIR)
 TEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test.lst)
 TEST_FILES		 = $(TEST_LIST:%=$(TEST_ROOT)/%)
 
-# scala test
-NTEST_ROOT		 = $(PROJECT_NTESTDIR)
-NTEST_LIST		+= $(call READLIST,$(PROJECT_LISTDIR)/test-nsc.lst)
-NTEST_FILES		 = $(NTEST_LIST:%=$(NTEST_ROOT)/%)
-
 ##############################################################################
 # beta versions
 ##############################################################################
@@ -111,22 +106,17 @@ INSTALL_LIBDIR		 = $(INSTALL_PACKAGEDIR)/lib
 INSTALL_SRCDIR		 = $(INSTALL_PACKAGEDIR)/src
 INSTALL_SUPPORTDIR	 = $(INSTALL_PACKAGEDIR)/support
 INSTALL_TESTDIR		 = $(INSTALL_PACKAGEDIR)/test
-INSTALL_NTESTDIR	 = $(INSTALL_PACKAGEDIR)/test-nsc
 INSTALL_APIDOCDIR	 = $(INSTALL_DOCDIR)/api
 INSTALL_EXAMPLEDIR	 = $(INSTALL_DOCDIR)/examples
 
 INSTALL_LIBRARY_JARFILE	 = $(INSTALL_LIBDIR)/$(LIBRARY_NAME).jar
 INSTALL_TOOLS_JARFILE	 = $(INSTALL_LIBDIR)/$(TOOLS_NAME).jar
-INSTALL_NLIBRARY_JARFILE = $(INSTALL_LIBDIR)/nsrt.jar
-INSTALL_NTOOLS_JARFILE	 = $(INSTALL_LIBDIR)/nsc.jar
 INSTALL_FJBG_JARFILE	 = $(INSTALL_LIBDIR)/fjbg.jar
 INSTALL_MSIL_JARFILE	 = $(INSTALL_LIBDIR)/msil.jar
 INSTALL_MSIL_DLLFILE	 = $(INSTALL_LIBDIR)/scala.dll
 
 install			: $(LIBRARY_JAR_ARCHIVE)
-install			: $(NLIBRARY_JAR_ARCHIVE)
 install			: $(TOOLS_JAR_ARCHIVE)
-install			: $(NTOOLS_JAR_ARCHIVE)
 	$(MAKE) -C $(DOCUMENTS_ROOT)/reference
 	$(MAKE) -C $(DOCUMENTS_ROOT)/tutorial
 	$(INSTALL) -m 755 -d $(INSTALL_DOCDIR)
@@ -141,9 +131,7 @@ install			: $(NTOOLS_JAR_ARCHIVE)
 	    MACRO_VERSION=$(INSTALL_VERSION) \
 	    MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \
 	    MACRO_LIBRARY_CLASSES=$(INSTALL_LIBRARY_JARFILE) \
-	    MACRO_NLIBRARY_CLASSES=$(INSTALL_NLIBRARY_JARFILE) \
 	    MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_JARFILE) \
-	    MACRO_NTOOLS_CLASSES=$(INSTALL_NTOOLS_JARFILE) \
 	    MACRO_FJBG_CLASSES=$(INSTALL_FJBG_JARFILE) \
 	    MACRO_MSIL_CLASSES=$(INSTALL_MSIL_JARFILE) \
 	    MACRO_JAVA_CMD=java \
@@ -151,7 +139,6 @@ install			: $(NTOOLS_JAR_ARCHIVE)
 	    MACRO_SCALA_CMD=$(INSTALL_BINDIR)/scala \
 	    MACRO_SCALA_ARGS= \
 	    MACRO_TEST_SRCDIR=$(INSTALL_TESTDIR) \
-	    MACRO_NTEST_SRCDIR=$(INSTALL_NTESTDIR) \
 	    MACRO_TEST_OBJDIR='/tmp/$$$$SCRIPT-$$$$USER' \
 	    MACRO_TEST_ASSEMBLIES= \
 	    scripts
@@ -159,9 +146,7 @@ install			: $(NTOOLS_JAR_ARCHIVE)
 	$(RM) $(INSTALL_BINDIR)/$(SCRIPTS_TEMPLATE_NAME)
 	$(INSTALL) -m 755 -d $(INSTALL_LIBDIR)
 	$(INSTALL) -m 644 -p $(LIBRARY_JAR_ARCHIVE) $(INSTALL_LIBRARY_JARFILE)
-	$(INSTALL) -m 644 -p $(NLIBRARY_JAR_ARCHIVE) $(INSTALL_NLIBRARY_JARFILE)
 	$(INSTALL) -m 644 -p $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_JARFILE)
-	$(INSTALL) -m 644 -p $(NTOOLS_JAR_ARCHIVE) $(INSTALL_NTOOLS_JARFILE)
 	$(INSTALL) -m 644 -p $(FJBG_JARFILE) $(INSTALL_FJBG_JARFILE)
 	$(INSTALL) -m 644 -p $(MSIL_JARFILE) $(INSTALL_MSIL_JARFILE)
 	$(INSTALL) -m 644 -p $(MSIL_DLLFILE) $(INSTALL_MSIL_DLLFILE)
@@ -232,12 +217,6 @@ install			: $(NTOOLS_JAR_ARCHIVE)
 	$(strip $(MIRROR) -m 644 -p -C $(TEST_ROOT) \
 	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.namespace) 2>/dev/null) \
 	    $(INSTALL_TESTDIR))
-	$(strip $(MIRROR) -m 644 -p -C $(NTEST_ROOT) \
-	    $(shell cd $(TEST_ROOT); ls $(TEST_LIST:%.scala=%.xml) 2>/dev/null) \
-	    $(INSTALL_TESTDIR))
-	$(INSTALL) -m 755 -d $(INSTALL_NTESTDIR)
-	$(strip $(MIRROR) -m 644 -p -C $(NTEST_ROOT) $(NTEST_LIST) \
-	    $(INSTALL_NTESTDIR))
 
 install-windows		: install
 	@if [ ! -d "$(INSTALL_PREFIX)" ]; then \
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl
index b50f4a64fe..40612e64fb 100644
--- a/sources/bin/.scala_wrapper.tmpl
+++ b/sources/bin/.scala_wrapper.tmpl
@@ -57,12 +57,6 @@ configure() {
     # Location of the Scala tools library.
     default_TOOLS_CLASSES={#TOOLS_CLASSES#};
 
-    # Location of the NSRT library.
-    default_NLIBRARY_CLASSES={#NLIBRARY_CLASSES#};
-
-    # Location of the NSC library.
-    default_NTOOLS_CLASSES={#NTOOLS_CLASSES#};
-
     # Location of the FJBG library.
     default_FJBG_CLASSES={#FJBG_CLASSES#};
 
@@ -461,34 +455,6 @@ compiler_start() {
 }
 
 ##############################################################################
-# New compiler invocation functions
-
-# Starts a NSC compiler. The first argument is added to the runtime
-# classpath. The following ones are passed to vm_start_scala. They
-# must, at least, contain the name of the main class.
-ncompiler_start() {
-    [ $# -gt 1 ] || abort "internal error";
-    classpath="$1"; shift 1;
-
-    # compute values
-    compute_value FJBG_CLASSES;
-    compute_value MSIL_CLASSES;
-    compute_value LIBRARY_SOURCES;
-    compute_value LIBRARY_CLASSES;
-    compute_value NLIBRARY_CLASSES;
-    compute_value NTOOLS_CLASSES;
-
-    # append FJBG and MSIL libraries to classpath
-    classpath=`append_pathlists "$classpath" "$current_FJBG_CLASSES"`;
-    classpath=`append_pathlists "$classpath" "$current_MSIL_CLASSES"`;
-    classpath=`append_pathlists "$classpath" "$current_NLIBRARY_CLASSES"`;
-    classpath=`append_pathlists "$classpath" "$current_NTOOLS_CLASSES"`;
-
-    # start Scala VM
-    tool_start0 -classpath "`get_os_pathlist "$classpath"`" "$@";
-}
-
-##############################################################################
 # Implementation of scala-info
 
 # Prints given error message, prints usage and exits with error code 1.
@@ -931,13 +897,11 @@ test_main() {
     SCALAP="$PREFIX/bin/scalap";
     DIFF="diff";
 
-    case "$SCRIPT" in
-        scalanstest* )
-            SOCOS="$PREFIX/bin/scalansc";
-            TESTROOT={#NTEST_SRCDIR#};
-            SRCDIR={#NTEST_SRCDIR#};
-        ;;
-    esac;
+#   case "$SCRIPT" in
+#       scalanstest* )
+#           SOCOS="$PREFIX/bin/scalansc";
+#       ;;
+#   esac;
 
     case `uname` in
         CYGWIN* )
@@ -1081,7 +1045,7 @@ case "$SCRIPT" in
     scala      ) scala_main "$@";;
     scala-*    ) scala_main "$@";;
     scalac*    ) compiler_start "" scala.tools.scalac.Main "$@";;
-    scalansc*  ) ncompiler_start "" scala.tools.nsc.Main "$@";;
+#   scalansc*  ) ncompiler_start "" scala.tools.nsc.Main "$@";;
     scalarun*  ) compiler_start "" scala.tools.scalai.Main "$@";;
     scalaint*  ) compiler_start "" scala.tools.scalai.Main -interactive "$@";;
     scaladoc*  ) tool_start "" scala.tools.scaladoc.Main "$@";;