From 6f9ee4c52066cdbec7c809363649ab30fda22db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Thu, 28 Apr 2022 11:46:47 +0200
Subject: fixup! Upgrade to Relx 4 which is now used as a library

---
 plugins/relx.mk | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'plugins/relx.mk')

diff --git a/plugins/relx.mk b/plugins/relx.mk
index eb560ff..de12ba1 100644
--- a/plugins/relx.mk
+++ b/plugins/relx.mk
@@ -6,11 +6,8 @@ ifeq ($(filter relx,$(BUILD_DEPS) $(DEPS) $(REL_DEPS)),relx)
 
 # Configuration.
 
-#RELX ?= $(ERLANG_MK_TMP)/relx
 RELX_CONFIG ?= $(CURDIR)/relx.config
 
-#RELX_URL ?= https://erlang.mk/res/relx-v3.27.0-22
-#RELX_OPTS ?=
 RELX_OUTPUT_DIR ?= _rel
 RELX_REL_EXT ?=
 RELX_TAR ?= 1
@@ -19,12 +16,6 @@ ifdef SFX
 	RELX_TAR = 1
 endif
 
-#ifeq ($(firstword $(RELX_OPTS)),-o)
-#	RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS))
-#else
-#	RELX_OPTS += -o $(RELX_OUTPUT_DIR)
-#endif
-
 # Core targets.
 
 ifeq ($(IS_DEP),)
@@ -39,10 +30,6 @@ distclean:: distclean-relx-rel
 
 # Plugin-specific targets.
 
-#$(RELX): | $(ERLANG_MK_TMP)
-#	$(gen_verbose) $(call core_http_get,$(RELX),$(RELX_URL))
-#	$(verbose) chmod +x $(RELX)
-
 define relx_release.erl
 	{ok, Config} = file:consult("$(call core_native_path,$(RELX_CONFIG))"),
 	{release, {Name, Vsn0}, _} = lists:keyfind(release, 1, Config),
@@ -78,26 +65,20 @@ define relx_relup.erl
 		{semver, _} -> "";
 		VsnStr -> Vsn0
 	end,
-	io:format("~p~n~n", [Vsn]),
 	{ok, _} = relx:build_relup(Name, Vsn, undefined, Config ++ [{output_dir, "$(RELX_OUTPUT_DIR)"}]),
 	halt(0).
 endef
 
 relx-rel: rel-deps app
-#	$(verbose) $(RELX) $(if $(filter 1,$V),-V 3) -c $(RELX_CONFIG) $(RELX_OPTS) release
 	$(call erlang,$(call relx_release.erl),-pa ebin/)
 	$(verbose) $(MAKE) relx-post-rel
 ifeq ($(RELX_TAR),1)
-#	$(verbose) touch $(RELX_OUTPUT_DIR)/$(PROJECT)_release/releases/RELEASES
-#	$(verbose) $(RELX) $(if $(filter 1,$V),-V 3) -c $(RELX_CONFIG) $(RELX_OPTS) tar
 	$(call erlang,$(call relx_tar.erl),-pa ebin/)
 endif
 
 relx-relup: rel-deps app
-#	$(verbose) $(RELX) $(if $(filter 1,$V),-V 3) -c $(RELX_CONFIG) $(RELX_OPTS) release
 	$(call erlang,$(call relx_release.erl),-pa ebin/)
 	$(MAKE) relx-post-rel
-#	$(verbose) $(RELX) $(if $(filter 1,$V),-V 3) -c $(RELX_CONFIG) $(RELX_OPTS) relup $(if $(filter 1,$(RELX_TAR)),tar)
 	$(call erlang,$(call relx_relup.erl),-pa ebin/)
 ifeq ($(RELX_TAR),1)
 	$(call erlang,$(call relx_tar.erl),-pa ebin/)
-- 
cgit v1.2.3