Makefile: Store the plugins list in the source archive
We override the default $(PLUGINS) with the one specified from the command line, or with the same value if nothing was specified. This makes sure that the source archive doesn't try to fetch plugins which were not listed when it was created. [#131643765]
This commit is contained in:
parent
b40686fdc2
commit
5058c9ca3e
5
Makefile
5
Makefile
|
|
@ -10,11 +10,11 @@ export RABBITMQ_VERSION := $(PROJECT_VERSION)
|
|||
# Release artifacts are put in $(PACKAGES_DIR).
|
||||
PACKAGES_DIR ?= $(abspath PACKAGES)
|
||||
|
||||
DEPS = rabbit_common rabbit $(PLUGINS)
|
||||
|
||||
# List of plugins to include in a RabbitMQ release.
|
||||
include plugins.mk
|
||||
|
||||
DEPS = rabbit_common rabbit $(PLUGINS)
|
||||
|
||||
DEP_PLUGINS = rabbit_common/mk/rabbitmq-run.mk \
|
||||
rabbit_common/mk/rabbitmq-dist.mk \
|
||||
rabbit_common/mk/rabbitmq-tools.mk
|
||||
|
|
@ -141,6 +141,7 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
|
|||
$$file; \
|
||||
rm $$file.bak; \
|
||||
done
|
||||
$(verbose) printf "PLUGINS := $(PLUGINS)" > $@/plugins.mk
|
||||
|
||||
# TODO: Fix file timestamps to have reproducible source archives.
|
||||
# $(verbose) find $@ -not -name 'git-revisions.txt' -print0 | xargs -0 touch -r $@/git-revisions.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue