Move from .app.src to Makefile variables

This is the recommended way with Erlang.mk.

By default, the version is inherited from rabbitmq-server-release when
the source archive is created, or computed from git-describe(1) (see
`rabbitmq-components.mk`). One can override the version from the command
line by setting the `PROJECT_VERSION` variable.

[#130992027]
This commit is contained in:
Jean-Sébastien Pédron 2016-12-06 15:32:08 +01:00
parent 8120594c0b
commit 636fb21b40
3 changed files with 43 additions and 25 deletions

View File

@ -1,4 +1,27 @@
PROJECT = rabbitmq_auth_backend_ldap
PROJECT_DESCRIPTION = RabbitMQ LDAP Authentication Backend
define PROJECT_ENV
[
{servers, undefined},
{user_dn_pattern, "$${username}"},
{dn_lookup_attribute, none},
{dn_lookup_base, none},
{group_lookup_base, none},
{dn_lookup_bind, as_user},
{other_bind, as_user},
{vhost_access_query, {constant, true}},
{resource_access_query, {constant, true}},
{tag_queries, [{administrator, {constant, false}}]},
{use_ssl, false},
{use_starttls, false},
{ssl_options, []},
{port, 3890},
{timeout, infinity},
{log, false},
{pool_size, 64}
]
endef
DEPS = rabbit_common rabbit
TEST_DEPS = ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client

View File

@ -5,6 +5,26 @@ ifeq ($(.DEFAULT_GOAL),)
.DEFAULT_GOAL = all
endif
# PROJECT_VERSION defaults to:
# 1. the version exported by rabbitmq-server-release;
# 2. the version stored in `git-revisions.txt`, if it exists;
# 3. a version based on git-describe(1), if it is a Git clone;
# 4. 0.0.0
PROJECT_VERSION = $(RABBITMQ_VERSION)
ifeq ($(PROJECT_VERSION),)
PROJECT_VERSION := $(shell \
if test -f git-revisions.txt; then \
head -n1 git-revisions.txt | \
awk '{print $$$(words $(PROJECT_DESCRIPTION) version);}'; \
else \
(git describe --dirty --abbrev=7 --tags --always --first-parent \
2>/dev/null || echo rabbitmq_v0_0_0) | \
sed -e 's/rabbitmq_v//' -e 's/_/./g' -e 's/-/+/' -e 's/-/./g'; \
fi)
endif
# --------------------------------------------------------------------
# RabbitMQ components.
# --------------------------------------------------------------------

View File

@ -1,25 +0,0 @@
%% -*- erlang -*-
{application, rabbitmq_auth_backend_ldap,
[{description, "RabbitMQ LDAP Authentication Backend"},
{vsn, ""},
{modules, []},
{registered, []},
{mod, {rabbit_auth_backend_ldap_app, []}},
{env, [ {servers, undefined},
{user_dn_pattern, "${username}"},
{dn_lookup_attribute, none},
{dn_lookup_base, none},
{group_lookup_base, none},
{dn_lookup_bind, as_user},
{other_bind, as_user},
{vhost_access_query, {constant, true}},
{resource_access_query, {constant, true}},
{tag_queries, [{administrator, {constant, false}}]},
{use_ssl, false},
{use_starttls, false},
{ssl_options, []},
{port, 3890},
{timeout, infinity},
{log, false},
{pool_size, 64} ] },
{applications, [kernel, stdlib, eldap, rabbit_common, rabbit]}]}.