aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Hellkvist <[email protected]>2017-03-21 09:06:03 +0100
committerLoïc Hoguin <[email protected]>2017-04-25 14:20:07 +0200
commitbb1b6556c295be7e4be0bdaa1aeb973a67d00223 (patch)
treecb4c64187c5b4eb840cde8cf80320e09d1b247a4
parent047cab02fc27800d78d5b4f650b4ee684c652ce2 (diff)
downloaderlang.mk-bb1b6556c295be7e4be0bdaa1aeb973a67d00223.tar.gz
erlang.mk-bb1b6556c295be7e4be0bdaa1aeb973a67d00223.tar.bz2
erlang.mk-bb1b6556c295be7e4be0bdaa1aeb973a67d00223.zip
Make tar-ball generation optional with relx
-rw-r--r--plugins/relx.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/plugins/relx.mk b/plugins/relx.mk
index 6c7641c..8931e71 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -11,6 +11,11 @@ RELX_CONFIG ?= $(CURDIR)/relx.config
RELX_URL ?= https://github.com/erlware/relx/releases/download/v3.19.0/relx
RELX_OPTS ?=
RELX_OUTPUT_DIR ?= _rel
+RELX_TAR ?= 1
+
+ifdef SFX
+ RELX_TAR = 1
+endif
ifeq ($(firstword $(RELX_OPTS)),-o)
RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS))
@@ -37,10 +42,18 @@ $(RELX):
$(verbose) chmod +x $(RELX)
relx-rel: $(RELX) rel-deps app
+ifeq ($(RELX_TAR),1)
$(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release tar
+else
+ $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release
+endif
relx-relup: $(RELX) rel-deps app
+ifeq ($(RELX_TAR),1)
$(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release relup tar
+else
+ $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) release relup
+endif
distclean-relx-rel:
$(gen_verbose) rm -rf $(RELX_OUTPUT_DIR)