From 1d2a33a1c2692407698dd7c4dd7b46703eef2d24 Mon Sep 17 00:00:00 2001 From: paltherr Date: Mon, 3 Mar 2003 17:36:57 +0000 Subject: - Added file interpreter.lst - Added target interpreter --- Makefile | 18 +++++++++++++++++- config/list/interpreter.lst | 7 +++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 config/list/interpreter.lst diff --git a/Makefile b/Makefile index b23100ec22..00022a59ed 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ PROJECT_NAME = scala PROJECT_ROOT = $(ROOT) PROJECT_SOURCES += $(RUNTIME_SOURCES) PROJECT_SOURCES += $(COMPILER_SOURCES) +PROJECT_SOURCES += $(INTERPRETER_SOURCES) PROJECT_OUTPUTDIR = $(PROJECT_ROOT)/classes PROJECT_CLASSPATH = $(PROJECT_OUTPUTDIR) PROJECT_LISTDIR = $(PROJECT_ROOT)/config/list @@ -58,7 +59,13 @@ COMPILER_ROOT = $(PROJECT_SOURCEDIR)/scalac COMPILER_LIST = $(call READLIST,$(PROJECT_LISTDIR)/compiler.lst) COMPILER_SOURCES += $(COMPILER_LIST:%=$(COMPILER_ROOT)/%) COMPILER_JC_COMPILER = PICO -COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(BCEL_JARFILE):$(MSIL_JARFILE) +COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(BCEL_JARFILE):$(MSIL_JARFILE) + +# scala interpreter +INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scalai +INTERPRETER_LIST = $(call READLIST,$(PROJECT_LISTDIR)/interpreter.lst) +INTERPRETER_SOURCES += $(INTERPRETER_LIST:%=$(INTERPRETER_ROOT)/%) +INTERPRETER_JC_COMPILER = PICO # scala library @@ -130,13 +137,16 @@ make += $(MAKE) MAKELEVEL=$(MAKELEVEL) --no-print-directory all : scripts all : runtime all : compiler +all : interpreter all : library force : + $(RM) .latest-interpreter $(RM) .latest-compiler @$(make) all clean : + $(RM) .latest-interpreter $(RM) .latest-compiler $(RM) .latest-runtime $(RM) -r $(PROJECT_OUTPUTDIR) @@ -150,6 +160,7 @@ distclean : clean scripts : $(SCRIPTS_WRAPPER_LINKS) runtime : .latest-runtime compiler : .latest-compiler +interpreter : .latest-interpreter library : .latest-library .PHONY : all @@ -159,6 +170,7 @@ library : .latest-library .PHONY : scripts .PHONY : runtime .PHONY : compiler +.PHONY : interpreter .PHONY : library ############################################################################## @@ -172,6 +184,10 @@ library : .latest-library @$(make) .do-jc source=COMPILER JC_FILES='$?' touch $@ +.latest-interpreter : $(INTERPRETER_SOURCES) + @$(make) .do-jc source=INTERPRETER JC_FILES='$?' + touch $@ + .latest-library : $(LIBRARY_FILES) touch $@ diff --git a/config/list/interpreter.lst b/config/list/interpreter.lst new file mode 100644 index 0000000000..e3518addae --- /dev/null +++ b/config/list/interpreter.lst @@ -0,0 +1,7 @@ +################################################################-*-text-*-#### +# scala interpreter source files (paths are relative to ./sources/scalai) +############################################################################## +# $Id$ + + +############################################################################## -- cgit v1.2.3