diff options
| author | paltherr <paltherr@epfl.ch> | 2003-03-17 12:28:57 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-03-17 12:28:57 +0000 |
| commit | 4b69de24fd70581901c660187c36cd5eac5a5c30 (patch) | |
| tree | b73b9397f5ba19b7927757ccb0ed3ce496dcf0bf /support/make | |
| parent | bca74f068d1106d4977d74a661ea316a59ef90da (diff) | |
| download | scala-4b69de24fd70581901c660187c36cd5eac5a5c30.tar.gz scala-4b69de24fd70581901c660187c36cd5eac5a5c30.tar.bz2 scala-4b69de24fd70581901c660187c36cd5eac5a5c30.zip | |
- Fixed usage of flag -C
- Added code to create destination directory if necessary Added code to
- remove archive on build failure
Diffstat (limited to 'support/make')
| -rw-r--r-- | support/make/jar.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/support/make/jar.mk b/support/make/jar.mk index 7fadaaa3ef..7297bd5cfd 100644 --- a/support/make/jar.mk +++ b/support/make/jar.mk @@ -6,7 +6,7 @@ ############################################################################## # Usage # -# make jc [target=<target>] {<VARIABLE>=<value>} +# make jar [target=<target>] {<VARIABLE>=<value>} # ############################################################################## # Variables @@ -51,6 +51,7 @@ jar_FLAGS = $(call JAR_LOOKUP,JAR_FLAGS) jar_ARCHIVE = $(call JAR_LOOKUP,JAR_ARCHIVE) jar_MANIFEST = $(call JAR_LOOKUP,JAR_MANIFEST) jar_INPUTDIR = $(call JAR_LOOKUP,JAR_INPUTDIR) +jar_inputdir = $(jar_INPUTDIR:%=-C %) jar_FILES = $(call JAR_LOOKUP,JAR_FILES) ############################################################################## @@ -59,8 +60,7 @@ jar_FILES = $(call JAR_LOOKUP,JAR_FILES) jar += c$(jar_FLAGS)f$(jar_MANIFEST:%=m) jar += $(jar_ARCHIVE) jar += $(jar_MANIFEST) -jar += $(jar_INPUTDIR:%=-C %) -jar += $(jar_FILES) +jar += $(jar_FILES:%=$(jar_inputdir) %) ############################################################################## # Functions @@ -71,7 +71,8 @@ JAR_LOOKUP = $(if $($(target)_$(1)),$($(target)_$(1)),$($(1))) # Rules jar: - $(strip $(jar)) + @[ -d "$(dir $(jar_ARCHIVE))" ] || $(MKDIR) -p "$(dir $(jar_ARCHIVE))" + $(strip $(jar)) || ( $(RM) $(jar_ARCHIVE) && exit 1 ) .PHONY : jar |