summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-08-06 14:41:17 +0000
committerpaltherr <paltherr@epfl.ch>2003-08-06 14:41:17 +0000
commitaa4c7a9ca2dc91eb3a46edaf9aa4a1b73cec5ea6 (patch)
treeba23c6db2a8a8e45d415b15b93a92967d6918d21 /Makefile
parentd809159c0fa224075c5d845968f88d3781e93bd6 (diff)
downloadscala-aa4c7a9ca2dc91eb3a46edaf9aa4a1b73cec5ea6.tar.gz
scala-aa4c7a9ca2dc91eb3a46edaf9aa4a1b73cec5ea6.tar.bz2
scala-aa4c7a9ca2dc91eb3a46edaf9aa4a1b73cec5ea6.zip
- Changed script generation code
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile43
1 files changed, 24 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 3d0f23ed3a..27b6842b84 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ SCRIPTS_WRAPPER_ALIASES += siris-debug
SCRIPTS_WRAPPER_ALIASES += surus
SCRIPTS_WRAPPER_ALIASES += surus-debug
SCRIPTS_WRAPPER_ALIASES += dtd2scala
+SCRIPTS_WRAPPER_MACRO = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(INSTALL_PREFIX)/%=$$PREFIX/%)"'@g
# automatic generation of Function<n>.java and Tuple<n>.scala files
FUNCTION_PREFIX = $(RUNTIME_ROOT)
@@ -222,28 +223,32 @@ $(PROJECT_OUTPUTDIR) :
$(LN) -s $(PROJECT_OUTPUTDIR_LINK) $(PROJECT_OUTPUTDIR),\
$(MKDIR) $(PROJECT_OUTPUTDIR))
-$(SCRIPTS_WRAPPER) : MACRO_VERSION ?= "development version"
-$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_CLASSES ?= $(PROJECT_OUTPUTDIR:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_DTD2SCALA_CLASSES ?= $(PROJECT_OUTPUTDIR:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_BCEL_CLASSES ?= $(BCEL_JARFILE:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_FJBG_CLASSES ?= $(FJBG_JARFILE:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_MSIL_CLASSES ?= $(MSIL_JARFILE:$(PROJECT_ROOT)%=$$PREFIX%)
-$(SCRIPTS_WRAPPER) : MACRO_XERCES_CLASSES ?= $(XERCES_JARFILE:$(PROJECT_ROOT)%=$$PREFIX%)
+$(SCRIPTS_WRAPPER) : INSTALL_PREFIX ?= $(PROJECT_ROOT)
+$(SCRIPTS_WRAPPER) : MACRO_VERSION ?= development version
+$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_SOURCES ?= $(PROJECT_SOURCEDIR)
+$(SCRIPTS_WRAPPER) : MACRO_RUNTIME_CLASSES ?= $(PROJECT_OUTPUTDIR)
+$(SCRIPTS_WRAPPER) : MACRO_DTD2SCALA_CLASSES ?= $(PROJECT_OUTPUTDIR)
+$(SCRIPTS_WRAPPER) : MACRO_BCEL_CLASSES ?= $(BCEL_JARFILE)
+$(SCRIPTS_WRAPPER) : MACRO_FJBG_CLASSES ?= $(FJBG_JARFILE)
+$(SCRIPTS_WRAPPER) : MACRO_MSIL_CLASSES ?= $(MSIL_JARFILE)
+$(SCRIPTS_WRAPPER) : MACRO_XERCES_CLASSES ?= $(XERCES_JARFILE)
$(SCRIPTS_WRAPPER) : MACRO_JAVA_ARGS ?= -enableassertions
-$(SCRIPTS_WRAPPER) : $(SCRIPTS_WRAPPER).tmpl $(PROJECT_ROOT)/Makefile
+$(SCRIPTS_WRAPPER) : $(PROJECT_ROOT)/Makefile
+$(SCRIPTS_WRAPPER) : $(PROJECT_ROOT)/Makefile.config
+$(SCRIPTS_WRAPPER) : $(PROJECT_ROOT)/Makefile.private
+$(SCRIPTS_WRAPPER) : $(SCRIPTS_WRAPPER).tmpl
$(RM) $@
- @$(ECHO) "Generating file $@"
+ @$(ECHO) "Generating file $@ $(PROJECT_ROOT)"
@$(SED) \
- -es@{#VERSION#}@'$(MACRO_VERSION)'@g \
- -es@{#RUNTIME_SOURCES#}@'$(MACRO_RUNTIME_SOURCES)'@g \
- -es@{#RUNTIME_CLASSES#}@'$(MACRO_RUNTIME_CLASSES)'@g \
- -es@{#DTD2SCALA_CLASSES#}@'$(MACRO_RUNTIME_CLASSES)'@g \
- -es@{#BCEL_CLASSES#}@'$(MACRO_BCEL_CLASSES)'@g \
- -es@{#FJBG_CLASSES#}@'$(MACRO_FJBG_CLASSES)'@g \
- -es@{#MSIL_CLASSES#}@'$(MACRO_MSIL_CLASSES)'@g \
- -es@{#XERCES_CLASSES#}@'$(MACRO_XERCES_CLASSES)'@g \
- -es@{#JAVA_ARGS#}@'$(MACRO_JAVA_ARGS)'@g \
+ $(call SCRIPTS_WRAPPER_MACRO,VERSION) \
+ $(call SCRIPTS_WRAPPER_MACRO,RUNTIME_SOURCES) \
+ $(call SCRIPTS_WRAPPER_MACRO,RUNTIME_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,DTD2SCALA_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,BCEL_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,FJBG_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,MSIL_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,XERCES_CLASSES) \
+ $(call SCRIPTS_WRAPPER_MACRO,JAVA_ARGS) \
$@.tmpl > $@
@macros=`$(SED) -n -es'@.*{#\(.*\)#}.*@\1@p' < $@`; \
if [ -n "$$macros" ]; then \