Update rabbitmq-components.mk

1 files changed, 75 insertions, 20 deletions

diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 6d081e143d..dd3e40b48c 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -28,37 +28,61 @@ endif
 
 RABBITMQ_REPO_BASE ?= https://github.com/rabbitmq
 
-dep_amqp_client                    = git_rmq rabbitmq-erlang-client $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbit                         = git_rmq rabbitmq-server $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbit_common                  = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_amqp1_0               = git_rmq rabbitmq-amqp1.0 $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_codegen               = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_federation            = git_rmq rabbitmq-federation $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_federation_management = git_rmq rabbitmq-federation-management $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_java_client           = git_rmq rabbitmq-java-client $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_management            = git_rmq rabbitmq-management $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_management_agent      = git_rmq rabbitmq-management-agent $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_management_visualiser = git_rmq rabbitmq-management-visualiser $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_shovel                = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_shovel_management     = git_rmq rabbitmq-shovel-management $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_test                  = git_rmq rabbitmq-test $(current_rmq_ref) $(base_rmq_ref)
-dep_rabbitmq_web_dispatch          = git_rmq rabbitmq-web-dispatch $(current_rmq_ref) $(base_rmq_ref)
+dep_amqp_client                       = git_rmq rabbitmq-erlang-client $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbit                            = git_rmq rabbitmq-server $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbit_common                     = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_amqp1_0                  = git_rmq rabbitmq-amqp1.0 $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_auth_backend_ldap        = git_rmq rabbitmq-auth-backend-ldap $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_auth_mechanism_ssl       = git_rmq rabbitmq-auth-mechanism-ssl $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_codegen                  = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_federation               = git_rmq rabbitmq-federation $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_federation_management    = git_rmq rabbitmq-federation-management $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_java_client              = git_rmq rabbitmq-java-client $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_management               = git_rmq rabbitmq-management $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_management_agent         = git_rmq rabbitmq-management-agent $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_management_visualiser    = git_rmq rabbitmq-management-visualiser $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_metronome                = git_rmq rabbitmq-metronome $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_mqtt                     = git_rmq rabbitmq-mqtt $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_shovel                   = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_shovel_management        = git_rmq rabbitmq-shovel-management $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_stomp                    = git_rmq rabbitmq-stomp $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_toke                     = git_rmq rabbitmq-toke $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_tracing                  = git_rmq rabbitmq-tracing $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_test                     = git_rmq rabbitmq-test $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_web_dispatch             = git_rmq rabbitmq-web-dispatch $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_web_stomp                = git_rmq rabbitmq-web-stomp $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_web_stomp_examples       = git_rmq rabbitmq-web-stomp-examples $(current_rmq_ref) $(base_rmq_ref)
+dep_sockjs                            = git_rmq sockjs-erlang $(current_rmq_ref) $(base_rmq_ref)
+dep_toke                              = git_rmq toke $(current_rmq_ref) $(base_rmq_ref)
 
 RABBITMQ_COMPONENTS = amqp_client \
 		      rabbit \
 		      rabbit_common \
 		      rabbitmq_amqp1_0 \
+		      rabbitmq_auth_backend_ldap \
+		      rabbitmq_auth_mechanism_ssl \
 		      rabbitmq_codegen \
+		      rabbitmq_consistent_hash_exchange \
 		      rabbitmq_federation \
 		      rabbitmq_federation_management \
 		      rabbitmq_java_client \
 		      rabbitmq_management \
 		      rabbitmq_management_agent \
 		      rabbitmq_management_visualiser \
+		      rabbitmq_metronome \
+		      rabbitmq_mqtt \
 		      rabbitmq_shovel \
 		      rabbitmq_shovel_management \
+		      rabbitmq_stomp \
 		      rabbitmq_test \
-		      rabbitmq_web_dispatch
+		      rabbitmq_toke \
+		      rabbitmq_tracing \
+		      rabbitmq_web_dispatch \
+		      rabbitmq_web_stomp \
+		      rabbitmq_web_stomp_examples \
+		      sockjs \
+		      toke
 
 ifeq ($(origin current_rmq_ref),undefined)
 ifneq ($(wildcard .git),)
@@ -103,6 +127,30 @@ define dep_fetch_git_rmq
 endef
 
 # --------------------------------------------------------------------
+# Component usage.
+# --------------------------------------------------------------------
+
+# We need to pass the location of codegen to the Java client ant
+# process.
+CODEGEN_DIR = $(DEPS_DIR)/rabbitmq_codegen
+PYTHONPATH = $(CODEGEN_DIR)
+export PYTHONPATH
+
+ANT ?= ant
+ANT_FLAGS += -Dsibling.codegen.dir=$(CODEGEN_DIR)
+export ANT ANT_FLAGS
+
+ifeq ($(PROJECT),rabbit)
+RABBITMQ_SCRIPTS_DIR ?= $(CURDIR)/scripts
+else
+RABBITMQ_SCRIPTS_DIR ?= $(DEPS_DIR)/rabbit/scripts
+endif
+
+RABBITMQCTL ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmqctl
+RABBITMQ_PLUGINS ?= $(RABBITMQ_SCRIPTS_DIR)/rabbitmq-plugins
+export RABBITMQ_SCRIPTS_DIR RABBITMQCTL RABBITMQ_PLUGINS
+
+# --------------------------------------------------------------------
 # Component distribution.
 # --------------------------------------------------------------------
 
@@ -116,8 +164,9 @@ prepare-dist::
 # Run a RabbitMQ node (moved from rabbitmq-run.mk as a workaround).
 # --------------------------------------------------------------------
 
-# Add "rabbit" to the build dependencies when the user wants to start a
-# broker.
+# Add "rabbit" to the build dependencies when the user wants to start
+# a broker or to the test dependencies when the user wants to test a
+# project.
 #
 # NOTE: This should belong to rabbitmq-run.mk. Unfortunately, it is
 # loaded *after* erlang.mk which is too late to add a dependency. That's
@@ -125,7 +174,7 @@ prepare-dist::
 # broker and add "rabbit" to the dependencies in this case.
 
 ifneq ($(PROJECT),rabbit)
-ifeq ($(filter rabbit,$(DEPS)),)
+ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),)
 RUN_RMQ_TARGETS = run-broker \
 		  run-background-broker \
 		  run-node \
@@ -136,10 +185,16 @@ ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),)
 BUILD_DEPS += rabbit
 endif
 endif
+
+ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
+ifneq ($(filter tests tests-with-broker,$(MAKECMDGOALS)),)
+TEST_DEPS += rabbit
+endif
+endif
 endif
 
 ifeq ($(filter rabbit_public_umbrella rabbit rabbit_common rabbitmq_test,$(PROJECT)),)
-ifeq ($(filter rabbitmq_test,$(DEPS)),)
+ifeq ($(filter rabbitmq_test,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
 TEST_DEPS += rabbitmq_test
 endif
 endif