Fix build
Update erlang.mk, rabbitmq-components.mk, and add rabbitmq_ct_helpers as a test dependency.
This commit is contained in:
Arnaud Cogoluègnes
parent
ee432acfa9
commit
b36ef56b5f
|
|
@ -1,7 +1,7 @@
|
|||
PROJECT = rabbitmq_auth_backend_cache
|
||||
|
||||
DEPS = rabbit_common
|
||||
TEST_DEPS += rabbit
|
||||
TEST_DEPS += rabbit rabbitmq_ct_helpers
|
||||
|
||||
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,14 +5,25 @@ ifeq ($(.DEFAULT_GOAL),)
|
|||
.DEFAULT_GOAL = all
|
||||
endif
|
||||
|
||||
# Automatically add rabbitmq-common to the dependencies, at least for
|
||||
# the Makefiles.
|
||||
ifneq ($(PROJECT),rabbit_common)
|
||||
ifneq ($(PROJECT),rabbitmq_public_umbrella)
|
||||
ifeq ($(filter rabbit_common,$(DEPS)),)
|
||||
DEPS += rabbit_common
|
||||
endif
|
||||
endif
|
||||
# PROJECT_VERSION defaults to:
|
||||
# 1. the version exported by rabbitmq-server-release;
|
||||
# 2. the version stored in `git-revisions.txt`, if it exists;
|
||||
# 3. a version based on git-describe(1), if it is a Git clone;
|
||||
# 4. 0.0.0
|
||||
|
||||
PROJECT_VERSION := $(RABBITMQ_VERSION)
|
||||
|
||||
ifeq ($(PROJECT_VERSION),)
|
||||
PROJECT_VERSION := $(shell \
|
||||
if test -f git-revisions.txt; then \
|
||||
head -n1 git-revisions.txt | \
|
||||
awk '{print $$$(words $(PROJECT_DESCRIPTION) version);}'; \
|
||||
else \
|
||||
(git describe --dirty --abbrev=7 --tags --always --first-parent \
|
||||
2>/dev/null || echo rabbitmq_v0_0_0) | \
|
||||
sed -e 's/^rabbitmq_v//' -e 's/^v//' -e 's/_/./g' -e 's/-/+/' \
|
||||
-e 's/-/./g'; \
|
||||
fi)
|
||||
endif
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
|
|
@ -36,8 +47,11 @@ dep_rabbitmq_auth_backend_ldap = git_rmq rabbitmq-auth-backend-ldap $(cur
|
|||
dep_rabbitmq_auth_mechanism_ssl = git_rmq rabbitmq-auth-mechanism-ssl $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_cli = git_rmq rabbitmq-cli $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_ct_client_helpers = git_rmq rabbitmq-ct-client-helpers $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_ct_helpers = git_rmq rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_delayed_message_exchange = git_rmq rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_dotnet_client = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_event_exchange = git_rmq rabbitmq-event-exchange $(current_rmq_ref) $(base_rmq_ref) master
|
||||
|
|
@ -59,6 +73,7 @@ dep_rabbitmq_objc_client = git_rmq rabbitmq-objc-client $(current_r
|
|||
dep_rabbitmq_recent_history_exchange = git_rmq rabbitmq-recent-history-exchange $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_routing_node_stamp = git_rmq rabbitmq-routing-node-stamp $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_rtopic_exchange = git_rmq rabbitmq-rtopic-exchange $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_server_release = git_rmq rabbitmq-server-release $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_sharding = git_rmq rabbitmq-sharding $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_shovel = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref) master
|
||||
dep_rabbitmq_shovel_management = git_rmq rabbitmq-shovel-management $(current_rmq_ref) $(base_rmq_ref) master
|
||||
|
|
@ -79,12 +94,16 @@ dep_toke = git_rmq toke $(current_rmq_ref) $(base_r
|
|||
|
||||
dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(current_rmq_ref) $(base_rmq_ref) master
|
||||
|
||||
# FIXME: As of 2015-11-20, we depend on Ranch 1.2.1, but erlang.mk
|
||||
# defaults to Ranch 1.1.0. All projects depending indirectly on Ranch
|
||||
# needs to add "ranch" as a BUILD_DEPS. The list of projects needing
|
||||
# this workaround are:
|
||||
# o rabbitmq-web-stomp
|
||||
dep_ranch = git https://github.com/ninenines/ranch 1.2.1
|
||||
# Third-party dependencies version pinning.
|
||||
#
|
||||
# We do that in this file, which is copied in all projects, to ensure
|
||||
# all projects use the same versions. It avoids conflicts and makes it
|
||||
# possible to work with rabbitmq-public-umbrella.
|
||||
|
||||
dep_cowboy_commit = 1.0.4
|
||||
dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2
|
||||
dep_ranch_commit = 1.3.0
|
||||
dep_webmachine_commit = 1.10.8p2
|
||||
|
||||
RABBITMQ_COMPONENTS = amqp_client \
|
||||
rabbit \
|
||||
|
|
@ -96,8 +115,11 @@ RABBITMQ_COMPONENTS = amqp_client \
|
|||
rabbitmq_auth_mechanism_ssl \
|
||||
rabbitmq_boot_steps_visualiser \
|
||||
rabbitmq_clusterer \
|
||||
rabbitmq_cli \
|
||||
rabbitmq_codegen \
|
||||
rabbitmq_consistent_hash_exchange \
|
||||
rabbitmq_ct_client_helpers \
|
||||
rabbitmq_ct_helpers \
|
||||
rabbitmq_delayed_message_exchange \
|
||||
rabbitmq_dotnet_client \
|
||||
rabbitmq_event_exchange \
|
||||
|
|
@ -119,11 +141,11 @@ RABBITMQ_COMPONENTS = amqp_client \
|
|||
rabbitmq_recent_history_exchange \
|
||||
rabbitmq_routing_node_stamp \
|
||||
rabbitmq_rtopic_exchange \
|
||||
rabbitmq_server_release \
|
||||
rabbitmq_sharding \
|
||||
rabbitmq_shovel \
|
||||
rabbitmq_shovel_management \
|
||||
rabbitmq_stomp \
|
||||
rabbitmq_test \
|
||||
rabbitmq_toke \
|
||||
rabbitmq_top \
|
||||
rabbitmq_tracing \
|
||||
|
|
@ -246,59 +268,10 @@ list-dist-deps::
|
|||
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 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
|
||||
# why rabbitmq-components.mk knows the list of targets which start a
|
||||
# broker and add "rabbit" to the dependencies in this case.
|
||||
|
||||
ifneq ($(PROJECT),rabbit)
|
||||
ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS)),)
|
||||
RUN_RMQ_TARGETS = run-broker \
|
||||
run-background-broker \
|
||||
run-node \
|
||||
run-background-node \
|
||||
start-background-node
|
||||
|
||||
ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),)
|
||||
BUILD_DEPS += rabbit
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
|
||||
ifneq ($(filter check tests tests-with-broker test,$(MAKECMDGOALS)),)
|
||||
TEST_DEPS += rabbit
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(filter rabbit_public_umbrella amqp_client rabbit_common rabbitmq_test,$(PROJECT)),)
|
||||
ifeq ($(filter rabbitmq_test,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
|
||||
TEST_DEPS += rabbitmq_test
|
||||
endif
|
||||
endif
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# rabbitmq-components.mk checks.
|
||||
# --------------------------------------------------------------------
|
||||
|
||||
ifeq ($(PROJECT),rabbit_common)
|
||||
else ifdef SKIP_RMQCOMP_CHECK
|
||||
else ifeq ($(IS_DEP),1)
|
||||
else ifneq ($(filter co up,$(MAKECMDGOALS)),)
|
||||
else
|
||||
# In all other cases, rabbitmq-components.mk must be in sync.
|
||||
deps:: check-rabbitmq-components.mk
|
||||
fetch-deps: check-rabbitmq-components.mk
|
||||
endif
|
||||
|
||||
# If this project is under the Umbrella project, we override $(DEPS_DIR)
|
||||
# to point to the Umbrella's one. We also disable `make distclean` so
|
||||
# $(DEPS_DIR) is not accidentally removed.
|
||||
|
|
@ -312,11 +285,6 @@ endif
|
|||
ifeq ($(UNDER_UMBRELLA),1)
|
||||
ifneq ($(PROJECT),rabbitmq_public_umbrella)
|
||||
DEPS_DIR ?= $(abspath ..)
|
||||
|
||||
distclean:: distclean-components
|
||||
@:
|
||||
|
||||
distclean-components:
|
||||
endif
|
||||
|
||||
ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),)
|
||||
|
|
|
|||
Loading…
Reference in New Issue