From b636f41ef22c3a667e30e9825b56be71612d2f8a Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 29 Apr 2024 12:47:10 +0200 Subject: [PATCH 1/5] Allow adding rabbitmqctl to PLT_APPS --- deps/rabbit_common/mk/rabbitmq-early-test.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/rabbit_common/mk/rabbitmq-early-test.mk b/deps/rabbit_common/mk/rabbitmq-early-test.mk index 4bdd20b0c4..775574d466 100644 --- a/deps/rabbit_common/mk/rabbitmq-early-test.mk +++ b/deps/rabbit_common/mk/rabbitmq-early-test.mk @@ -16,6 +16,8 @@ endif DIALYZER_OPTS ?= -Werror_handling +dialyze: ERL_LIBS := $(ERL_LIBS):$(DEPS_DIR):$(DEPS_DIR)/rabbitmq_cli/_build/dev/lib:$(dir $(shell elixir --eval ":io.format '~s~n', [:code.lib_dir :elixir ]")) + # -------------------------------------------------------------------- # %-on-concourse dependencies. # -------------------------------------------------------------------- From 6a9d668def3cb88556451ce70df47d066f4937c9 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 29 Apr 2024 14:54:28 +0200 Subject: [PATCH 2/5] Set PLT_APPS in a number of plugins where it was missing --- deps/rabbitmq_auth_backend_oauth2/Makefile | 2 ++ deps/rabbitmq_consistent_hash_exchange/Makefile | 2 ++ deps/rabbitmq_management_agent/Makefile | 3 +++ deps/rabbitmq_mqtt/Makefile | 2 ++ deps/rabbitmq_recent_history_exchange/Makefile | 2 ++ deps/rabbitmq_shovel/Makefile | 2 ++ deps/rabbitmq_stomp/Makefile | 2 ++ deps/rabbitmq_stream/Makefile | 2 ++ deps/rabbitmq_web_mqtt/Makefile | 2 ++ 9 files changed, 19 insertions(+) diff --git a/deps/rabbitmq_auth_backend_oauth2/Makefile b/deps/rabbitmq_auth_backend_oauth2/Makefile index cffbaf782d..d262845f2c 100644 --- a/deps/rabbitmq_auth_backend_oauth2/Makefile +++ b/deps/rabbitmq_auth_backend_oauth2/Makefile @@ -10,6 +10,8 @@ BUILD_DEPS = rabbit_common oauth2_client DEPS = rabbit cowlib jose base64url oauth2_client TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt +PLT_APPS += rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_consistent_hash_exchange/Makefile b/deps/rabbitmq_consistent_hash_exchange/Makefile index f0e0d01d4d..463bc1894c 100644 --- a/deps/rabbitmq_consistent_hash_exchange/Makefile +++ b/deps/rabbitmq_consistent_hash_exchange/Makefile @@ -8,6 +8,8 @@ endef DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client +PLT_APPS += mnesia rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_management_agent/Makefile b/deps/rabbitmq_management_agent/Makefile index 05906c2ab5..13531dd7da 100644 --- a/deps/rabbitmq_management_agent/Makefile +++ b/deps/rabbitmq_management_agent/Makefile @@ -20,6 +20,9 @@ endef DEPS = rabbit_common rabbit rabbitmq_web_dispatch TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers LOCAL_DEPS += xmerl ranch ssl crypto public_key + +PLT_APPS += rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_mqtt/Makefile b/deps/rabbitmq_mqtt/Makefile index cc4ea6b89e..a7d0cd0ecc 100644 --- a/deps/rabbitmq_mqtt/Makefile +++ b/deps/rabbitmq_mqtt/Makefile @@ -47,6 +47,8 @@ LOCAL_DEPS = ssl DEPS = ranch rabbit_common rabbit ra amqp10_common TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp_client rabbitmq_stomp rabbitmq_stream +PLT_APPS += rabbitmqctl + dep_ct_helper = git https://github.com/extend/ct_helper.git master dep_emqtt = git https://github.com/rabbitmq/emqtt.git master diff --git a/deps/rabbitmq_recent_history_exchange/Makefile b/deps/rabbitmq_recent_history_exchange/Makefile index 9ee096ea92..045382e11b 100644 --- a/deps/rabbitmq_recent_history_exchange/Makefile +++ b/deps/rabbitmq_recent_history_exchange/Makefile @@ -8,6 +8,8 @@ endef DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client +PLT_APPS += mnesia + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_shovel/Makefile b/deps/rabbitmq_shovel/Makefile index d21c016998..00e39ad42c 100644 --- a/deps/rabbitmq_shovel/Makefile +++ b/deps/rabbitmq_shovel/Makefile @@ -25,6 +25,8 @@ LOCAL_DEPS = crypto TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers meck +PLT_APPS += rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk elvis_mk dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master diff --git a/deps/rabbitmq_stomp/Makefile b/deps/rabbitmq_stomp/Makefile index 753ffcf489..4624f77b22 100644 --- a/deps/rabbitmq_stomp/Makefile +++ b/deps/rabbitmq_stomp/Makefile @@ -33,6 +33,8 @@ endef DEPS = ranch rabbit_common rabbit amqp_client TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers +PLT_APPS += rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_stream/Makefile b/deps/rabbitmq_stream/Makefile index 549e590ff1..e93b34c12d 100644 --- a/deps/rabbitmq_stream/Makefile +++ b/deps/rabbitmq_stream/Makefile @@ -25,6 +25,8 @@ LOCAL_DEPS = ssl DEPS = rabbit rabbitmq_stream_common osiris ranch TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client amqp10_client +PLT_APPS += rabbitmqctl + DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_web_mqtt/Makefile b/deps/rabbitmq_web_mqtt/Makefile index 899aadb930..879d5ebfba 100644 --- a/deps/rabbitmq_web_mqtt/Makefile +++ b/deps/rabbitmq_web_mqtt/Makefile @@ -21,6 +21,8 @@ LOCAL_DEPS = ssl DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt TEST_DEPS = emqtt rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management +PLT_APPS += rabbitmqctl + # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked. # See rabbitmq-components.mk. BUILD_DEPS += ranch From 01ff71383007b7589e037294eb2d34aafb5d8863 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 29 Apr 2024 15:01:03 +0200 Subject: [PATCH 3/5] Update PLT_APPS for rabbitmq_prelaunch --- deps/rabbitmq_prelaunch/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/rabbitmq_prelaunch/Makefile b/deps/rabbitmq_prelaunch/Makefile index d03e65d222..bf30b6c5f8 100644 --- a/deps/rabbitmq_prelaunch/Makefile +++ b/deps/rabbitmq_prelaunch/Makefile @@ -5,6 +5,8 @@ PROJECT_MOD = rabbit_prelaunch_app DEPS = rabbit_common cuttlefish thoas +PLT_APPS += runtime_tools eunit osiris systemd + DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk include ../../rabbitmq-components.mk From 9ed6155c0d047589efe78966302c87a22fceca56 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 29 Apr 2024 15:22:26 +0200 Subject: [PATCH 4/5] Add elixir to PLT_APPS for some plugins --- deps/rabbitmq_mqtt/Makefile | 2 +- deps/rabbitmq_stomp/Makefile | 2 +- deps/rabbitmq_stream/Makefile | 2 +- deps/rabbitmq_web_mqtt/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/rabbitmq_mqtt/Makefile b/deps/rabbitmq_mqtt/Makefile index a7d0cd0ecc..67f649a94d 100644 --- a/deps/rabbitmq_mqtt/Makefile +++ b/deps/rabbitmq_mqtt/Makefile @@ -47,7 +47,7 @@ LOCAL_DEPS = ssl DEPS = ranch rabbit_common rabbit ra amqp10_common TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp_client rabbitmq_stomp rabbitmq_stream -PLT_APPS += rabbitmqctl +PLT_APPS += rabbitmqctl elixir dep_ct_helper = git https://github.com/extend/ct_helper.git master dep_emqtt = git https://github.com/rabbitmq/emqtt.git master diff --git a/deps/rabbitmq_stomp/Makefile b/deps/rabbitmq_stomp/Makefile index 4624f77b22..0b14a1f95a 100644 --- a/deps/rabbitmq_stomp/Makefile +++ b/deps/rabbitmq_stomp/Makefile @@ -33,7 +33,7 @@ endef DEPS = ranch rabbit_common rabbit amqp_client TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers -PLT_APPS += rabbitmqctl +PLT_APPS += rabbitmqctl elixir DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_stream/Makefile b/deps/rabbitmq_stream/Makefile index e93b34c12d..54b1237a58 100644 --- a/deps/rabbitmq_stream/Makefile +++ b/deps/rabbitmq_stream/Makefile @@ -25,7 +25,7 @@ LOCAL_DEPS = ssl DEPS = rabbit rabbitmq_stream_common osiris ranch TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client amqp10_client -PLT_APPS += rabbitmqctl +PLT_APPS += rabbitmqctl elixir DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_web_mqtt/Makefile b/deps/rabbitmq_web_mqtt/Makefile index 879d5ebfba..3666bfc47f 100644 --- a/deps/rabbitmq_web_mqtt/Makefile +++ b/deps/rabbitmq_web_mqtt/Makefile @@ -21,7 +21,7 @@ LOCAL_DEPS = ssl DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt TEST_DEPS = emqtt rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management -PLT_APPS += rabbitmqctl +PLT_APPS += rabbitmqctl elixir # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked. # See rabbitmq-components.mk. From 4ffabad4cbe150b8f532463cf2f53dc0b96eb94d Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 29 Apr 2024 16:15:18 +0200 Subject: [PATCH 5/5] Add cowlib to PLT_APPS for some plugins --- deps/rabbitmq_web_mqtt/Makefile | 2 +- deps/rabbitmq_web_stomp/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deps/rabbitmq_web_mqtt/Makefile b/deps/rabbitmq_web_mqtt/Makefile index 3666bfc47f..bdafdeebed 100644 --- a/deps/rabbitmq_web_mqtt/Makefile +++ b/deps/rabbitmq_web_mqtt/Makefile @@ -21,7 +21,7 @@ LOCAL_DEPS = ssl DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt TEST_DEPS = emqtt rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management -PLT_APPS += rabbitmqctl elixir +PLT_APPS += rabbitmqctl elixir cowlib # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked. # See rabbitmq-components.mk. diff --git a/deps/rabbitmq_web_stomp/Makefile b/deps/rabbitmq_web_stomp/Makefile index 727cbfaf18..505d5d6f39 100644 --- a/deps/rabbitmq_web_stomp/Makefile +++ b/deps/rabbitmq_web_stomp/Makefile @@ -22,6 +22,8 @@ endef DEPS = cowboy rabbit_common rabbit rabbitmq_stomp TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers +PLT_APPS += cowlib + # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked. # See rabbitmq-components.mk. BUILD_DEPS += ranch