From 98477f95eacf470bc85d79ad4eabd610f3e6935a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Mon, 16 Jun 2025 15:19:18 +0200 Subject: [PATCH] Delete symlinks to `erlang.mk` and `rabbitmq-components.mk` [Why] They make it more difficult to compile RabbitMQ on Windows. They were probably useful at the time of the switch to a monorepository but I don't see their need anymore. (cherry picked from commit 63f7da23c7c96096452725dd321e9f96eb618794) --- deps/amqp10_client/Makefile | 6 +++--- deps/amqp10_client/erlang.mk | 1 - deps/amqp10_client/rabbitmq-components.mk | 1 - deps/amqp10_common/Makefile | 6 +++--- deps/amqp10_common/erlang.mk | 1 - deps/amqp10_common/rabbitmq-components.mk | 1 - deps/amqp_client/Makefile | 6 +++--- deps/amqp_client/erlang.mk | 1 - deps/amqp_client/rabbitmq-components.mk | 1 - deps/rabbit_common/Makefile | 6 +++--- deps/rabbit_common/erlang.mk | 1 - deps/rabbit_common/rabbitmq-components.mk | 1 - 12 files changed, 12 insertions(+), 20 deletions(-) delete mode 120000 deps/amqp10_client/erlang.mk delete mode 120000 deps/amqp10_client/rabbitmq-components.mk delete mode 120000 deps/amqp10_common/erlang.mk delete mode 120000 deps/amqp10_common/rabbitmq-components.mk delete mode 120000 deps/amqp_client/erlang.mk delete mode 120000 deps/amqp_client/rabbitmq-components.mk delete mode 120000 deps/rabbit_common/erlang.mk delete mode 120000 deps/rabbit_common/rabbitmq-components.mk diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile index 561a8c2ff253..829cf693ccfa 100644 --- a/deps/amqp10_client/Makefile +++ b/deps/amqp10_client/Makefile @@ -41,10 +41,10 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk \ DEP_PLUGINS += elvis_mk dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master -include rabbitmq-components.mk -include erlang.mk +include ../../rabbitmq-components.mk +include ../../erlang.mk -HEX_TARBALL_FILES += rabbitmq-components.mk \ +HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ git-revisions.txt # -------------------------------------------------------------------- diff --git a/deps/amqp10_client/erlang.mk b/deps/amqp10_client/erlang.mk deleted file mode 120000 index 59af4a527a9d..000000000000 --- a/deps/amqp10_client/erlang.mk +++ /dev/null @@ -1 +0,0 @@ -../../erlang.mk \ No newline at end of file diff --git a/deps/amqp10_client/rabbitmq-components.mk b/deps/amqp10_client/rabbitmq-components.mk deleted file mode 120000 index 43c0d3567154..000000000000 --- a/deps/amqp10_client/rabbitmq-components.mk +++ /dev/null @@ -1 +0,0 @@ -../../rabbitmq-components.mk \ No newline at end of file diff --git a/deps/amqp10_common/Makefile b/deps/amqp10_common/Makefile index 6208fecad785..ba77dff626df 100644 --- a/deps/amqp10_common/Makefile +++ b/deps/amqp10_common/Makefile @@ -45,10 +45,10 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ PLT_APPS = eunit -include rabbitmq-components.mk -include erlang.mk +include ../../rabbitmq-components.mk +include ../../erlang.mk -HEX_TARBALL_FILES += rabbitmq-components.mk \ +HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ git-revisions.txt -include development.post.mk diff --git a/deps/amqp10_common/erlang.mk b/deps/amqp10_common/erlang.mk deleted file mode 120000 index 59af4a527a9d..000000000000 --- a/deps/amqp10_common/erlang.mk +++ /dev/null @@ -1 +0,0 @@ -../../erlang.mk \ No newline at end of file diff --git a/deps/amqp10_common/rabbitmq-components.mk b/deps/amqp10_common/rabbitmq-components.mk deleted file mode 120000 index 43c0d3567154..000000000000 --- a/deps/amqp10_common/rabbitmq-components.mk +++ /dev/null @@ -1 +0,0 @@ -../../rabbitmq-components.mk \ No newline at end of file diff --git a/deps/amqp_client/Makefile b/deps/amqp_client/Makefile index 43dbb62901ad..654a62d905ad 100644 --- a/deps/amqp_client/Makefile +++ b/deps/amqp_client/Makefile @@ -51,8 +51,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk \ PLT_APPS = ssl public_key -include rabbitmq-components.mk -include erlang.mk +include ../../rabbitmq-components.mk +include ../../erlang.mk -HEX_TARBALL_FILES += rabbitmq-components.mk \ +HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ git-revisions.txt diff --git a/deps/amqp_client/erlang.mk b/deps/amqp_client/erlang.mk deleted file mode 120000 index 59af4a527a9d..000000000000 --- a/deps/amqp_client/erlang.mk +++ /dev/null @@ -1 +0,0 @@ -../../erlang.mk \ No newline at end of file diff --git a/deps/amqp_client/rabbitmq-components.mk b/deps/amqp_client/rabbitmq-components.mk deleted file mode 120000 index 43c0d3567154..000000000000 --- a/deps/amqp_client/rabbitmq-components.mk +++ /dev/null @@ -1 +0,0 @@ -../../rabbitmq-components.mk \ No newline at end of file diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile index 95343653641b..510d6cb0fa32 100644 --- a/deps/rabbit_common/Makefile +++ b/deps/rabbit_common/Makefile @@ -45,10 +45,10 @@ DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \ PLT_APPS += mnesia crypto ssl -include rabbitmq-components.mk -include erlang.mk +include ../../rabbitmq-components.mk +include ../../erlang.mk -HEX_TARBALL_FILES += rabbitmq-components.mk \ +HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ git-revisions.txt \ mk/rabbitmq-build.mk \ mk/rabbitmq-dist.mk \ diff --git a/deps/rabbit_common/erlang.mk b/deps/rabbit_common/erlang.mk deleted file mode 120000 index 59af4a527a9d..000000000000 --- a/deps/rabbit_common/erlang.mk +++ /dev/null @@ -1 +0,0 @@ -../../erlang.mk \ No newline at end of file diff --git a/deps/rabbit_common/rabbitmq-components.mk b/deps/rabbit_common/rabbitmq-components.mk deleted file mode 120000 index 43c0d3567154..000000000000 --- a/deps/rabbit_common/rabbitmq-components.mk +++ /dev/null @@ -1 +0,0 @@ -../../rabbitmq-components.mk \ No newline at end of file