Skip to content

Commit 106c46f

Browse files
committed
Update amqp10_client and amqp10_common for hex.pm publish
Fixes #2577 Related rabbitmq/rabbitmq-ci#50
1 parent f62c754 commit 106c46f

File tree

3 files changed

+39
-9
lines changed

3 files changed

+39
-9
lines changed

deps/amqp10_client/Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,30 @@ PROJECT = amqp10_client
22
PROJECT_DESCRIPTION = AMQP 1.0 client from the RabbitMQ Project
33
PROJECT_MOD = amqp10_client_app
44

5+
define PROJECT_APP_EXTRA_KEYS
6+
%% Hex.pm package informations.
7+
{licenses, ["MPL 2.0"]},
8+
{links, [
9+
{"Website", "https://www.rabbitmq.com/"},
10+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_client"}
11+
]},
12+
{build_tools, ["make", "rebar3"]},
13+
{files, [
14+
$(RABBITMQ_HEXPM_DEFAULT_FILES)
15+
]}
16+
endef
17+
18+
# Release artifacts are put in $(PACKAGES_DIR).
19+
PACKAGES_DIR ?= $(abspath PACKAGES)
20+
521
BUILD_DEPS = rabbit_common elvis_mk
622
DEPS = amqp10_common
723
TEST_DEPS = rabbit rabbitmq_amqp1_0 rabbitmq_ct_helpers
824
LOCAL_DEPS = ssl inets crypto
925

1026
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
1127
DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
28+
rabbit_common/mk/rabbitmq-build.mk \
1229
rabbit_common/mk/rabbitmq-hexpm.mk \
1330
rabbit_common/mk/rabbitmq-dist.mk \
1431
rabbit_common/mk/rabbitmq-run.mk \

deps/amqp10_common/Makefile

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
PROJECT = amqp10_common
22
PROJECT_DESCRIPTION = Modules shared by rabbitmq-amqp1.0 and rabbitmq-amqp1.0-client
33

4-
DIALYZER_OPTS += --src -r test
4+
define PROJECT_APP_EXTRA_KEYS
5+
%% Hex.pm package informations.
6+
{licenses, ["MPL-2.0"]},
7+
{links, [
8+
{"Website", "https://www.rabbitmq.com/"},
9+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_common"}
10+
]},
11+
{build_tools, ["make", "rebar3"]},
12+
{files, [
13+
$(RABBITMQ_HEXPM_DEFAULT_FILES),
14+
"mk"
15+
]}
16+
endef
517

18+
DIALYZER_OPTS += --src -r test
619
BUILD_DEPS = rabbit_common
720

8-
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
9-
DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
10-
rabbit_common/mk/rabbitmq-hexpm.mk \
11-
rabbit_common/mk/rabbitmq-dist.mk \
12-
rabbit_common/mk/rabbitmq-test.mk \
13-
rabbit_common/mk/rabbitmq-tools.mk
14-
1521
# FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
1622
# reviewed and merged.
1723

@@ -28,6 +34,13 @@ ERLANG_MK_COMMIT = rabbitmq-tmp
2834

2935
-include development.pre.mk
3036

37+
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
38+
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
39+
rabbit_common/mk/rabbitmq-hexpm.mk \
40+
rabbit_common/mk/rabbitmq-dist.mk \
41+
rabbit_common/mk/rabbitmq-test.mk \
42+
rabbit_common/mk/rabbitmq-tools.mk
43+
3144
include ../../rabbitmq-components.mk
3245
include ../../erlang.mk
3346

deps/amqp_client/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ define PROJECT_APP_EXTRA_KEYS
1616
{licenses, ["MPL 2.0"]},
1717
{links, [
1818
{"Website", "https://www.rabbitmq.com/"},
19-
{"GitHub", "https://github.com/rabbitmq/rabbitmq-erlang-client"},
19+
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp_client"},
2020
{"User guide", "https://www.rabbitmq.com/erlang-client-user-guide.html"}
2121
]},
2222
{build_tools, ["make", "rebar3"]},

0 commit comments

Comments
 (0)