Dialyzer fixes

Author: lhoguin

deps/rabbit_common/mk/rabbitmq-early-plugin.mk

@@ -4,7 +4,7 @@
 
 DIALYZER_OPTS ?= -Werror_handling -Wunmatched_returns -Wunknown
 
-dialyze: ERL_LIBS = $(APPS_DIR):$(DEPS_DIR):$(DEPS_DIR)/rabbitmq_cli/_build/dev/lib:$(dir $(shell elixir --eval ":io.format '~s~n', [:code.lib_dir :elixir ]"))
+dialyze: ERL_LIBS = $(APPS_DIR):$(DEPS_DIR):$(DEPS_DIR)/rabbitmq_cli/_build/dev/lib:$(ELIXIR_LIBS)
 
 # --------------------------------------------------------------------
 # Common Test flags.

deps/rabbitmq_auth_backend_oauth2/Makefile

@@ -10,7 +10,7 @@ BUILD_DEPS = rabbit_common rabbitmq_cli
 DEPS = rabbit cowlib jose base64url oauth2_client
 TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_web_mqtt emqtt rabbitmq_amqp_client
 
-PLT_APPS += rabbitmqctl
+PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_consistent_hash_exchange/Makefile

@@ -8,7 +8,7 @@ endef
 DEPS = rabbit_common rabbit khepri khepri_mnesia_migration
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_amqp_client
 
-PLT_APPS += mnesia rabbitmqctl
+PLT_APPS += mnesia rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_federation/Makefile

@@ -16,7 +16,7 @@ endef
 DEPS = rabbit_common rabbit amqp_client
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
-PLT_APPS += rabbitmqctl
+PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_management_agent/Makefile

@@ -21,7 +21,7 @@ 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
+PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

deps/rabbitmq_mqtt/Makefile

@@ -45,7 +45,7 @@ LOCAL_DEPS = ssl
 DEPS = ranch rabbit_common rabbit amqp10_common
 TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp_client rabbitmq_stomp rabbitmq_stream
 
-PLT_APPS += rabbitmqctl elixir
+PLT_APPS += rabbitmq_cli elixir
 
 dep_ct_helper = git https://github.com/extend/ct_helper.git master
 dep_emqtt = git https://github.com/emqx/emqtt.git 1.11.0

deps/rabbitmq_shovel/Makefile

@@ -25,7 +25,7 @@ LOCAL_DEPS = crypto
 
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_amqp1_0 meck
 
-PLT_APPS += rabbitmqctl
+PLT_APPS += rabbitmq_cli
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk elvis_mk

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 elixir
+PLT_APPS += rabbitmq_cli elixir
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

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 elixir
+PLT_APPS += rabbitmq_cli elixir
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk

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 rabbitmq_stomp rabbitmq_consistent_hash_exchange
 
-PLT_APPS += rabbitmqctl elixir cowlib
+PLT_APPS += rabbitmq_cli elixir cowlib
 
 # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.
 # See rabbitmq-components.mk.