diff options
| author | michelou <michelou@epfl.ch> | 2005-10-07 14:30:34 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-07 14:30:34 +0000 |
| commit | 9ac7819931bfcdbdbd71c1f56c6383af63d5a90d (patch) | |
| tree | d7f4c42aed50026ee908aec5609a46efbedb3948 /Makefile.distrib | |
| parent | 2c1956c28280aae0b98669affc5f0b5bda77a3cc (diff) | |
| download | scala-9ac7819931bfcdbdbd71c1f56c6383af63d5a90d.tar.gz scala-9ac7819931bfcdbdbd71c1f56c6383af63d5a90d.tar.bz2 scala-9ac7819931bfcdbdbd71c1f56c6383af63d5a90d.zip | |
- added support for nsc test suite.
Diffstat (limited to 'Makefile.distrib')
| -rw-r--r-- | Makefile.distrib | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 54926d3840..d95de9760c 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -87,6 +87,11 @@ 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 ############################################################################## @@ -106,6 +111,7 @@ 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 @@ -118,8 +124,8 @@ INSTALL_MSIL_JARFILE = $(INSTALL_LIBDIR)/msil.jar INSTALL_MSIL_DLLFILE = $(INSTALL_LIBDIR)/scala.dll install : $(LIBRARY_JAR_ARCHIVE) -install : $(TOOLS_JAR_ARCHIVE) install : $(NLIBRARY_JAR_ARCHIVE) +install : $(TOOLS_JAR_ARCHIVE) install : $(NTOOLS_JAR_ARCHIVE) $(MAKE) -C $(DOCUMENTS_ROOT)/reference $(MAKE) -C $(DOCUMENTS_ROOT)/tutorial @@ -135,8 +141,8 @@ install : $(NTOOLS_JAR_ARCHIVE) MACRO_VERSION=$(INSTALL_VERSION) \ MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \ MACRO_LIBRARY_CLASSES=$(INSTALL_LIBRARY_JARFILE) \ - MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_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) \ @@ -145,6 +151,7 @@ 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 @@ -152,8 +159,8 @@ 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 $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_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) @@ -225,9 +232,12 @@ 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 $(TEST_ROOT) \ + $(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 \ |