Skip to content

Commit 01af0a4

Browse files
HoloRinHoloRin
authored
Merge pull request #4465 from rabbitmq/mergify/bp/v3.10.x/pr-4440
Updates for rules_erlang 2.5.0 (backport #4440)
2 parents 6a00753 + d15e7ec commit 01af0a4

File tree

34 files changed

+169
-143
lines changed

34 files changed

+169
-143
lines changed

‎BUILD.ranch

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,10 @@ load("@rules_erlang//:erlang_app_info.bzl", "erlang_app_info")
33
load("@rules_erlang//:erlang_app.bzl", "DEFAULT_ERLC_OPTS")
44
load("@rules_erlang//:erlc.bzl", "erlc")
55

6-
FIRST_SRCS = [
7-
"src/ranch_transport.erl",
8-
]
9-
10-
erlc(
11-
name = "first_beam_files",
12-
hdrs = glob(["include/**/*.hrl", "src/**/*.hrl"]),
13-
srcs = glob(FIRST_SRCS),
14-
erlc_opts = DEFAULT_ERLC_OPTS,
15-
dest = "ebin",
16-
)
17-
186
erlc(
197
name = "beam_files",
208
hdrs = glob(["include/**/*.hrl", "src/**/*.hrl"]),
21-
srcs = glob(["src/**/*.erl"], exclude = FIRST_SRCS),
22-
beam = [":first_beam_files"],
9+
srcs = glob(["src/**/*.erl"]),
2310
erlc_opts = DEFAULT_ERLC_OPTS,
2411
dest = "ebin",
2512
)
@@ -35,14 +22,14 @@ app_file(
3522
name = "app_file",
3623
app_name = "ranch",
3724
app_version = "2.1.0",
38-
modules = [":first_beam_files", ":beam_files"],
25+
modules = [":beam_files"],
3926
)
4027

4128
erlang_app_info(
4229
name = "erlang_app",
4330
app_name = "ranch",
4431
app = ":app_file",
4532
hdrs = glob(["include/**/*.hrl"]),
46-
beam = [":first_beam_files", ":beam_files", ":appup"],
33+
beam = [":beam_files", ":appup"],
4734
visibility = ["//visibility:public"],
4835
)

‎WORKSPACE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ rules_pkg_dependencies()
5959

6060
http_archive(
6161
name = "rules_erlang",
62-
sha256 = "a58ab84733ed3b43eda6a1c624edf04a0dac7cabdd2b4fcf84391ee8af969965",
63-
strip_prefix = "rules_erlang-2.2.1",
64-
urls = ["https://github.com/rabbitmq/rules_erlang/archive/refs/tags/2.2.1.zip"],
62+
sha256 = "920b564662d20c6ac0e6568ca1c8b015f81b422e027590981d7e97422751deaf",
63+
strip_prefix = "rules_erlang-2.5.0",
64+
urls = ["https://github.com/rabbitmq/rules_erlang/archive/refs/tags/2.5.0.zip"],
6565
)
6666

6767
load("@rules_erlang//:rules_erlang.bzl", "rules_erlang_dependencies")

‎deps/amqp10_client/BUILD.bazel

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@ APP_DESCRIPTION = "AMQP 1.0 client from the RabbitMQ Project"
1616

1717
APP_MODULE = "amqp10_client_app"
1818

19+
APP_EXTRA_KEYS = """%% Hex.pm package informations.
20+
{licenses, ["MPL-2.0"]},
21+
{links, [
22+
{"Website", "https://www.rabbitmq.com/"},
23+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_client"}
24+
]},
25+
{build_tools, ["make", "rebar3"]},
26+
{files, [
27+
"erlang.mk",
28+
"git-revisions.txt",
29+
"include",
30+
"LICENSE*",
31+
"Makefile",
32+
"rabbitmq-components.mk",
33+
"README",
34+
"README.md",
35+
"src"
36+
]}
37+
"""
38+
1939
EXTRA_APPS = [
2040
"ssl",
2141
"inets",
@@ -32,6 +52,7 @@ DEPS = [
3252

3353
rabbitmq_app(
3454
app_description = APP_DESCRIPTION,
55+
app_extra_keys = APP_EXTRA_KEYS,
3556
app_module = APP_MODULE,
3657
app_name = APP_NAME,
3758
build_deps = BUILD_DEPS,

‎deps/amqp10_common/BUILD.bazel

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,25 @@ genrule(
4949
app_file(
5050
name = "app_file",
5151
app_description = "Modules shared by rabbitmq-amqp1.0 and rabbitmq-amqp1.0-client",
52+
app_extra = """%% Hex.pm package informations.
53+
{licenses, ["MPL-2.0"]},
54+
{links, [
55+
{"Website", "https://www.rabbitmq.com/"},
56+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_common"}
57+
]},
58+
{build_tools, ["make", "rebar3"]},
59+
{files, [
60+
"erlang.mk",
61+
"git-revisions.txt",
62+
"include",
63+
"LICENSE*",
64+
"Makefile",
65+
"rabbitmq-components.mk",
66+
"README",
67+
"README.md",
68+
"mk"
69+
]}
70+
""",
5271
app_name = "amqp10_common",
5372
app_version = APP_VERSION,
5473
modules = [":beam_files"],

‎deps/amqp_client/BUILD.bazel

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@ APP_ENV = """[
1616
{writer_gc_threshold, 1000000000}
1717
]"""
1818

19+
APP_EXTRA_KEYS = """%% Hex.pm package informations.
20+
{licenses, ["MPL-2.0"]},
21+
{links, [
22+
{"Website", "https://www.rabbitmq.com/"},
23+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp_client"},
24+
{"User guide", "https://www.rabbitmq.com/erlang-client-user-guide.html"}
25+
]},
26+
{build_tools, ["make", "rebar3"]},
27+
{files, [
28+
"erlang.mk",
29+
"git-revisions.txt",
30+
"include",
31+
"LICENSE*",
32+
"Makefile",
33+
"rabbitmq-components.mk",
34+
"README",
35+
"README.md"
36+
]}
37+
"""
38+
1939
EXTRA_APPS = [
2040
"xmerl",
2141
]
@@ -27,16 +47,13 @@ DEPS = [
2747
rabbitmq_app(
2848
app_description = "RabbitMQ AMQP Client",
2949
app_env = APP_ENV,
50+
app_extra_keys = APP_EXTRA_KEYS,
3051
app_module = "amqp_client",
3152
app_name = "amqp_client",
3253
app_registered = [
3354
"amqp_sup",
3455
],
3556
extra_apps = EXTRA_APPS,
36-
first_srcs = [
37-
"src/amqp_gen_connection.erl",
38-
"src/amqp_gen_consumer.erl",
39-
],
4057
deps = DEPS,
4158
)
4259

‎deps/rabbit/BUILD.bazel

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,22 +193,13 @@ EXTRA_APPS = [
193193
"xmerl",
194194
]
195195

196-
FIRST_SRCS = [
197-
"src/rabbit_tracking.erl",
198-
"src/rabbit_queue_type.erl",
199-
"src/rabbit_credential_validator.erl",
200-
"src/rabbit_policy_merge_strategy.erl",
201-
"src/rabbit_queue_master_locator.erl",
202-
]
203-
204196
rabbitmq_app(
205197
app_description = "RabbitMQ",
206198
app_env = _APP_ENV,
207199
app_module = APP_MODULE,
208200
app_name = "rabbit",
209201
app_registered = APP_REGISTERED,
210202
extra_apps = EXTRA_APPS,
211-
first_srcs = FIRST_SRCS,
212203
runtime_deps = RUNTIME_DEPS,
213204
deps = DEPS,
214205
)

‎deps/rabbit/test/feature_flags_SUITE_data/my_plugin/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@rules_erlang//:erlang_app.bzl", "erlang_app")
2+
load("//:rabbitmq.bzl", "BROKER_VERSION_REQUIREMENTS_ANY")
23

34
DEPS = [
45
"//deps/rabbit_common:erlang_app",
@@ -7,6 +8,7 @@ DEPS = [
78

89
erlang_app(
910
app_description = "Plugin to test feature flags",
11+
app_extra = BROKER_VERSION_REQUIREMENTS_ANY,
1012
app_name = "my_plugin",
1113
app_version = "1.0.0",
1214
deps = DEPS,

‎deps/rabbit_common/BUILD.bazel

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,27 @@ RUNTIME_DEPS = [
6666

6767
APP_NAME = "rabbit_common"
6868

69+
APP_EXTRA_KEYS = """
70+
%% Hex.pm package informations.
71+
{licenses, ["MPL-2.0"]},
72+
{links, [
73+
{"Website", "https://www.rabbitmq.com/"},
74+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-common"}
75+
]},
76+
{build_tools, ["make", "rebar3"]},
77+
{files, [
78+
"erlang.mk",
79+
"git-revisions.txt",
80+
"include",
81+
"LICENSE*",
82+
"Makefile",
83+
"rabbitmq-components.mk",
84+
"README",
85+
"README.md",
86+
"mk"
87+
]}
88+
"""
89+
6990
EXTRA_APPS = [
7091
"compiler",
7192
"crypto",
@@ -82,40 +103,21 @@ HDRS = glob(["include/*.hrl"]) + ["include/rabbit_framing.hrl"]
82103
app_file(
83104
name = "app_file",
84105
app_description = "Modules shared by rabbitmq-server and rabbitmq-erlang-client",
106+
app_extra = APP_EXTRA_KEYS,
85107
app_name = APP_NAME,
86108
app_version = APP_VERSION,
87109
extra_apps = EXTRA_APPS,
88110
modules = [":beam_files"],
89111
deps = DEPS + RUNTIME_DEPS,
90112
)
91113

92-
FIRST_SRCS = [
93-
"src/gen_server2.erl",
94-
"src/rabbit_authn_backend.erl",
95-
"src/rabbit_authz_backend.erl",
96-
"src/rabbit_registry_class.erl",
97-
]
98-
99-
erlc(
100-
name = "first_beam_files",
101-
srcs = glob(FIRST_SRCS),
102-
hdrs = HDRS,
103-
dest = "ebin",
104-
erlc_opts = RABBITMQ_ERLC_OPTS,
105-
deps = DEPS,
106-
)
107-
108114
erlc(
109115
name = "beam_files",
110-
srcs = glob(
111-
["src/*.erl"],
112-
exclude = FIRST_SRCS,
113-
) + [
116+
srcs = glob(["src/*.erl"]) + [
114117
"src/rabbit_framing_amqp_0_8.erl",
115118
"src/rabbit_framing_amqp_0_9_1.erl",
116119
],
117120
hdrs = HDRS,
118-
beam = [":first_beam_files"],
119121
dest = "ebin",
120122
erlc_opts = RABBITMQ_ERLC_OPTS,
121123
deps = DEPS,
@@ -126,36 +128,19 @@ erlang_app_info(
126128
hdrs = HDRS,
127129
app = ":app_file",
128130
app_name = APP_NAME,
129-
beam = [
130-
":first_beam_files",
131-
":beam_files",
132-
],
131+
beam = [":beam_files"],
133132
visibility = ["//visibility:public"],
134133
deps = DEPS + RUNTIME_DEPS,
135134
)
136135

137-
erlc(
138-
name = "first_test_beam_files",
139-
testonly = True,
140-
srcs = glob(FIRST_SRCS),
141-
hdrs = HDRS,
142-
dest = "src",
143-
erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
144-
deps = DEPS,
145-
)
146-
147136
erlc(
148137
name = "test_beam_files",
149138
testonly = True,
150-
srcs = glob(
151-
["src/*.erl"],
152-
exclude = FIRST_SRCS,
153-
) + [
139+
srcs = glob(["src/*.erl"]) + [
154140
"src/rabbit_framing_amqp_0_8.erl",
155141
"src/rabbit_framing_amqp_0_9_1.erl",
156142
],
157143
hdrs = HDRS,
158-
beam = [":first_test_beam_files"],
159144
dest = "src",
160145
erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
161146
deps = DEPS,
@@ -167,10 +152,7 @@ erlang_app_info(
167152
hdrs = HDRS,
168153
app = ":app_file",
169154
app_name = APP_NAME,
170-
beam = [
171-
":first_test_beam_files",
172-
":test_beam_files",
173-
],
155+
beam = [":test_beam_files"],
174156
visibility = ["//:__subpackages__"],
175157
deps = DEPS + RUNTIME_DEPS,
176158
)

‎deps/rabbitmq_amqp1_0/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@rules_erlang//:xref.bzl", "xref")
22
load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
33
load(
44
"//:rabbitmq.bzl",
5+
"BROKER_VERSION_REQUIREMENTS_ANY",
56
"RABBITMQ_DIALYZER_OPTS",
67
"assert_suites",
78
"broker_for_integration_suites",
@@ -37,6 +38,7 @@ RUNTIME_DEPS = [
3738
rabbitmq_app(
3839
app_description = APP_DESCRIPTION,
3940
app_env = APP_ENV,
41+
app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY,
4042
app_name = APP_NAME,
4143
build_deps = BUILD_DEPS,
4244
runtime_deps = RUNTIME_DEPS,

‎deps/rabbitmq_auth_backend_cache/BUILD.bazel

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@rules_erlang//:xref.bzl", "xref")
22
load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
33
load(
44
"//:rabbitmq.bzl",
5+
"BROKER_VERSION_REQUIREMENTS_ANY",
56
"RABBITMQ_DIALYZER_OPTS",
67
"assert_suites",
78
"broker_for_integration_suites",
@@ -32,16 +33,12 @@ RUNTIME_DEPS = [
3233
"//deps/rabbit:erlang_app",
3334
]
3435

35-
FIRST_SRCS = [
36-
"src/rabbit_auth_cache.erl",
37-
]
38-
3936
rabbitmq_app(
4037
app_description = APP_DESCRIPTION,
4138
app_env = APP_ENV,
39+
app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY,
4240
app_module = APP_MODULE,
4341
app_name = APP_NAME,
44-
first_srcs = FIRST_SRCS,
4542
runtime_deps = RUNTIME_DEPS,
4643
deps = DEPS,
4744
)

‎deps/rabbitmq_auth_backend_http/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@rules_erlang//:xref.bzl", "xref")
22
load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
33
load(
44
"//:rabbitmq.bzl",
5+
"BROKER_VERSION_REQUIREMENTS_ANY",
56
"RABBITMQ_DIALYZER_OPTS",
67
"assert_suites",
78
"broker_for_integration_suites",
@@ -40,6 +41,7 @@ RUNTIME_DEPS = [
4041
rabbitmq_app(
4142
app_description = APP_DESCRIPTION,
4243
app_env = APP_ENV,
44+
app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY,
4345
app_module = APP_MODULE,
4446
app_name = APP_NAME,
4547
extra_apps = EXTRA_APPS,

‎deps/rabbitmq_auth_backend_ldap/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@rules_erlang//:xref.bzl", "xref")
22
load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
33
load(
44
"//:rabbitmq.bzl",
5+
"BROKER_VERSION_REQUIREMENTS_ANY",
56
"RABBITMQ_DIALYZER_OPTS",
67
"assert_suites",
78
"broker_for_integration_suites",
@@ -55,6 +56,7 @@ RUNTIME_DEPS = [
5556
rabbitmq_app(
5657
app_description = APP_DESCRIPTION,
5758
app_env = APP_ENV,
59+
app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY,
5860
app_module = APP_MODULE,
5961
app_name = APP_NAME,
6062
extra_apps = EXTRA_APPS,

0 commit comments

Comments
 (0)