root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Jean-Sébastien Pédron 2017-01-17 17:38:22 +01:00
parent 18989d0978 b9dd874671
commit 80e98d524c
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -62,6 +62,7 @@ RSYNC_FLAGS += -a $(RSYNC_V) \
--exclude '.travis.yml' \ --exclude '.travis.yml' \
--exclude '.*.plt' \ --exclude '.*.plt' \
--exclude '$(notdir $(ERLANG_MK_TMP))' \ --exclude '$(notdir $(ERLANG_MK_TMP))' \
--exclude '_build/' \
--exclude 'cover/' \ --exclude 'cover/' \
--exclude 'deps/' \ --exclude 'deps/' \
--exclude 'ebin/' \ --exclude 'ebin/' \
@ -78,12 +79,18 @@ RSYNC_FLAGS += -a $(RSYNC_V) \
--exclude 'xrefr' \ --exclude 'xrefr' \
--exclude '/$(notdir $(PACKAGES_DIR))/' \ --exclude '/$(notdir $(PACKAGES_DIR))/' \
--exclude '/PACKAGES/' \ --exclude '/PACKAGES/' \
--exclude '/upgrade/' \
--exclude '/amqp_client/doc/' \
--exclude '/amqp_client/rebar.config' \
--exclude '/cowboy/doc/' \ --exclude '/cowboy/doc/' \
--exclude '/cowboy/examples/' \ --exclude '/cowboy/examples/' \
--exclude '/rabbitmq_amqp1_0/test/swiftmq/build/'\ --exclude '/rabbitmq_amqp1_0/test/swiftmq/build/'\
--exclude '/rabbitmq_amqp1_0/test/swiftmq/swiftmq*'\ --exclude '/rabbitmq_amqp1_0/test/swiftmq/swiftmq*'\
--exclude '/rabbitmq_mqtt/test/build/' \ --exclude '/rabbitmq_mqtt/test/build/' \
--exclude '/rabbitmq_mqtt/test/test_client/'\ --exclude '/rabbitmq_mqtt/test/test_client/'\
--exclude '/ranch/doc/' \
--exclude '/ranch/examples/' \
--exclude '/sockjs/examples/' \
--delete \ --delete \
--delete-excluded --delete-excluded
@ -144,32 +151,32 @@ $(SOURCE_DIST): $(ERLANG_MK_RECURSIVE_DEPS_LIST)
done done
$(verbose) echo "PLUGINS := $(PLUGINS)" > $@/plugins.mk $(verbose) echo "PLUGINS := $(PLUGINS)" > $@/plugins.mk
$(SOURCE_DIST).manifest: $(SOURCE_DIST)
$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
find $(notdir $(SOURCE_DIST)) | LC_COLLATE=C sort > $@
# TODO: Fix file timestamps to have reproducible source archives. # TODO: Fix file timestamps to have reproducible source archives.
# $(verbose) find $@ -not -name 'git-revisions.txt' -print0 | xargs -0 touch -r $@/git-revisions.txt # $(verbose) find $@ -not -name 'git-revisions.txt' -print0 | xargs -0 touch -r $@/git-revisions.txt
$(SOURCE_DIST).tar.gz: $(SOURCE_DIST) $(SOURCE_DIST).tar.gz: $(SOURCE_DIST).manifest
$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \ $(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
find $(notdir $(SOURCE_DIST)) -print0 | LC_COLLATE=C sort -z | \ $(TAR) $(TAR_V) -T $(SOURCE_DIST).manifest --no-recursion -cf - | \
xargs -0 $(TAR) $(TAR_V) --no-recursion -cf - | \
$(GZIP) --best > $@ $(GZIP) --best > $@
$(SOURCE_DIST).tar.bz2: $(SOURCE_DIST) $(SOURCE_DIST).tar.bz2: $(SOURCE_DIST).manifest
$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \ $(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
find $(notdir $(SOURCE_DIST)) -print0 | LC_COLLATE=C sort -z | \ $(TAR) $(TAR_V) -T $(SOURCE_DIST).manifest --no-recursion -cf - | \
xargs -0 $(TAR) $(TAR_V) --no-recursion -cf - | \
$(BZIP2) > $@ $(BZIP2) > $@
$(SOURCE_DIST).tar.xz: $(SOURCE_DIST) $(SOURCE_DIST).tar.xz: $(SOURCE_DIST).manifest
$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \ $(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
find $(notdir $(SOURCE_DIST)) -print0 | LC_COLLATE=C sort -z | \ $(TAR) $(TAR_V) -T $(SOURCE_DIST).manifest --no-recursion -cf - | \
xargs -0 $(TAR) $(TAR_V) --no-recursion -cf - | \
$(XZ) > $@ $(XZ) > $@
$(SOURCE_DIST).zip: $(SOURCE_DIST) $(SOURCE_DIST).zip: $(SOURCE_DIST).manifest
$(verbose) rm -f $@ $(verbose) rm -f $@
$(gen_verbose) cd $(dir $(SOURCE_DIST)) && \ $(gen_verbose) cd $(dir $(SOURCE_DIST)) && \
find $(notdir $(SOURCE_DIST)) -print0 | LC_COLLATE=C sort -z | \ $(ZIP) $(ZIP_V) --names-stdin $@ < $(SOURCE_DIST).manifest
xargs -0 $(ZIP) $(ZIP_V) $@
clean:: clean-source-dist clean-upgrade clean:: clean-source-dist clean-upgrade