diff --git a/.gitignore b/.gitignore index a0e7d87e0c..f5c68fc329 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,30 @@ +# Editor/OS temporary and unwanted files. *~ +\#* +.#* .sw? -*.tmp .*.sw? -/.erlang.mk/ -/_build/ -/ebin/ -/bin/ +*.orig +*.tmp +.idea/ +.tool-versions +.vscode/ +.DS_Store + +# Erlang.mk temporary files and outputs. +*.plt +*.d +.erlang.mk/ +cover/ +docs/*.html +ebin/ +logs/ +**/test/*.beam +**/test/ct.cover.spec + +elvis + +# Dependencies excluding RabbitMQ applications. /deps/* !/deps/rabbit/ !/deps/rabbit_common/ @@ -59,44 +78,57 @@ !/deps/rabbitmq_web_stomp/ !/deps/rabbitmq_web_stomp_examples/ !/deps/trust_store_http/ -/escript/ -/escript.lock -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -ct.cover.spec -erl_crash.dump + +# Rebar3/Elixir temporary files and outputs. +.rebar3/ +_build/ +_checkouts/ rebar3.crashdump -.envrc -.exrc -.ignore -*.plt + +# Automatically generated rebar.config files. +rebar.config +!/deps/amqp10_common/rebar.config +!/rebar.config + +# Bazel. +.bazelrc +user.bazelrc +bazel-* +extra_deps/ + +# Erlang/OTP unwanted files. +.erlang.cookie +erl_crash.dump +MnesiaCore.* + +# RabbitMQ Makefiles temporary files and outputs. *.lock - -/logs/ -/genhtml/ - -/topic-branch-scratch/ +escript/ +plugins/ +sbin/ +git-revisions.txt PACKAGES/ -packaging/docker-image/rabbitmq_server-*/ - -# Source distribution. rabbitmq-server-*/ rabbitmq-server-*.tar.gz rabbitmq-server-*.tar.bz2 rabbitmq-server-*.tar.xz rabbitmq-server-*.zip +# Trace tools output. +*-ttb +*.ti +*.lz4* traces* +callgrind.out* +callgraph.dot* + +# Unknown. If you know in which category this belongs to, +# please move it there. Thank you. +.envrc +.exrc +.ignore +/genhtml/ + +# @todo Should be moved to rabbitmq_stomp directly. deps/rabbitmq_stomp/test/python_SUITE_data/src/deps -callgrand* - -/user.bazelrc -/bazel-* -/extra_deps/ - -.tool-versions -.vscode -.idea diff --git a/Makefile b/Makefile index bbc8ca7995..2a8bfce1e2 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,6 @@ PROJECT_VERSION := $(PROJECT_VERSION) include erlang.mk include mk/github-actions.mk include mk/bazel.mk -include mk/topic-branches.mk # If PLUGINS was set when we use run-broker we want to # fill in the enabled plugins list. PLUGINS is a more diff --git a/deps/amqp10_client/.gitignore b/deps/amqp10_client/.gitignore index 8ef7f20ca1..ac36164947 100644 --- a/deps/amqp10_client/.gitignore +++ b/deps/amqp10_client/.gitignore @@ -1,24 +1,3 @@ -.sw? -.*.sw? -*.beam -*.plt -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -elvis - -amqp10_client.d -/*.coverdata - # Generated source files. /include/rabbit_amqp1_0_framing.hrl /src/rabbit_amqp1_0_framing0.erl diff --git a/deps/amqp10_common/.gitignore b/deps/amqp10_common/.gitignore index 1ba6cd745f..92a78ef7f4 100644 --- a/deps/amqp10_common/.gitignore +++ b/deps/amqp10_common/.gitignore @@ -1,28 +1,3 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.lock -/sbin/ -/sbin.lock -/test/ct.cover.spec -_build - -/amqp10_common.d -/*.plt - # Generated source files. /include/amqp10_framing.hrl /src/amqp10_framing0.erl diff --git a/deps/amqp_client/.gitignore b/deps/amqp_client/.gitignore deleted file mode 100644 index aadb7546a1..0000000000 --- a/deps/amqp_client/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/_build/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/git-revisions.txt -/logs/ -/PACKAGES/ -*.plt -/plugins/ -/rebar.config -/rebar.lock -/sbin -/test/ct.cover.spec -/amqp_client.d diff --git a/deps/oauth2_client/.gitignore b/deps/oauth2_client/.gitignore deleted file mode 100644 index a758f54971..0000000000 --- a/deps/oauth2_client/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -.sw? -.*.sw? -*.beam -*.plt -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -elvis - -/*.coverdata -oauth2_client.d diff --git a/deps/rabbit/.gitignore b/deps/rabbit/.gitignore index edad8b9ce5..7f6246dc7b 100644 --- a/deps/rabbit/.gitignore +++ b/deps/rabbit/.gitignore @@ -1,42 +1,6 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -MnesiaCore.* -/.erlang.mk/ -/cover/ /debug/ -/deps/ -/debug/ -/doc/ -/ebin/ -/escript/ -/escript.lock /etc/ -/logs/ -/plugins/ -/plugins.lock -/test/ct.cover.spec /test/config_schema_SUITE_data/schema/** -/sbin/ -/sbin.lock -rabbit.d - -# Generated documentation. -docs/*.html - -# Dialyzer -*.plt - -# Tracing tools -*-ttb -*.ti -*.lz4* -callgrind.out* -callgraph.dot* - -PACKAGES/* rabbit-rabbitmq-deps.mk diff --git a/deps/rabbit/test/feature_flags_SUITE_data/my_plugin/.gitignore b/deps/rabbit/test/feature_flags_SUITE_data/my_plugin/.gitignore deleted file mode 100644 index f6d56e0687..0000000000 --- a/deps/rabbit/test/feature_flags_SUITE_data/my_plugin/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/.erlang.mk/ -/deps/ -/ebin/ -/escript -/plugins/ -/my_plugin.d -/sbin diff --git a/deps/rabbit_common/.gitignore b/deps/rabbit_common/.gitignore deleted file mode 100644 index e23a5a3fa3..0000000000 --- a/deps/rabbit_common/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*~ -.sw? -.*.sw? -.*.plt -*.beam -*.coverdata -/.*.plt -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock -/test/ct.cover.spec - -/rabbit_common.d diff --git a/deps/rabbitmq_amqp1_0/.gitignore b/deps/rabbitmq_amqp1_0/.gitignore deleted file mode 100644 index 513ad3137c..0000000000 --- a/deps/rabbitmq_amqp1_0/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_amqp1_0.d diff --git a/deps/rabbitmq_amqp_client/.gitignore b/deps/rabbitmq_amqp_client/.gitignore deleted file mode 100644 index 0de8bdab4c..0000000000 --- a/deps/rabbitmq_amqp_client/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_amqp_client.d diff --git a/deps/rabbitmq_auth_backend_cache/.gitignore b/deps/rabbitmq_auth_backend_cache/.gitignore index 78a981fec8..0595211a7e 100644 --- a/deps/rabbitmq_auth_backend_cache/.gitignore +++ b/deps/rabbitmq_auth_backend_cache/.gitignore @@ -1,19 +1 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - test/config_schema_SUITE_data/schema/ - -/rabbitmq_auth_backend_cache.d diff --git a/deps/rabbitmq_auth_backend_http/.gitignore b/deps/rabbitmq_auth_backend_http/.gitignore index cc013357c8..0595211a7e 100644 --- a/deps/rabbitmq_auth_backend_http/.gitignore +++ b/deps/rabbitmq_auth_backend_http/.gitignore @@ -1,22 +1 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - test/config_schema_SUITE_data/schema/ - -/rabbitmq_auth_backend_http.d - -.idea - diff --git a/deps/rabbitmq_auth_backend_ldap/.gitignore b/deps/rabbitmq_auth_backend_ldap/.gitignore index c5df8bf79d..b539bb1e81 100644 --- a/deps/rabbitmq_auth_backend_ldap/.gitignore +++ b/deps/rabbitmq_auth_backend_ldap/.gitignore @@ -1,20 +1,3 @@ -.sw? -.*.sw? -*.beam .vagrant -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock test/config_schema_SUITE_data/schema/ - -rabbitmq_auth_backend_ldap.d diff --git a/deps/rabbitmq_auth_backend_oauth2/.gitignore b/deps/rabbitmq_auth_backend_oauth2/.gitignore deleted file mode 100644 index 895b779b8d..0000000000 --- a/deps/rabbitmq_auth_backend_oauth2/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_auth_backend_oauth2.d diff --git a/deps/rabbitmq_auth_mechanism_ssl/.gitignore b/deps/rabbitmq_auth_mechanism_ssl/.gitignore deleted file mode 100644 index 2e68166f1c..0000000000 --- a/deps/rabbitmq_auth_mechanism_ssl/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_auth_mechanism_ssl.d diff --git a/deps/rabbitmq_aws/.gitignore b/deps/rabbitmq_aws/.gitignore index 33c4e9be07..c9da1ab197 100644 --- a/deps/rabbitmq_aws/.gitignore +++ b/deps/rabbitmq_aws/.gitignore @@ -1,29 +1,6 @@ -.rebar3 _* .eunit *.o -*.beam -*.plt -*.swp -*.swo -.erlang.cookie -ebin log -erl_crash.dump -.rebar -logs -_build -.idea cobertura.xml -rebar.lock -.erlang.mk -deps -rabbitmq_aws.d test/*xml -cover -/escript/ -/escript.lock -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock diff --git a/deps/rabbitmq_cli/.gitignore b/deps/rabbitmq_cli/.gitignore index 316e39505d..43c231de0d 100644 --- a/deps/rabbitmq_cli/.gitignore +++ b/deps/rabbitmq_cli/.gitignore @@ -1,13 +1 @@ -/_build -/cover -/deps -/escript -/log -/.erlang.mk/ -/ebin -/sbin -erl_crash.dump -mix.lock -*.ez -.sw? -.*.sw? +/deps/ diff --git a/deps/rabbitmq_codegen/.gitignore b/deps/rabbitmq_codegen/.gitignore index 7ced2f9af7..7a24000ff6 100644 --- a/deps/rabbitmq_codegen/.gitignore +++ b/deps/rabbitmq_codegen/.gitignore @@ -1,11 +1,5 @@ -*~ -.sw? -.*.sw? -*.beam *.pyc erl_crash.dump /build/ -/cover/ /dist/ -/ebin/ /tmp/ diff --git a/deps/rabbitmq_consistent_hash_exchange/.gitignore b/deps/rabbitmq_consistent_hash_exchange/.gitignore index a4028eea26..e5aeb813b3 100644 --- a/deps/rabbitmq_consistent_hash_exchange/.gitignore +++ b/deps/rabbitmq_consistent_hash_exchange/.gitignore @@ -1,18 +1 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ /debug/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_consistent_hash_exchange.d diff --git a/deps/rabbitmq_ct_client_helpers/.gitignore b/deps/rabbitmq_ct_client_helpers/.gitignore deleted file mode 100644 index ba10b53cdd..0000000000 --- a/deps/rabbitmq_ct_client_helpers/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -*~ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_ct_client_helpers.d -/.rabbitmq_ct_client_helpers.plt - -/.bazelrc -/bazel-* diff --git a/deps/rabbitmq_ct_helpers/.gitignore b/deps/rabbitmq_ct_helpers/.gitignore index 345f0e6c32..558cd9165b 100644 --- a/deps/rabbitmq_ct_helpers/.gitignore +++ b/deps/rabbitmq_ct_helpers/.gitignore @@ -1,26 +1,4 @@ -*~ -.sw? -.*.sw? -*.beam .terraform/ .terraform-* terraform.tfstate* *terraform.lock* -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_ct_helpers.d -/.rabbitmq_ct_helpers.plt - -/.bazelrc -/bazel-* diff --git a/deps/rabbitmq_event_exchange/.gitignore b/deps/rabbitmq_event_exchange/.gitignore index 17df3b3932..7734a827c1 100644 --- a/deps/rabbitmq_event_exchange/.gitignore +++ b/deps/rabbitmq_event_exchange/.gitignore @@ -1,19 +1 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - test/config_schema_SUITE_data/schema/rabbit.schema - -rabbitmq_event_exchange.d diff --git a/deps/rabbitmq_federation/.gitignore b/deps/rabbitmq_federation/.gitignore deleted file mode 100644 index 306b579543..0000000000 --- a/deps/rabbitmq_federation/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_federation.d diff --git a/deps/rabbitmq_federation_management/.gitignore b/deps/rabbitmq_federation_management/.gitignore deleted file mode 100644 index 04f4e80c4f..0000000000 --- a/deps/rabbitmq_federation_management/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_federation_management.d diff --git a/deps/rabbitmq_jms_topic_exchange/.gitignore b/deps/rabbitmq_jms_topic_exchange/.gitignore deleted file mode 100644 index 6870ec18a4..0000000000 --- a/deps/rabbitmq_jms_topic_exchange/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_jms_topic_exchange.d diff --git a/deps/rabbitmq_management/.gitignore b/deps/rabbitmq_management/.gitignore index 65d96ebfd2..96463fa9b6 100644 --- a/deps/rabbitmq_management/.gitignore +++ b/deps/rabbitmq_management/.gitignore @@ -1,30 +1,6 @@ -../../../.gitignore -.sw? -.*.sw? -*.beam -erl_crash.dump -MnesiaCore.* -/.erlang.mk/ -/cover/ /debug/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_management.d -.rabbitmq_management.plt - -*.coverdata test/config_schema_SUITE_data/schema/ -.vscode/* selenium/node_modules selenium/package-lock.json diff --git a/deps/rabbitmq_management_agent/.gitignore b/deps/rabbitmq_management_agent/.gitignore deleted file mode 100644 index 7b45202588..0000000000 --- a/deps/rabbitmq_management_agent/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -.sw? -.*.sw? -*.beam -*.plt -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_management_agent.d diff --git a/deps/rabbitmq_mqtt/.gitignore b/deps/rabbitmq_mqtt/.gitignore index 382797bf30..548353cc0e 100644 --- a/deps/rabbitmq_mqtt/.gitignore +++ b/deps/rabbitmq_mqtt/.gitignore @@ -1,26 +1,4 @@ -.sw? -.*.sw? -*.beam -*.coverdata -.idea/* -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock /log/ -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -/test/ct.cover.spec debug/* -*.plt test/config_schema_SUITE_data/schema/ -test/.idea/* - -rabbitmq_mqtt.d diff --git a/deps/rabbitmq_peer_discovery_aws/.gitignore b/deps/rabbitmq_peer_discovery_aws/.gitignore index 17dc9a42fe..581bcd1d74 100644 --- a/deps/rabbitmq_peer_discovery_aws/.gitignore +++ b/deps/rabbitmq_peer_discovery_aws/.gitignore @@ -1,24 +1 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock /test/config_schema_SUITE_data/schema/ -/test/ct.cover.spec - -/rabbitmq_peer_discovery_aws.d diff --git a/deps/rabbitmq_peer_discovery_common/.gitignore b/deps/rabbitmq_peer_discovery_common/.gitignore index 6137b7a24f..581bcd1d74 100644 --- a/deps/rabbitmq_peer_discovery_common/.gitignore +++ b/deps/rabbitmq_peer_discovery_common/.gitignore @@ -1,24 +1 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock /test/config_schema_SUITE_data/schema/ -/test/ct.cover.spec - -/rabbitmq_peer_discovery_common.d diff --git a/deps/rabbitmq_peer_discovery_consul/.gitignore b/deps/rabbitmq_peer_discovery_consul/.gitignore index 16d902de9a..581bcd1d74 100644 --- a/deps/rabbitmq_peer_discovery_consul/.gitignore +++ b/deps/rabbitmq_peer_discovery_consul/.gitignore @@ -1,24 +1 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock /test/config_schema_SUITE_data/schema/ -/test/ct.cover.spec - -/rabbitmq_peer_discovery_consul.d diff --git a/deps/rabbitmq_peer_discovery_etcd/.gitignore b/deps/rabbitmq_peer_discovery_etcd/.gitignore index 999af37da1..8221ed9494 100644 --- a/deps/rabbitmq_peer_discovery_etcd/.gitignore +++ b/deps/rabbitmq_peer_discovery_etcd/.gitignore @@ -1,25 +1,2 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata tags -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock /test/config_schema_SUITE_data/schema/ -/test/ct.cover.spec - -/rabbitmq_peer_discovery_etcd.d diff --git a/deps/rabbitmq_peer_discovery_k8s/.gitignore b/deps/rabbitmq_peer_discovery_k8s/.gitignore index 48ba78c2ab..581bcd1d74 100644 --- a/deps/rabbitmq_peer_discovery_k8s/.gitignore +++ b/deps/rabbitmq_peer_discovery_k8s/.gitignore @@ -1,24 +1 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/git-revisions.txt -/logs/ -/plugins/ -/plugins.lock -/rebar.config -/rebar.lock -/sbin/ -/sbin.lock /test/config_schema_SUITE_data/schema/ -/test/ct.cover.spec - -/rabbitmq_peer_discovery_k8s.d diff --git a/deps/rabbitmq_prelaunch/.gitignore b/deps/rabbitmq_prelaunch/.gitignore deleted file mode 100644 index 8f9ca38928..0000000000 --- a/deps/rabbitmq_prelaunch/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/ebin/ -/.erlang.mk/ -/logs/ -/rabbitmq_prelaunch.d - -# Dialyzer -*.plt diff --git a/deps/rabbitmq_prometheus/.gitignore b/deps/rabbitmq_prometheus/.gitignore index c00cbc643a..a32818d446 100644 --- a/deps/rabbitmq_prometheus/.gitignore +++ b/deps/rabbitmq_prometheus/.gitignore @@ -1,24 +1,3 @@ -.sw? -.*.sw? -*.beam -*~ -\#* -.#* -*.d -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -erl_crash.dump prometheus/data test/config_schema_SUITE_data/schema/ diff --git a/deps/rabbitmq_random_exchange/.gitignore b/deps/rabbitmq_random_exchange/.gitignore deleted file mode 100644 index 1dde0fdd27..0000000000 --- a/deps/rabbitmq_random_exchange/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -.DS_Store -erl_crash.dump -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_random_exchange.d diff --git a/deps/rabbitmq_recent_history_exchange/.gitignore b/deps/rabbitmq_recent_history_exchange/.gitignore deleted file mode 100644 index ce64405dd2..0000000000 --- a/deps/rabbitmq_recent_history_exchange/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -.DS_Store -erl_crash.dump -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_recent_history_exchange.d diff --git a/deps/rabbitmq_sharding/.gitignore b/deps/rabbitmq_sharding/.gitignore deleted file mode 100644 index f8d49854c1..0000000000 --- a/deps/rabbitmq_sharding/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_sharding.d diff --git a/deps/rabbitmq_shovel/.gitignore b/deps/rabbitmq_shovel/.gitignore index d0b8c4b8ea..ea5368cf9b 100644 --- a/deps/rabbitmq_shovel/.gitignore +++ b/deps/rabbitmq_shovel/.gitignore @@ -1,21 +1 @@ -.sw? -.*.sw? -*.beam -*.plt -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -elvis elvis.config - -/rabbitmq_shovel.d diff --git a/deps/rabbitmq_shovel_management/.gitignore b/deps/rabbitmq_shovel_management/.gitignore deleted file mode 100644 index e909ef3689..0000000000 --- a/deps/rabbitmq_shovel_management/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_shovel_management.d diff --git a/deps/rabbitmq_stomp/.gitignore b/deps/rabbitmq_stomp/.gitignore index eff3203831..1ef1becabe 100644 --- a/deps/rabbitmq_stomp/.gitignore +++ b/deps/rabbitmq_stomp/.gitignore @@ -1,22 +1,3 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/debug/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_stomp.d - # Python testsuite. .python-version *.pyc diff --git a/deps/rabbitmq_stream/.gitignore b/deps/rabbitmq_stream/.gitignore index 6c2dae7288..eee53b11a8 100644 --- a/deps/rabbitmq_stream/.gitignore +++ b/deps/rabbitmq_stream/.gitignore @@ -1,57 +1,11 @@ .eunit -*.o -*.beam -*.plt -erl_crash.dump .concrete/DEV_MODE -# rebar 2.x -.rebar -rel/example_project -ebin/*.beam -deps - -# rebar 3 -.rebar3 -_build/ -_checkouts/ - -erl_crash.dump -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/ebin/ -/escript/ -/logs/ -/plugins/ -/sbin/ -elvis -callgrind* -ct.coverdata -test/ct.cover.spec -_build - -rabbitmq_stream.d -*.plt -*.d - *.jar - -*~ -.sw? -.*.sw? -*.beam *.class *.dat *.dump *.iml *.ipr *.iws -.DS_Store -\#~ -/.idea/ -/deps/ diff --git a/deps/rabbitmq_stream_common/.gitignore b/deps/rabbitmq_stream_common/.gitignore index 0fbffd6ccd..eee53b11a8 100644 --- a/deps/rabbitmq_stream_common/.gitignore +++ b/deps/rabbitmq_stream_common/.gitignore @@ -1,55 +1,11 @@ .eunit -*.o -*.beam -*.plt -erl_crash.dump .concrete/DEV_MODE -# rebar 2.x -.rebar -rel/example_project -ebin/*.beam -deps - -# rebar 3 -.rebar3 -_build/ -_checkouts/ - -erl_crash.dump -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/ebin/ -/logs/ -/plugins/ -elvis -callgrind* -ct.coverdata -test/ct.cover.spec -_build - -rabbitmq_stream_common.d -*.plt -*.d - *.jar - -*~ -.sw? -.*.sw? -*.beam *.class *.dat *.dump *.iml *.ipr *.iws -.DS_Store -\#~ -/.idea/ -/deps/ diff --git a/deps/rabbitmq_stream_management/.gitignore b/deps/rabbitmq_stream_management/.gitignore index 44b220f5ea..eee53b11a8 100644 --- a/deps/rabbitmq_stream_management/.gitignore +++ b/deps/rabbitmq_stream_management/.gitignore @@ -1,59 +1,11 @@ .eunit -*.o -*.beam -*.plt -erl_crash.dump .concrete/DEV_MODE -# rebar 2.x -.rebar -rel/example_project -ebin/*.beam -deps - -# rebar 3 -.rebar3 -_build/ -_checkouts/ - -erl_crash.dump -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -elvis -callgrind* -ct.coverdata -test/ct.cover.spec -_build - -rabbitmq_stream.d -*.plt -*.d - *.jar - -*~ -.sw? -.*.sw? -*.beam *.class *.dat *.dump *.iml *.ipr *.iws -.DS_Store -\#~ -/.idea/ diff --git a/deps/rabbitmq_top/.gitignore b/deps/rabbitmq_top/.gitignore deleted file mode 100644 index 1413a066a4..0000000000 --- a/deps/rabbitmq_top/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_top.d diff --git a/deps/rabbitmq_tracing/.gitignore b/deps/rabbitmq_tracing/.gitignore deleted file mode 100644 index 8ed19236ab..0000000000 --- a/deps/rabbitmq_tracing/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_tracing.d diff --git a/deps/rabbitmq_trust_store/.gitignore b/deps/rabbitmq_trust_store/.gitignore index 0a8b81e945..e081251830 100644 --- a/deps/rabbitmq_trust_store/.gitignore +++ b/deps/rabbitmq_trust_store/.gitignore @@ -1,21 +1,3 @@ -.sw? -*.orig -.*.sw? -*.beam -/.erlang.mk/ -/cover/ /debug/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_trust_store.d test/config_schema_SUITE_data/schema/ diff --git a/deps/rabbitmq_web_dispatch/.gitignore b/deps/rabbitmq_web_dispatch/.gitignore deleted file mode 100644 index ff4f97e1a4..0000000000 --- a/deps/rabbitmq_web_dispatch/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_web_dispatch.d diff --git a/deps/rabbitmq_web_mqtt/.gitignore b/deps/rabbitmq_web_mqtt/.gitignore index 05dc56dccf..0595211a7e 100644 --- a/deps/rabbitmq_web_mqtt/.gitignore +++ b/deps/rabbitmq_web_mqtt/.gitignore @@ -1,17 +1 @@ -*.swp -/.erlang.mk/ -/cover/ -/deps/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock -/test/*.beam - -/rabbitmq_web_mqtt.d - test/config_schema_SUITE_data/schema/ diff --git a/deps/rabbitmq_web_mqtt_examples/.gitignore b/deps/rabbitmq_web_mqtt_examples/.gitignore deleted file mode 100644 index 6804c4c69c..0000000000 --- a/deps/rabbitmq_web_mqtt_examples/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_web_mqtt_examples.d diff --git a/deps/rabbitmq_web_stomp/.gitignore b/deps/rabbitmq_web_stomp/.gitignore index 00665f2044..0595211a7e 100644 --- a/deps/rabbitmq_web_stomp/.gitignore +++ b/deps/rabbitmq_web_stomp/.gitignore @@ -1,19 +1 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -rabbitmq_web_stomp.d - test/config_schema_SUITE_data/schema/ diff --git a/deps/rabbitmq_web_stomp_examples/.gitignore b/deps/rabbitmq_web_stomp_examples/.gitignore deleted file mode 100644 index 8f28f69b4f..0000000000 --- a/deps/rabbitmq_web_stomp_examples/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.sw? -.*.sw? -*.beam -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/escript.lock -/logs/ -/plugins/ -/plugins.lock -/sbin/ -/sbin.lock - -/rabbitmq_web_stomp_examples.d diff --git a/deps/trust_store_http/.gitignore b/deps/trust_store_http/.gitignore deleted file mode 100644 index c5f08f27ca..0000000000 --- a/deps/trust_store_http/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -*~ -.sw? -.*.sw? -*.beam -*.coverdata -/.erlang.mk/ -/cover/ -/deps/ -/doc/ -/ebin/ -/escript/ -/git-revisions.txt -/logs/ -/plugins/ -/rebar.config -/rebar.lock -/_rel/ -/sbin/ -/test/ct.cover.spec - -/trust_store_http.d diff --git a/erlang.mk b/erlang.mk index e8009499e9..0e11784cbb 100644 --- a/erlang.mk +++ b/erlang.mk @@ -17,7 +17,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) export ERLANG_MK_FILENAME -ERLANG_MK_VERSION = 3967614 +ERLANG_MK_VERSION = 2022.05.31-72-gb8a27ab-dirty ERLANG_MK_WITHOUT = # Make 3.81 and 3.82 are deprecated. @@ -4442,6 +4442,49 @@ ERLANG_MK_QUERY_REL_DEPS_FILE = $(ERLANG_MK_TMP)/query-rel-deps.log ERLANG_MK_QUERY_TEST_DEPS_FILE = $(ERLANG_MK_TMP)/query-test-deps.log ERLANG_MK_QUERY_SHELL_DEPS_FILE = $(ERLANG_MK_TMP)/query-shell-deps.log +# Copyright (c) 2024, Loïc Hoguin +# This file is part of erlang.mk and subject to the terms of the ISC License. + +.PHONY: beam-cache-restore-app beam-cache-restore-test clean-beam-cache distclean-beam-cache + +BEAM_CACHE_DIR ?= $(ERLANG_MK_TMP)/beam-cache +PROJECT_BEAM_CACHE_DIR = $(BEAM_CACHE_DIR)/$(PROJECT) + +clean:: clean-beam-cache + +clean-beam-cache: + $(verbose) rm -rf $(PROJECT_BEAM_CACHE_DIR) + +distclean:: distclean-beam-cache + +$(PROJECT_BEAM_CACHE_DIR): + $(verbose) mkdir -p $(PROJECT_BEAM_CACHE_DIR) + +distclean-beam-cache: + $(gen_verbose) rm -rf $(BEAM_CACHE_DIR) + +beam-cache-restore-app: | $(PROJECT_BEAM_CACHE_DIR) + $(verbose) rm -rf $(PROJECT_BEAM_CACHE_DIR)/ebin-test +ifneq ($(wildcard ebin/),) + $(verbose) mv ebin/ $(PROJECT_BEAM_CACHE_DIR)/ebin-test +endif +ifneq ($(wildcard $(PROJECT_BEAM_CACHE_DIR)/ebin-app),) + $(gen_verbose) mv $(PROJECT_BEAM_CACHE_DIR)/ebin-app ebin/ +else + $(verbose) $(MAKE) --no-print-directory clean-app +endif + +beam-cache-restore-test: | $(PROJECT_BEAM_CACHE_DIR) + $(verbose) rm -rf $(PROJECT_BEAM_CACHE_DIR)/ebin-app +ifneq ($(wildcard ebin/),) + $(verbose) mv ebin/ $(PROJECT_BEAM_CACHE_DIR)/ebin-app +endif +ifneq ($(wildcard $(PROJECT_BEAM_CACHE_DIR)/ebin-test),) + $(gen_verbose) mv $(PROJECT_BEAM_CACHE_DIR)/ebin-test ebin/ +else + $(verbose) $(MAKE) --no-print-directory clean-app +endif + # Copyright (c) 2013-2016, Loïc Hoguin # This file is part of erlang.mk and subject to the terms of the ISC License. @@ -4497,7 +4540,7 @@ ifneq ($(wildcard src/),) # Targets. -app:: $(if $(wildcard ebin/test),clean) deps +app:: $(if $(wildcard ebin/test),beam-cache-restore-app) deps $(verbose) $(MAKE) --no-print-directory $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build @@ -4884,14 +4927,17 @@ define compile_test_erl endef ERL_TEST_FILES = $(call core_find,$(TEST_DIR)/,*.erl) + $(ERLANG_MK_TMP)/$(PROJECT).last-testdir-build: $(ERL_TEST_FILES) $(MAKEFILE_LIST) - $(eval FILES_TO_COMPILE := $(if $(filter $(MAKEFILE_LIST),$?),$(filter $(ERL_TEST_FILES),$^),$?)) +# When we have to recompile files in src/ the .d file always gets rebuilt. +# Therefore we want to ignore it when rebuilding test files. + $(eval FILES_TO_COMPILE := $(if $(filter $(filter-out $(PROJECT).d,$(MAKEFILE_LIST)),$?),$(filter $(ERL_TEST_FILES),$^),$(filter $(ERL_TEST_FILES),$?))) $(if $(strip $(FILES_TO_COMPILE)),$(call compile_test_erl,$(FILES_TO_COMPILE)) && touch $@) endif test-build:: IS_TEST=1 test-build:: ERLC_OPTS=$(TEST_ERLC_OPTS) -test-build:: $(if $(wildcard src),$(if $(wildcard ebin/test),,clean)) $(if $(IS_APP),,deps test-deps) +test-build:: $(if $(wildcard src),$(if $(wildcard ebin/test),,beam-cache-restore-test)) $(if $(IS_APP),,deps test-deps) # We already compiled everything when IS_APP=1. ifndef IS_APP ifneq ($(wildcard src),) @@ -5495,7 +5541,7 @@ endif $(verbose) mkdir config/ $(verbose) $(call core_render,bs_sys_config,config/sys.config) $(verbose) $(call core_render,bs_vm_args,config/vm.args) - $(verbose) awk '/^include erlang.mk/ && !ins {print "BUILD_DEPS += relx";ins=1};{print}' Makefile > Makefile.bak + $(verbose) awk '/^include erlang.mk/ && !ins {print "REL_DEPS += relx";ins=1};{print}' Makefile > Makefile.bak $(verbose) mv Makefile.bak Makefile new-app: diff --git a/mk/topic-branches.mk b/mk/topic-branches.mk deleted file mode 100644 index fb279eb3c2..0000000000 --- a/mk/topic-branches.mk +++ /dev/null @@ -1,48 +0,0 @@ -SCRATCH := $(CURDIR)/topic-branch-scratch - -GIT_FILTER_REPO := $(CURDIR)/bin/git-filter-repo - -$(GIT_FILTER_REPO): - mkdir -p $(TMPDIR) \ - && cd $(TMPDIR) \ - && curl -LO https://github.com/newren/git-filter-repo/releases/download/v2.28.0/git-filter-repo-2.28.0.tar.xz \ - && tar -xJf git-filter-repo-*.tar.xz \ - && mkdir -p $(CURDIR)/bin \ - && cp git-filter-repo-*/git-filter-repo $(GIT_FILTER_REPO) \ - && chmod +x $(GIT_FILTER_REPO) - -.PHONY: clean-state -clean-state: - @git diff-index --quiet HEAD -- \ - || (echo "Cannot proceed with uncommitted changes"; exit 1) - -PARENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) - -define fetch_topic_branch -echo "Collecting commits from $(1)/$(2)..." \ -&& git clone --quiet git@github.com:rabbitmq/$(call rmq_cmp_repo_name,$(1)).git $(SCRATCH)/$(2)/repo-$(1) \ -&& cd $(SCRATCH)/$(2)/repo-$(1) \ -&& $(GIT_FILTER_REPO) --quiet --to-subdirectory-filter deps/$(1) \ -&& git checkout $(2) \ -&& git format-patch $(PARENT_BRANCH) \ -&& mkdir -p $(SCRATCH)/$(2)/$(1) \ -&& cp *.patch $(SCRATCH)/$(2)/$(1) \ -|| printf "Topic branch $(2) does not appear to exist in $(1).\n\n"; -endef - -define rebase_topic_branch -git am --reject $(sort $(wildcard $(1)/*.patch)); -endef - -fetch-topic-branch-%: $(GIT_FILTER_REPO) - $(eval TOPIC_BRANCH := $(subst fetch-topic-branch-,,$@)) - mkdir -p $(SCRATCH)/$(TOPIC_BRANCH) - @$(foreach dep,$(VENDORED_COMPONENTS),$(call fetch_topic_branch,$(dep),$(TOPIC_BRANCH))) - rm -rf $(SCRATCH)/$(TOPIC_BRANCH)/repo-* - -topic-branch-%: $(GIT_FILTER_REPO) clean-state - $(eval TOPIC_BRANCH := $(subst topic-branch-,,$@)) - ls $(SCRATCH)/$(TOPIC_BRANCH) \ - || (echo "Fetch the branch first with 'make fetch-$@')"; exit 1) - git checkout -b $(TOPIC_BRANCH) - @$(foreach dir,$(wildcard $(SCRATCH)/$(TOPIC_BRANCH)/*),$(call rebase_topic_branch,$(dir))) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index ea2516b5a8..2c1ea29383 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -355,9 +355,14 @@ prepare-dist:: # If the top-level project is a RabbitMQ component, we override # $(DEPS_DIR) for this project to point to the top-level's one. +# +# We do the same for $(ERLANG_MK_TMP) as we want to keep the +# beam cache regardless of where we build. We also want to +# share Hex tarballs. ifneq ($(PROJECT),rabbitmq_server_release) DEPS_DIR ?= $(abspath ..) +ERLANG_MK_TMP ?= $(abspath ../../.erlang.mk) DISABLE_DISTCLEAN = 1 endif