From bc59e69e317d5d583b3a6e38f3aa0ed6a9fae2c8 Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Wed, 24 Jan 2018 15:10:36 -0800 Subject: [PATCH 1/3] Revert "ssl_compat: Silence Dialyzer warning about ssl:connection_info/1" This reverts commit 44d02abe236e3d18276524d2fcfef9ace4820130. --- deps/rabbit_common/src/ssl_compat.erl | 3 --- 1 file changed, 3 deletions(-) diff --git a/deps/rabbit_common/src/ssl_compat.erl b/deps/rabbit_common/src/ssl_compat.erl index 095a75df73..23b8fa198f 100644 --- a/deps/rabbit_common/src/ssl_compat.erl +++ b/deps/rabbit_common/src/ssl_compat.erl @@ -19,9 +19,6 @@ %% We don't want warnings about the use of ssl:connection_info/1 in this %% module. -compile(nowarn_deprecated_function). --dialyzer({nowarn_function, - [connection_information_pre_18/1, - connection_information_pre_18/2]}). %% Declare versioned functions to allow dynamic code loading, %% depending on the Erlang version running. See 'code_version.erl' for details From 73e2e8931285f4e73bc78dd4d1ee5cd8a1834a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 30 Jan 2018 14:51:27 +0100 Subject: [PATCH 2/3] rabbitmq-components.mk: Compare branch names before updating `rabbitmq-components.mk` To avoid a copy of `rabbitmq-components.mk` from rabbitmq-common's `v3.6.x` branch to another component's `master` branch, we want to compare branch names of both repositories. This situation may occur when checking out the `v3.6.x` in the Umbrella using `gmake up BRANCH=v3.6.x` but for instance some plugins don't have such a branch. In this case, they remain on the previous branch. We don't want to overwrite their `rabbitmq-components.mk` if this happens. [#154761483] --- deps/rabbit_common/mk/rabbitmq-components.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deps/rabbit_common/mk/rabbitmq-components.mk b/deps/rabbit_common/mk/rabbitmq-components.mk index 833509f1ea..c619130d49 100644 --- a/deps/rabbit_common/mk/rabbitmq-components.mk +++ b/deps/rabbit_common/mk/rabbitmq-components.mk @@ -343,7 +343,16 @@ rabbitmq-components-mk: @: else rabbitmq-components-mk: +ifeq ($(FORCE),yes) $(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . +else + $(gen_verbose) if test -d .git && test -d $(DEPS_DIR)/rabbit_common/.git; then \ + upstream_branch=$$(LANG=C git -C $(DEPS_DIR)/rabbit_common branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ + local_branch=$$(LANG=C git branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ + test "$$local_branch" = "$$upstream_branch" || exit 0; \ + fi; \ + cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . +endif ifeq ($(DO_COMMIT),yes) $(verbose) git diff --quiet rabbitmq-components.mk \ || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk From cca83231f03630c91b7d7057f1bd6a5cdd16da12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 30 Jan 2018 14:54:37 +0100 Subject: [PATCH 3/3] rabbitmq-tools.mk: Move `rabbitmq-components.mk`-related targets there This way, we are sure that the possibly newer recipe in `rabbitmq-tools.mk` handles the operation instead of a possibly obsolete `rabbitmq-components.mk` copy. [#154761483] --- deps/rabbit_common/mk/rabbitmq-components.mk | 36 +------------------ deps/rabbit_common/mk/rabbitmq-tools.mk | 38 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/deps/rabbit_common/mk/rabbitmq-components.mk b/deps/rabbit_common/mk/rabbitmq-components.mk index c619130d49..378eda8cd4 100644 --- a/deps/rabbit_common/mk/rabbitmq-components.mk +++ b/deps/rabbit_common/mk/rabbitmq-components.mk @@ -302,7 +302,7 @@ prepare-dist:: @: # -------------------------------------------------------------------- -# rabbitmq-components.mk checks. +# Umbrella-specific settings. # -------------------------------------------------------------------- # If this project is under the Umbrella project, we override $(DEPS_DIR) @@ -324,37 +324,3 @@ ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) SKIP_DEPS = 1 endif endif - -UPSTREAM_RMQ_COMPONENTS_MK = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.mk - -ifeq ($(PROJECT),rabbit_common) -check-rabbitmq-components.mk: - @: -else -check-rabbitmq-components.mk: - $(verbose) cmp -s rabbitmq-components.mk \ - $(UPSTREAM_RMQ_COMPONENTS_MK) || \ - (echo "error: rabbitmq-components.mk must be updated!" 1>&2; \ - false) -endif - -ifeq ($(PROJECT),rabbit_common) -rabbitmq-components-mk: - @: -else -rabbitmq-components-mk: -ifeq ($(FORCE),yes) - $(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . -else - $(gen_verbose) if test -d .git && test -d $(DEPS_DIR)/rabbit_common/.git; then \ - upstream_branch=$$(LANG=C git -C $(DEPS_DIR)/rabbit_common branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ - local_branch=$$(LANG=C git branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ - test "$$local_branch" = "$$upstream_branch" || exit 0; \ - fi; \ - cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . -endif -ifeq ($(DO_COMMIT),yes) - $(verbose) git diff --quiet rabbitmq-components.mk \ - || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk -endif -endif diff --git a/deps/rabbit_common/mk/rabbitmq-tools.mk b/deps/rabbit_common/mk/rabbitmq-tools.mk index 00e1e967b3..8a8d1072ac 100644 --- a/deps/rabbit_common/mk/rabbitmq-tools.mk +++ b/deps/rabbit_common/mk/rabbitmq-tools.mk @@ -21,6 +21,44 @@ update-erlang-mk: erlang-mk fi; \ done +# -------------------------------------------------------------------- +# rabbitmq-components.mk checks. +# -------------------------------------------------------------------- + +UPSTREAM_RMQ_COMPONENTS_MK = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.mk + +ifeq ($(PROJECT),rabbit_common) +check-rabbitmq-components.mk: + @: +else +check-rabbitmq-components.mk: + $(verbose) cmp -s rabbitmq-components.mk \ + $(UPSTREAM_RMQ_COMPONENTS_MK) || \ + (echo "error: rabbitmq-components.mk must be updated!" 1>&2; \ + false) +endif + +ifeq ($(PROJECT),rabbit_common) +rabbitmq-components-mk: + @: +else +rabbitmq-components-mk: +ifeq ($(FORCE),yes) + $(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . +else + $(gen_verbose) if test -d .git && test -d $(DEPS_DIR)/rabbit_common/.git; then \ + upstream_branch=$$(LANG=C git -C $(DEPS_DIR)/rabbit_common branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ + local_branch=$$(LANG=C git branch --list | awk '/^\* \(.*detached / {ref=$$0; sub(/.*detached [^ ]+ /, "", ref); sub(/\)$$/, "", ref); print ref; exit;} /^\* / {ref=$$0; sub(/^\* /, "", ref); print ref; exit}'); \ + test "$$local_branch" = "$$upstream_branch" || exit 0; \ + fi; \ + cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . +endif +ifeq ($(DO_COMMIT),yes) + $(verbose) git diff --quiet rabbitmq-components.mk \ + || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk +endif +endif + update-rabbitmq-components-mk: rabbitmq-components-mk $(verbose) for repo in $(READY_DEPS:%=$(DEPS_DIR)/%); do \ ! test -f $$repo/rabbitmq-components.mk \