Merge branch 'stable' into rabbitmq-management-236
This commit is contained in:
Jean-Sébastien Pédron
commit
9d7f649d42
|
|
@ -11,6 +11,7 @@ otp_release:
|
|||
- "R16B03-1"
|
||||
- "17.5"
|
||||
- "18.0"
|
||||
- "19.0"
|
||||
|
||||
# The checkout made by Travis is a "detached HEAD" and branches
|
||||
# information is missing. Our Erlang.mk's git_rmq fetch method relies on
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
PROJECT = rabbitmq_web_dispatch
|
||||
|
||||
DEPS = cowboy
|
||||
DEPS = rabbit_common rabbit cowboy
|
||||
TEST_DEPS = rabbitmq_ct_helpers
|
||||
dep_cowboy_commit = 1.0.3
|
||||
|
||||
# FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.
|
||||
# See rabbitmq-components.mk.
|
||||
BUILD_DEPS += ranch
|
||||
|
||||
TEST_DEPS = rabbit amqp_client
|
||||
|
||||
DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
|
||||
|
||||
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
# Do *not* comment or remove core modules
|
||||
# unless you know what you are doing.
|
||||
#
|
||||
# Feel free to comment plugins out however.
|
||||
|
||||
# Core modules.
|
||||
core/core
|
||||
index/*
|
||||
core/index
|
||||
core/deps
|
||||
|
||||
# Plugins that must run before Erlang code gets compiled.
|
||||
plugins/erlydtl
|
||||
plugins/protobuffs
|
||||
|
||||
# Core modules, continued.
|
||||
core/erlc
|
||||
core/docs
|
||||
core/rel
|
||||
core/test
|
||||
core/compat
|
||||
|
||||
# Plugins.
|
||||
plugins/asciidoc
|
||||
plugins/bootstrap
|
||||
plugins/c_src
|
||||
plugins/ci
|
||||
plugins/ct
|
||||
plugins/dialyzer
|
||||
plugins/edoc
|
||||
plugins/elvis
|
||||
plugins/escript
|
||||
# plugins/eunit
|
||||
plugins/relx
|
||||
plugins/shell
|
||||
plugins/triq
|
||||
plugins/xref
|
||||
|
||||
# Plugins enhancing the functionality of other plugins.
|
||||
plugins/cover
|
||||
|
||||
# Core modules which can use variables from plugins.
|
||||
core/deps-tools
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,16 +5,6 @@ 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
|
||||
endif
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# RabbitMQ components.
|
||||
# --------------------------------------------------------------------
|
||||
|
|
@ -38,6 +28,7 @@ dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $
|
|||
dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(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_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 +50,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
|
||||
|
|
@ -98,6 +90,7 @@ RABBITMQ_COMPONENTS = amqp_client \
|
|||
rabbitmq_clusterer \
|
||||
rabbitmq_codegen \
|
||||
rabbitmq_consistent_hash_exchange \
|
||||
rabbitmq_ct_helpers \
|
||||
rabbitmq_delayed_message_exchange \
|
||||
rabbitmq_dotnet_client \
|
||||
rabbitmq_event_exchange \
|
||||
|
|
@ -119,6 +112,7 @@ 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 \
|
||||
|
|
@ -245,56 +239,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-tls-broker \
|
||||
run-background-broker \
|
||||
run-node \
|
||||
run-background-node \
|
||||
start-background-node \
|
||||
start-background-broker \
|
||||
start-rabbit-on-node
|
||||
|
||||
ifneq ($(filter $(RUN_RMQ_TARGETS),$(MAKECMDGOALS)),)
|
||||
BUILD_DEPS += rabbit
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(filter rabbit,$(DEPS) $(BUILD_DEPS) $(TEST_DEPS)),)
|
||||
ifneq ($(filter check tests,$(MAKECMDGOALS)),)
|
||||
TEST_DEPS += rabbit
|
||||
endif
|
||||
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.
|
||||
|
|
@ -308,11 +256,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)),)
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
{registered, []},
|
||||
{mod, {rabbit_web_dispatch_app, []}},
|
||||
{env, []},
|
||||
{applications, [kernel, stdlib, cowboy]}]}.
|
||||
{applications, [kernel, stdlib, rabbit_common, rabbit, cowboy]}]}.
|
||||
|
|
|
|||
Loading…
Reference in New Issue