Merge pull request #10077 from rabbitmq/move-prelaunch-from-apps-to-deps

Move `rabbitmq_prelaunch` from `deps/rabbit/apps` to `deps`

Author: dumbbell

deps/rabbit/BUILD.bazel

@@ -214,7 +214,7 @@ rabbitmq_app(
     priv = [":priv"],
     deps = [
         "//deps/amqp10_common:erlang_app",
-        "//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",
+        "//deps/rabbitmq_prelaunch:erlang_app",
         "//deps/rabbit_common:erlang_app",
         "@cuttlefish//:erlang_app",
         "@gen_batch_server//:erlang_app",
@@ -978,7 +978,7 @@ rabbitmq_suite(
     name = "unit_config_value_encryption_SUITE",
     size = "medium",
     deps = [
-        "//deps/rabbit/apps/rabbitmq_prelaunch:test_erlang_app",
+        "//deps/rabbitmq_prelaunch:test_erlang_app",
         "//deps/rabbit_common:test_erlang_app",
         "@credentials_obfuscation//:erlang_app",
     ],

deps/rabbit/Makefile

@@ -132,17 +132,10 @@ define PROJECT_ENV
 	  ]
 endef
 
-# With Erlang.mk default behavior, the value of `$(APPS_DIR)` is always
-# relative to the top-level executed Makefile. In our case, it could be
-# a plugin for instance. However, the rabbitmq_prelaunch application is
-# in this repository, not the plugin's. That's why we need to override
-# this value here.
-APPS_DIR := $(CURDIR)/apps
-
-LOCAL_DEPS = sasl rabbitmq_prelaunch os_mon inets compiler public_key crypto ssl syntax_tools xmerl
+LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools xmerl
 
 BUILD_DEPS = rabbitmq_cli
-DEPS = ranch rabbit_common ra sysmon_handler stdout_formatter recon redbug observer_cli osiris amqp10_common syslog systemd seshat khepri khepri_mnesia_migration
+DEPS = ranch rabbit_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris amqp10_common syslog systemd seshat khepri khepri_mnesia_migration
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck proper
 
 PLT_APPS += mnesia
@@ -171,9 +164,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 include ../../rabbitmq-components.mk
 include ../../erlang.mk
 
-# See above why we mess with `$(APPS_DIR)`.
-unexport APPS_DIR
-
 ifeq ($(strip $(BATS)),)
 BATS := $(ERLANG_MK_TMP)/bats/bin/bats
 endif

deps/rabbitmq_ct_helpers/BUILD.bazel

@@ -60,7 +60,7 @@ xref(
         "//deps/rabbitmq_cli:elixir",  # keep
         "//deps/rabbitmq_cli:erlang_app",  # keep
         "//deps/rabbit:erlang_app",  # keep
-        "//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",  # keep
+        "//deps/rabbitmq_prelaunch:erlang_app",  # keep
         "//deps/rabbitmq_management_agent:erlang_app",  # keep
         "@proper//:erlang_app",  # keep
     ],
@@ -82,7 +82,7 @@ plt(
     plt = "//:base_plt",
     deps = [
         "//deps/rabbit:erlang_app",  # keep
-        "//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",  # keep
+        "//deps/rabbitmq_prelaunch:erlang_app",  # keep
         "//deps/rabbitmq_cli:elixir",  # keep
         "//deps/rabbitmq_cli:erlang_app",  # keep
         "//deps/rabbitmq_management_agent:erlang_app",  # keep

deps/rabbit/apps/rabbitmq_prelaunch/.gitignore renamed to deps/rabbitmq_prelaunch/.gitignore

@@ -8,5 +8,5 @@ dep_cuttlefish = hex 3.1.0
 
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
 
-include ../../../../rabbitmq-components.mk
-include ../../../../erlang.mk
+include ../../rabbitmq-components.mk
+include ../../erlang.mk

deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel renamed to deps/rabbitmq_prelaunch/BUILD.bazel

@@ -84,8 +84,8 @@ ALL_PLUGINS = [
 LABELS_WITH_TEST_VERSIONS = [
     "//deps/amqp10_common:erlang_app",
     "//deps/rabbit_common:erlang_app",
+    "//deps/rabbitmq_prelaunch:erlang_app",
     "//deps/rabbit:erlang_app",
-    "//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",
 ]
 
 def all_plugins(rabbitmq_workspace = "@rabbitmq-server"):