summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-09-24 11:47:26 +0200
committerJean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>2015-10-20 11:10:48 +0200
commit997a6d6c9cc3a05941014b26217c11d75f040032 (patch)
tree53bcf1459bca76d8a4755598f6e071643005df9e /Makefile
parentdcfbd47319d1fa54d41a2d9ec67b09a5c7dff13e (diff)
downloadrabbitmq-server-git-997a6d6c9cc3a05941014b26217c11d75f040032.tar.gz
Use rabbitmq-components.mk to fetch RabbitMQ components
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 1 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 1f09ec7b5f..010759514f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,27 +13,6 @@ DEPS += $(SRCDIST_DEPS)
endif
endif
-# For RabbitMQ repositories, we want to checkout branches which match
-# the parent porject. For instance, if the parent project is on a
-# release tag, dependencies must be on the same release tag. If the
-# parent project is on a topic branch, dependencies must be on the same
-# topic branch or fallback to `stable` or `master` whichever was the
-# base of the topic branch.
-
-ifeq ($(wildcard git-revisions.txt),)
-ifeq ($(origin current_rmq_ref),undefined)
-current_rmq_ref := $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
-export current_rmq_ref
-endif
-ifeq ($(origin base_rmq_ref),undefined)
-base_rmq_ref := $(shell git merge-base --is-ancestor $$(git merge-base master HEAD) stable && echo stable || echo master)
-export base_rmq_ref
-endif
-endif
-
-dep_rabbit_common = git https://github.com/rabbitmq/rabbitmq-common.git $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_shovel = git https://github.com/rabbitmq/rabbitmq-shovel.git $(current_rmq_ref) $(base_rmq_ref)
-
define usage_xml_to_erl
$(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1))))
endef
@@ -63,6 +42,7 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-run.mk \
ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git
ERLANG_MK_COMMIT = rabbitmq-tmp
+include rabbitmq-components.mk
include erlang.mk
# --------------------------------------------------------------------