diff options
| author | michelou <michelou@epfl.ch> | 2005-10-07 14:30:03 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-10-07 14:30:03 +0000 |
| commit | 2c1956c28280aae0b98669affc5f0b5bda77a3cc (patch) | |
| tree | f3f8749e0ad7df8d1c6339f8beecadcc6348350f | |
| parent | e46029a572a815fb4c43c1d404136d2da84b8020 (diff) | |
| download | scala-2c1956c28280aae0b98669affc5f0b5bda77a3cc.tar.gz scala-2c1956c28280aae0b98669affc5f0b5bda77a3cc.tar.bz2 scala-2c1956c28280aae0b98669affc5f0b5bda77a3cc.zip | |
- added support nsc test suite.
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -348,8 +348,8 @@ $(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_TOOLS_CLASSES ?= $(TOOLS_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) @@ -358,6 +358,7 @@ $(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) @@ -373,8 +374,8 @@ $(SCRIPTS_WRAPPER_FILE) : $(SCRIPTS_TEMPLATE_FILE) $(call SCRIPTS_MACRO,VERSION) \ $(call SCRIPTS_MACRO,LIBRARY_SOURCES) \ $(call SCRIPTS_MACRO,LIBRARY_CLASSES) \ - $(call SCRIPTS_MACRO,TOOLS_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) \ @@ -383,6 +384,7 @@ $(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) > $@ @@ -434,7 +436,7 @@ $(latest)meta-jc : $(META_JC_FILES) PROJECT_SOURCES += $(LIBRARY_SOURCES) LIBRARY_NAME = $(PROJECT_NAME) LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala -NLIBRARY_ROOT = $(PROJECT_NSC_SOURCEDIR)/scala +NLIBRARY_ROOT = $(PROJECT_NSOURCEDIR)/scala LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) LIBRARY_CLASSDIR = $($(prefix)_LIBRARY_CLASSDIR) |