diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-15 11:11:32 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-15 11:11:32 +0000 |
| commit | 99fe4d41dccef1775ca149d25d8465719412f87f (patch) | |
| tree | f8bf07bdb0044b65c3af1200c4084b666dcd84ea | |
| parent | 902ced470fd9b10f11cce452aff6fb4ee6854d68 (diff) | |
| download | scala-99fe4d41dccef1775ca149d25d8465719412f87f.tar.gz scala-99fe4d41dccef1775ca149d25d8465719412f87f.tar.bz2 scala-99fe4d41dccef1775ca149d25d8465719412f87f.zip | |
- Created separate outputdirs for library and t...
- Created separate outputdirs for library and tools classes
| -rw-r--r-- | Makefile | 34 |
1 files changed, 23 insertions, 11 deletions
@@ -19,12 +19,16 @@ latest = $(LATEST_PREFIX)-$(prefix)- meta_PREFIX = meta meta_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(meta_PREFIX) +meta_JC_OUTPUTDIR = $(meta_OBJECTDIR)/classes +meta_JC_CLASSPATH = $(JC_OUTPUTDIR) meta_SCALAC = $(SCALAC) boot_PREFIX = boot boot_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(boot_PREFIX) boot_INSTALLDIR = $(boot_OBJECTDIR) boot_BINARYDIR = $(boot_OBJECTDIR)/bin +boot_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) +boot_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) boot_SCALAC = $(SCALAC) boot_SCALADOC = $(SCALADOC) @@ -32,6 +36,8 @@ main_PREFIX = main main_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(main_PREFIX) main_INSTALLDIR = $(PROJECT_ROOT) main_BINARYDIR = $(PROJECT_BINARYDIR) +main_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) +main_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) main_SCALAC = $(boot_BINARYDIR)/scalac main_SCALADOC = $(main_BINARYDIR)/scaladoc @@ -39,6 +45,8 @@ test_PREFIX = test test_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(test_PREFIX) test_INSTALLDIR = $(test_OBJECTDIR) test_BINARYDIR = $(test_OBJECTDIR)/bin +test_JC_OUTPUTDIR = $(TOOLS_CLASSDIR) +test_JC_CLASSPATH = $(JC_OUTPUTDIR):$(LIBRARY_CLASSDIR) test_SCALAC = $(main_BINARYDIR)/scalac test_SCALADOC = $(test_BINARYDIR)/scaladoc @@ -47,14 +55,14 @@ test_SCALADOC = $(test_BINARYDIR)/scaladoc # java compilation defaults JC_COMPILER = PICO -JC_OUTPUTDIR = $($(prefix)_OBJECTDIR)/classes -JC_CLASSPATH = $(JC_OUTPUTDIR) +JC_OUTPUTDIR = $($(prefix)_JC_OUTPUTDIR) +JC_CLASSPATH = $($(prefix)_JC_CLASSPATH) # scala compilation defaults SC_COMPILER = $(prefix)_SCALAC SC_OUTPUTDIR = $(JC_OUTPUTDIR) -SC_CLASSPATH = $(JC_CLASSPATH) -SC_BOOTCLASSPATH = $(JC_OUTPUTDIR):$(PROJECT_SOURCEDIR):$(JRE_JARFILE) +SC_CLASSPATH = $(JC_CLASSPATH):$(PROJECT_SOURCEDIR) +SC_BOOTCLASSPATH = $(JRE_JARFILE) # scala documentation compilation defaults SDC_COMPILER = $(prefix)_SCALADOC @@ -292,8 +300,8 @@ $(SCRIPTS_ALIASES_FILES): $(SCRIPTS_WRAPPER_FILE) $(SCRIPTS_WRAPPER_FILE) : INSTALL_PREFIX ?= $($(prefix)_INSTALLDIR) $(SCRIPTS_WRAPPER_FILE) : MACRO_VERSION ?= $(PROJECT_VERSION) $(SCRIPTS_WRAPPER_FILE) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR) -$(SCRIPTS_WRAPPER_FILE) : MACRO_RUNTIME_CLASSES ?= $(JC_OUTPUTDIR) -$(SCRIPTS_WRAPPER_FILE) : MACRO_TOOLS_CLASSES ?= $(JC_OUTPUTDIR) +$(SCRIPTS_WRAPPER_FILE) : MACRO_RUNTIME_CLASSES ?= $(LIBRARY_CLASSDIR) +$(SCRIPTS_WRAPPER_FILE) : MACRO_TOOLS_CLASSES ?= $(TOOLS_CLASSDIR) $(SCRIPTS_WRAPPER_FILE) : MACRO_FJBG_CLASSES ?= $(FJBG_JARFILE) $(SCRIPTS_WRAPPER_FILE) : MACRO_MSIL_CLASSES ?= $(MSIL_JARFILE) $(SCRIPTS_WRAPPER_FILE) : MACRO_JAVA_ARGS ?= -enableassertions @@ -364,15 +372,20 @@ PROJECT_SOURCES += $(LIBRARY_SOURCES) LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) +LIBRARY_CLASSDIR = $($(prefix)_OBJECTDIR)/library LIBRARY_JC_FILES += $(filter %.java,$(LIBRARY_SOURCES)) LIBRARY_JC_FLAGS += $(JC_FLAGS) -scala-hack +LIBRARY_JC_OUTPUTDIR = $(LIBRARY_CLASSDIR) +LIBRARY_JC_CLASSPATH = $(LIBRARY_JC_OUTPUTDIR) LIBRARY_SC_FILES += $(filter %.scala,$(LIBRARY_SOURCES)) +LIBRARY_SC_OUTPUTDIR = $(LIBRARY_JC_OUTPUTDIR) +LIBRARY_SC_CLASSPATH = $(LIBRARY_JC_OUTPUTDIR):$(PROJECT_SOURCEDIR) LIBRARY_SDC_FLAGS += -windowtitle "Scala Library Documentation" LIBRARY_SDC_FLAGS += -doctitle "Scala<br/>$(PROJECT_VERSION)" LIBRARY_SDC_FILES += $(LIBRARY_SC_FILES) LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR) LIBRARY_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(PROJECT_NAME).jar -LIBRARY_JAR_INPUTDIR = $(JC_OUTPUTDIR) +LIBRARY_JAR_INPUTDIR = $(LIBRARY_CLASSDIR) LIBRARY_JAR_FILES += scala distclean : distclean.library @@ -398,9 +411,7 @@ $(latest)library-sdc : $(LIBRARY_SDC_FILES) $(LIBRARY_JAR_ARCHIVE) : $(latest)library $(LIBRARY_JAR_ARCHIVE) : - $(MV) $(JC_OUTPUTDIR)/scala/tools $(JC_OUTPUTDIR)/scala.tools @$(make) jar target=LIBRARY - $(MV) $(JC_OUTPUTDIR)/scala.tools $(JC_OUTPUTDIR)/scala/tools ############################################################################## # Targets - scala library @@ -455,7 +466,7 @@ SCALAC_SOURCES += $(SCALAC_LIST:%=$(SCALAC_ROOT)/%) SCALAC_JC_FILES += $(filter %.java,$(SCALAC_SOURCES)) SCALAC_JC_CLASSPATH = $(JC_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) SCALAC_SC_FILES += $(filter %.scala,$(SCALAC_SOURCES)) -SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH) +SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH):$(PROJECT_SOURCEDIR) $(latest)scalac : $(latest)scalac-jc $(latest)scalac : $(latest)scalac-sc @@ -623,8 +634,9 @@ $(latest)servlet-sc : $(SERVLET_SC_FILES) # Targets - scala tools TOOLS_NAME = tools +TOOLS_CLASSDIR = $($(prefix)_OBJECTDIR)/tools TOOLS_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(TOOLS_NAME).jar -TOOLS_JAR_INPUTDIR = $(JC_OUTPUTDIR) +TOOLS_JAR_INPUTDIR = $(TOOLS_CLASSDIR) TOOLS_JAR_FILES += ch TOOLS_JAR_FILES += scala/tools/dtd2scala TOOLS_JAR_FILES += scala/tools/scala4ant |