diff options
| author | michelou <michelou@epfl.ch> | 2005-10-11 17:41:57 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-11 17:41:57 +0000 |
| commit | 7762de74a5779418c9f64faad8aaede5f1c6d7b6 (patch) | |
| tree | 9948ddb715c5d85155356210d47dbb348a5744cf /Makefile.distrib | |
| parent | 74dabb6ec9474cd04f94651f3c01fd60b48c4755 (diff) | |
| download | scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.tar.gz scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.tar.bz2 scala-7762de74a5779418c9f64faad8aaede5f1c6d7b6.zip | |
- removed nsc-specific code (use build.xml !).
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 21 |
1 files changed, 0 insertions, 21 deletions
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 \ |