Skip to content

Commit 716c3b8

Browse files
lukebakkenlukebakken
authored
Merge pull request #4600 from rabbitmq/rabbitmq-server-2577-3.9.x
Merge pull request #4579 from rabbitmq/rabbitmq-server-4577
2 parents fee36db + a857946 commit 716c3b8

File tree

7 files changed

+62
-43
lines changed

7 files changed

+62
-43
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
/sbin/
5959
/sbin.lock
6060
erl_crash.dump
61+
rebar3.crashdump
6162
.envrc
6263
*.plt
6364
*.lock

‎deps/amqp10_client/Makefile‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ define PROJECT_APP_EXTRA_KEYS
1515
]}
1616
endef
1717

18+
define HEX_TARBALL_EXTRA_METADATA
19+
#{
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+
}
26+
endef
27+
1828
# Release artifacts are put in $(PACKAGES_DIR).
1929
PACKAGES_DIR ?= $(abspath PACKAGES)
2030

@@ -35,15 +45,11 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
3545
DEP_PLUGINS += elvis_mk
3646
dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
3747

38-
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
39-
# reviewed and merged.
40-
41-
ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git
42-
ERLANG_MK_COMMIT = rabbitmq-tmp
43-
4448
include ../../rabbitmq-components.mk
4549
include ../../erlang.mk
4650

51+
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
52+
4753
# --------------------------------------------------------------------
4854
# Compiler flags.
4955
# --------------------------------------------------------------------

‎deps/amqp10_common/Makefile‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,24 @@ define PROJECT_APP_EXTRA_KEYS
1010
]},
1111
{build_tools, ["make", "rebar3"]},
1212
{files, [
13-
$(RABBITMQ_HEXPM_DEFAULT_FILES),
14-
"mk"
13+
$(RABBITMQ_HEXPM_DEFAULT_FILES)
1514
]}
1615
endef
1716

18-
DIALYZER_OPTS += --src -r test
19-
BUILD_DEPS = rabbit_common
17+
define HEX_TARBALL_EXTRA_METADATA
18+
#{
19+
licenses => [<<"MPL-2.0">>],
20+
links => #{
21+
<<"Website">> => <<"https://www.rabbitmq.com">>,
22+
<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_common">>
23+
}
24+
}
25+
endef
2026

21-
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
22-
# reviewed and merged.
27+
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
2328

24-
ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git
25-
ERLANG_MK_COMMIT = rabbitmq-tmp
29+
DIALYZER_OPTS += --src -r test
30+
BUILD_DEPS = rabbit_common
2631

2732
# Variables and recipes in development.*.mk are meant to be used from
2833
# any Git clone. They are excluded from the files published to Hex.pm.

‎deps/amqp_client/Makefile‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ PROJECT_REGISTERED = amqp_sup
55

66
define PROJECT_ENV
77
[
8-
{prefer_ipv6, false},
9-
{ssl_options, []},
10-
{writer_gc_threshold, 1000000000}
11-
]
8+
{prefer_ipv6, false},
9+
{ssl_options, []},
10+
{writer_gc_threshold, 1000000000}
11+
]
1212
endef
1313

1414
define PROJECT_APP_EXTRA_KEYS
@@ -25,6 +25,17 @@ define PROJECT_APP_EXTRA_KEYS
2525
]}
2626
endef
2727

28+
define HEX_TARBALL_EXTRA_METADATA
29+
#{
30+
licenses => [<<"MPL-2.0">>],
31+
links => #{
32+
<<"Website">> => <<"https://www.rabbitmq.com">>,
33+
<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/deps/amqp_client">>,
34+
<<"User guide">> => <<"https://www.rabbitmq.com/erlang-client-user-guide.html">>
35+
}
36+
}
37+
endef
38+
2839
# Release artifacts are put in $(PACKAGES_DIR).
2940
PACKAGES_DIR ?= $(abspath PACKAGES)
3041

@@ -42,13 +53,9 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
4253

4354
PLT_APPS = ssl public_key
4455

45-
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
46-
# reviewed and merged.
47-
48-
ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git
49-
ERLANG_MK_COMMIT = rabbitmq-tmp
50-
5156
WITHOUT = plugins/proper
5257

5358
include ../../rabbitmq-components.mk
5459
include ../../erlang.mk
60+
61+
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk

‎deps/rabbit_common/Makefile‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define PROJECT_APP_EXTRA_KEYS
66
{licenses, ["MPL-2.0"]},
77
{links, [
88
{"Website", "https://www.rabbitmq.com/"},
9-
{"GitHub", "https://github.com/rabbitmq/rabbitmq-common"}
9+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/rabbit_common"}
1010
]},
1111
{build_tools, ["make", "rebar3"]},
1212
{files, [
@@ -15,17 +15,21 @@ define PROJECT_APP_EXTRA_KEYS
1515
]}
1616
endef
1717

18+
define HEX_TARBALL_EXTRA_METADATA
19+
#{
20+
licenses => [<<"MPL-2.0">>],
21+
links => #{
22+
<<"Website">> => <<"https://www.rabbitmq.com">>,
23+
<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/deps/rabbit_common">>
24+
}
25+
}
26+
endef
27+
1828
LOCAL_DEPS = compiler crypto public_key sasl ssl syntax_tools tools xmerl
1929
DEPS = jsx recon credentials_obfuscation
2030

2131
dep_credentials_obfuscation = hex 2.4.0
2232

23-
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
24-
# reviewed and merged.
25-
26-
ERLANG_MK_REPO = https://github.com/rabbitmq/erlang.mk.git
27-
ERLANG_MK_COMMIT = rabbitmq-tmp
28-
2933
# Variables and recipes in development.*.mk are meant to be used from
3034
# any Git clone. They are excluded from the files published to Hex.pm.
3135
# Generated files are published to Hex.pm however so people using this
@@ -50,4 +54,6 @@ PLT_APPS += mnesia crypto ssl
5054
include ../../rabbitmq-components.mk
5155
include ../../erlang.mk
5256

57+
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk
58+
5359
-include development.post.mk

‎deps/rabbit_common/mk/rabbitmq-components.hexpm.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ endif
3030
# RabbitMQ components.
3131
# --------------------------------------------------------------------
3232

33+
dep_amqp10_client = hex $(PROJECT_VERSION)
34+
dep_amqp10_common = hex $(PROJECT_VERSION)
3335
dep_amqp_client = hex $(PROJECT_VERSION)
3436
dep_rabbit_common = hex $(PROJECT_VERSION)
3537

‎deps/rabbit_common/mk/rabbitmq-hexpm.mk‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44

55
.PHONY: hex-publish hex-publish-docs
66

7-
HEXPM_URL = https://github.com/rabbitmq/hexpm-cli/releases/latest/download/hexpm
8-
HEXPM_CLI = $(ERLANG_MK_TMP)/hexpm
9-
10-
$(HEXPM_CLI):
11-
$(verbose) mkdir -p $(ERLANG_MK_TMP)
12-
$(gen_verbose) $(call core_http_get,$@,$(HEXPM_URL))
13-
$(verbose) chmod +x $@
14-
157
RABBIT_COMMON_HEXPM_VERSION = $(PROJECT_VERSION)
168
AMQP10_COMMON_HEXPM_VERSION = $(PROJECT_VERSION)
179
AMQP10_CLIENT_HEXPM_VERSION = $(PROJECT_VERSION)
@@ -37,7 +29,7 @@ endef
3729
RMQ_COMPONENTS_PLAIN = $(DEPS_DIR)/../rabbitmq-components.mk
3830
RMQ_COMPONENTS_HEXPM = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.hexpm.mk
3931

40-
hex-publish: $(HEXPM_CLI) app rebar.config
32+
hex-publish: app rebar.config
4133
$(gen_verbose) echo "$(PROJECT_DESCRIPTION) $(PROJECT_VERSION)" \
4234
> git-revisions.txt
4335
$(verbose) mv \
@@ -59,8 +51,8 @@ hex-publish: $(HEXPM_CLI) app rebar.config
5951
rabbitmq-components.mk.not-hexpm \
6052
$(RMQ_COMPONENTS_PLAIN); \
6153
fi' EXIT INT; \
62-
$(HEXPM_CLI) publish
54+
$(MAKE) hex-release-publish
6355

64-
hex-publish-docs: $(HEXPM_CLI) app docs
56+
hex-publish-docs: app docs
6557
$(gen_verbose) trap 'rm -f rebar.lock' EXIT INT; \
66-
$(HEXPM_CLI) docs
58+
$(MAKE) hex-docs-publish

0 commit comments

Comments
 (0)