diff options
| author | paltherr <paltherr@epfl.ch> | 2004-09-15 16:03:54 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-09-15 16:03:54 +0000 |
| commit | eed5ff3582546afc17f2f7ed0c5ec99a0f642c6d (patch) | |
| tree | 175f1447c32026da7e768db1f16d219bed6ba66d /Makefile | |
| parent | 2cbdc0ba3b93ed6dc7ed85758ce34ee8e020fb74 (diff) | |
| download | scala-eed5ff3582546afc17f2f7ed0c5ec99a0f642c6d.tar.gz scala-eed5ff3582546afc17f2f7ed0c5ec99a0f642c6d.tar.bz2 scala-eed5ff3582546afc17f2f7ed0c5ec99a0f642c6d.zip | |
- Changed scala_wrapper so that tools are run a...
- Changed scala_wrapper so that tools are run as normal scala programs
- Added support for SCALA_SOURCEPATH & SCALA_EXTDIRS Added properties
- "scala.library.source.path" & "scala.library.class.path" Improved
- computation of default bootclasspath Changed scalap to used ClassPath
- from scala.tools.util
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -299,12 +299,15 @@ $(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 ?= $(LIBRARY_CLASSDIR) +$(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_FJBG_CLASSES ?= $(FJBG_JARFILE) $(SCRIPTS_WRAPPER_FILE) : MACRO_MSIL_CLASSES ?= $(MSIL_JARFILE) +$(SCRIPTS_WRAPPER_FILE) : MACRO_JAVA_CMD ?= java $(SCRIPTS_WRAPPER_FILE) : MACRO_JAVA_ARGS ?= -enableassertions +$(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_CMD ?= $$PREFIX/bin/scala +$(SCRIPTS_WRAPPER_FILE) : MACRO_SCALA_ARGS ?= $(SCRIPTS_WRAPPER_FILE) : $(VERSION_FILE) $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile $(SCRIPTS_WRAPPER_FILE) : $(PROJECT_ROOT)/Makefile.config @@ -316,12 +319,15 @@ $(SCRIPTS_WRAPPER_FILE) : $(SCRIPTS_TEMPLATE_FILE) @$(ECHO) "Generating file $@" @$(SED) \ $(call SCRIPTS_MACRO,VERSION) \ - $(call SCRIPTS_MACRO,RUNTIME_SOURCES) \ - $(call SCRIPTS_MACRO,RUNTIME_CLASSES) \ + $(call SCRIPTS_MACRO,LIBRARY_SOURCES) \ + $(call SCRIPTS_MACRO,LIBRARY_CLASSES) \ $(call SCRIPTS_MACRO,TOOLS_CLASSES) \ $(call SCRIPTS_MACRO,FJBG_CLASSES) \ $(call SCRIPTS_MACRO,MSIL_CLASSES) \ + $(call SCRIPTS_MACRO,JAVA_CMD) \ $(call SCRIPTS_MACRO,JAVA_ARGS) \ + $(call SCRIPTS_MACRO,SCALA_CMD) \ + $(call SCRIPTS_MACRO,SCALA_ARGS) \ $(SCRIPTS_TEMPLATE_FILE) > $@ @macros=`$(SED) -n -es'@.*{#\(.*\)#}.*@\1@p' < $@`; \ if [ -n "$$macros" ]; then \ |