mk/rabbitmq-hexpm.mk: Extract plugin from rabbitmq-build.mk

This is necessary to load rabbitmq-hexpm.mk after erlang.mk. This should
fix the publish to Hex.pm.

Author: dumbbell

Makefile

@@ -40,6 +40,7 @@ ERLANG_MK_COMMIT = rabbitmq-tmp
 include mk/rabbitmq-components.mk
 include mk/rabbitmq-build.mk
 include erlang.mk
+include mk/rabbitmq-hexpm.mk
 include mk/rabbitmq-dist.mk
 include mk/rabbitmq-tools.mk
 

mk/rabbitmq-build.mk

@@ -87,53 +87,3 @@ ifdef JENKINS_HOME
 CT_OPTS += -ct_hooks cth_surefire
 export RABBITMQ_CT_SKIP_AS_ERROR = true
 endif
-
-# --------------------------------------------------------------------
-# Hex.pm.
-# --------------------------------------------------------------------
-
-.PHONY: hex-publish hex-publish-docs
-
-HEXPM_URL = https://github.com/rabbitmq/hexpm-cli/releases/download/v0.1.0/hexpm
-HEXPM_CLI = $(ERLANG_MK_TMP)/hexpm
-
-$(HEXPM_CLI):
-	$(gen_verbose) $(call core_http_get,$@,$(HEXPM_URL))
-	$(verbose) chmod +x $@
-
-rebar.config: dep_rabbit_common = hex $(PROJECT_VERSION)
-rebar.config: dep_amqp_client = hex $(PROJECT_VERSION)
-
-define RABBITMQ_HEXPM_DEFAULT_FILES
-	    "erlang.mk",
-	    "git-revisions.txt",
-	    "include",
-	    "LICENSE*",
-	    "Makefile",
-	    "rabbitmq-components.mk",
-	    "README",
-	    "README.md",
-	    "src"
-endef
-
-hex-publish: $(HEXPM_CLI) app rebar.config
-	$(gen_verbose) echo "$(PROJECT_DESCRIPTION) $(PROJECT_VERSION)" \
-		> git-revisions.txt
-ifneq ($(PROJECT),rabbit_common)
-	$(verbose) mv rabbitmq-components.mk rabbitmq-components.mk.not-hexpm
-	$(verbose) cp \
-		$(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.hexpm.mk \
-		rabbitmq-components.mk
-	$(verbose) touch -r rabbitmq-components.mk.not-hexpm \
-		rabbitmq-components.mk
-endif
-	$(verbose) trap '\
-		rm -f git-revisions.txt rebar.lock; \
-		if test -f rabbitmq-components.mk.not-hexpm; then \
-		  mv rabbitmq-components.mk.not-hexpm rabbitmq-components.mk; \
-		fi' EXIT INT; \
-		$(HEXPM_CLI) publish
-
-hex-publish-docs: $(HEXPM_CLI) app docs
-	$(gen_verbose) trap 'rm -f rebar.lock' EXIT INT; \
-		$(HEXPM_CLI) docs

mk/rabbitmq-hexpm.mk

@@ -0,0 +1,49 @@
+# --------------------------------------------------------------------
+# Hex.pm.
+# --------------------------------------------------------------------
+
+.PHONY: hex-publish hex-publish-docs
+
+HEXPM_URL = https://github.com/rabbitmq/hexpm-cli/releases/download/v0.1.0/hexpm
+HEXPM_CLI = $(ERLANG_MK_TMP)/hexpm
+
+$(HEXPM_CLI):
+	$(gen_verbose) $(call core_http_get,$@,$(HEXPM_URL))
+	$(verbose) chmod +x $@
+
+rebar.config: dep_rabbit_common = hex $(PROJECT_VERSION)
+rebar.config: dep_amqp_client = hex $(PROJECT_VERSION)
+
+define RABBITMQ_HEXPM_DEFAULT_FILES
+	    "erlang.mk",
+	    "git-revisions.txt",
+	    "include",
+	    "LICENSE*",
+	    "Makefile",
+	    "rabbitmq-components.mk",
+	    "README",
+	    "README.md",
+	    "src"
+endef
+
+hex-publish: $(HEXPM_CLI) app rebar.config
+	$(gen_verbose) echo "$(PROJECT_DESCRIPTION) $(PROJECT_VERSION)" \
+		> git-revisions.txt
+ifneq ($(PROJECT),rabbit_common)
+	$(verbose) mv rabbitmq-components.mk rabbitmq-components.mk.not-hexpm
+	$(verbose) cp \
+		$(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.hexpm.mk \
+		rabbitmq-components.mk
+	$(verbose) touch -r rabbitmq-components.mk.not-hexpm \
+		rabbitmq-components.mk
+endif
+	$(verbose) trap '\
+		rm -f git-revisions.txt rebar.lock; \
+		if test -f rabbitmq-components.mk.not-hexpm; then \
+		  mv rabbitmq-components.mk.not-hexpm rabbitmq-components.mk; \
+		fi' EXIT INT; \
+		$(HEXPM_CLI) publish
+
+hex-publish-docs: $(HEXPM_CLI) app docs
+	$(gen_verbose) trap 'rm -f rebar.lock' EXIT INT; \
+		$(HEXPM_CLI) docs

mk/rabbitmq-plugin.mk

@@ -2,6 +2,10 @@ ifeq ($(filter rabbitmq-build.mk,$(notdir $(MAKEFILE_LIST))),)
 include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-build.mk
 endif
 
+ifeq ($(filter rabbitmq-hexpm.mk,$(notdir $(MAKEFILE_LIST))),)
+include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-hexpm.mk
+endif
+
 ifeq ($(filter rabbitmq-dist.mk,$(notdir $(MAKEFILE_LIST))),)
 include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-dist.mk
 endif