Merge branch 'master' into rabbitmq-server-62

Conflicts:
	src/rabbit_cli.erl

8 files changed, 53 insertions, 34 deletions

diff --git a/packaging/Makefile b/packaging/Makefile
index 151791152f..edb876770f 100644
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -41,6 +41,7 @@ all: packages
 PACKAGES_DIR ?= ../PACKAGES
 SOURCE_DIST_FILE ?= $(wildcard $(PACKAGES_DIR)/rabbitmq-server-*.tar.xz)
 
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -53,6 +54,11 @@ endif
 ifeq ($(wildcard $(SOURCE_DIST_FILE)),)
 $(error The source archive must exist)
 endif
+endif
+
+ifndef NO_CLEAN
+DO_CLEAN := clean
+endif
 
 packages: package-deb package-rpm package-windows package-generic-unix
 	@:
@@ -61,7 +67,7 @@ package-deb: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C debs/Debian \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 
 package-rpm: package-rpm-fedora package-rpm-suse
 	@:
@@ -70,30 +76,30 @@ package-rpm-fedora: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C RPMS/Fedora \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 
 package-rpm-suse: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C RPMS/Fedora \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
 		RPM_OS=suse \
-		all clean
+		all $(DO_CLEAN)
 
 package-windows: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C windows \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 	$(verbose) $(MAKE) -C windows-exe \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 
 package-generic-unix: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C generic-unix \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 
 ifeq ($(PLATFORM),darwin)
 packages: package-standalone-macosx
@@ -102,5 +108,12 @@ package-standalone-macosx: $(SOURCE_DIST_FILE)
 	$(gen_verbose) $(MAKE) -C standalone OS=mac \
 		SOURCE_DIST_FILE=$(abspath $(SOURCE_DIST_FILE)) \
 		PACKAGES_DIR=$(abspath $(PACKAGES_DIR)) \
-		all clean
+		all $(DO_CLEAN)
 endif
+
+.PHONY: clean
+
+clean:
+	for subdir in debs/Debian RPMS/Fedora windows windows-exe generic-unix standalone; do \
+		$(MAKE) -C "$$subdir" clean; \
+	done
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 9b2061b47a..5763cadf04 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 TOP_DIR = $(shell pwd)
 # Under debian we do not want to check build dependencies, since that
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 8328660ae7..a35b869d4f 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 DEBIAN_ORIG_TARBALL = rabbitmq-server_$(VERSION).orig.tar.xz
 UNPACKED_DIR = rabbitmq-server-$(VERSION)
diff --git a/packaging/debs/apt-repository/Makefile b/packaging/debs/apt-repository/Makefile
index ce4347bcb4..bbddc15a4e 100644
--- a/packaging/debs/apt-repository/Makefile
+++ b/packaging/debs/apt-repository/Makefile
@@ -1,27 +1,30 @@
-SIGNING_USER_EMAIL=info@rabbitmq.com
+PACKAGES_DIR ?= ../../../PACKAGES
+REPO_DIR ?= debian
+
+SIGNING_USER_EMAIL ?= info@rabbitmq.com
 
 ifeq "$(UNOFFICIAL_RELEASE)" ""
-HOME_ARG=HOME=$(GNUPG_PATH)
+HOME_ARG = HOME=$(GNUPG_PATH)
 endif
 
 all: debian_apt_repository
 
 clean:
-	rm -rf debian
+	rm -rf $(REPO_DIR)
 
 CAN_HAS_REPREPRO=$(shell [ -f /usr/bin/reprepro ] && echo true)
 ifeq ($(CAN_HAS_REPREPRO), true)
 debian_apt_repository: clean
-	mkdir -p debian/conf
-	cp -a distributions debian/conf
+	mkdir -p $(REPO_DIR)/conf
+	cp -a distributions $(REPO_DIR)/conf
 ifeq "$(UNOFFICIAL_RELEASE)" ""
-	echo SignWith: $(SIGNING_USER_EMAIL) >> debian/conf/distributions
+	echo SignWith: $(SIGNING_USER_EMAIL) >> $(REPO_DIR)/conf/distributions
 endif
-	for FILE in ../Debian/*.changes ; do \
+	for FILE in $(PACKAGES_DIR)/*.changes ; do \
 		$(HOME_ARG) reprepro --ignore=wrongdistribution \
-			-Vb debian include kitten $${FILE} ; \
+			-Vb $(REPO_DIR) include kitten $${FILE} ; \
 	done
-	reprepro -Vb debian createsymlinks
+	reprepro -Vb $(REPO_DIR) createsymlinks
 else
 debian_apt_repository:
 	@echo Not building APT repository as reprepro could not be found
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 8d483582ec..fb8b3a9e68 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
@@ -38,7 +41,6 @@ dist:
 	mkdir -p $(TARGET_DIR)/etc/rabbitmq
 
 	tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR)
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
 	if test "$(PACKAGES_DIR)"; then \
 		mkdir -p "$(PACKAGES_DIR)"; \
@@ -49,5 +51,4 @@ clean: clean_partial
 	rm -f rabbitmq-server-generic-unix-*.tar.gz
 
 clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+	rm -rf rabbitmq-server-* rabbitmq_server-*
diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile
index 5f2cb90440..578ed57345 100644
--- a/packaging/standalone/Makefile
+++ b/packaging/standalone/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR=rabbitmq-server-$(VERSION)
 TARGET_DIR=rabbitmq_server-$(VERSION)
@@ -92,19 +95,14 @@ dist:
 	cd $(TARGET_DIR)/release && \
 		find $(TARGET_DIR) -print0 | LC_COLLATE=C sort -z | \
 		xargs -0 tar -cnf - | xz > $(CURDIR)/$(TARGET_TARBALL).tar.xz
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
 	if test "$(PACKAGES_DIR)"; then \
 		mkdir -p "$(PACKAGES_DIR)"; \
 		mv $(TARGET_TARBALL).tar.xz "$(PACKAGES_DIR)"; \
 	fi
 
-clean: clean_partial
-	rm -f rabbitmq-server-$(OS)-standalone-*.tar.gz
-
-clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+clean:
+	rm -rf rabbitmq-server-* rabbitmq_server-*
 
 .PHONY : generate_release
 generate_release:
diff --git a/packaging/windows-exe/Makefile b/packaging/windows-exe/Makefile
index fad0eae5f5..26ef4585c3 100644
--- a/packaging/windows-exe/Makefile
+++ b/packaging/windows-exe/Makefile
@@ -3,7 +3,7 @@ ZIP_DIR = ../windows
 else
 ZIP_DIR = $(PACKAGES_DIR)
 endif
-ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-$(VERSION).zip))
+ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-*.zip))
 
 VERSION = $(patsubst rabbitmq-server-windows-%.zip,%,$(ZIP))
 
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 4fc72b95c4..beda5752be 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -1,4 +1,6 @@
 SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+
+ifneq ($(filter-out clean,$(MAKECMDGOALS)),)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -10,6 +12,7 @@ VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
 ifeq ($(VERSION),)
 $(error Cannot determine version; please specify VERSION)
 endif
+endif
 
 SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
@@ -30,16 +33,11 @@ dist:
 	cp -a README-etc $(TARGET_DIR)/etc/README.txt
 
 	zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
-	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
 	if test "$(PACKAGES_DIR)"; then \
 		mkdir -p "$(PACKAGES_DIR)"; \
 		mv $(TARGET_ZIP).zip "$(PACKAGES_DIR)"; \
 	fi
 
-clean: clean_partial
-	rm -f rabbitmq-server-windows-*.zip
-
-clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+clean:
+	rm -rf rabbitmq-server-* rabbitmq_server-*