Merge branch 'master' into rabbitmq-server-379

7 files changed, 34 insertions, 9 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index fc37ceae79..9b2061b47a 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -35,6 +35,9 @@ SPEC_DEFINES=--define 'group_tag Development/Libraries'
 START_PROG=daemon
 endif
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 .PHONY: all prepare server clean
 
 all:   clean server
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index 432761c944..8328660ae7 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -22,6 +22,9 @@ else
   SIGNING=-k$(SIGNING_KEY_ID)
 endif
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 all: package
 	@:
 
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 4f5e20c03c..8d483582ec 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -15,6 +15,9 @@ SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
 TARGET_TARBALL = rabbitmq-server-generic-unix-$(VERSION)
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 all: dist
 	@:
 
diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile
index e75c656e2f..5f2cb90440 100644
--- a/packaging/standalone/Makefile
+++ b/packaging/standalone/Makefile
@@ -1,4 +1,4 @@
-SOURCE_DIST_FILE ?= $(wildcard ../../../rabbitmq-server-*.tar.xz)
+SOURCE_DIST_FILE ?= $(wildcard ../../rabbitmq-server-*.tar.xz)
 ifeq ($(SOURCE_DIST_FILE),)
 $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
 endif
@@ -30,20 +30,24 @@ RABBITMQ_DEFAULTS=$(TARGET_DIR)/sbin/rabbitmq-defaults
 fix_defaults = sed -e $(1) $(RABBITMQ_DEFAULTS) > $(RABBITMQ_DEFAULTS).tmp \
 	       && mv $(RABBITMQ_DEFAULTS).tmp $(RABBITMQ_DEFAULTS)
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 all: dist
 	@:
 
 dist:
-	tar -Jxf $(SOURCE_DIST_FILE)
+	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
+	xzcat $(SOURCE_DIST_FILE) | tar -xf -
 
 	$(MAKE) -C $(SOURCE_DIR) \
 		PREFIX= RMQ_ROOTDIR= \
-		RMQ_ERLAPP_DIR=`pwd`/$(TARGET_DIR) \
-		MANDIR=`pwd`/$(TARGET_DIR)/share/man \
+		RMQ_ERLAPP_DIR=$(abspath $(TARGET_DIR)) \
+		MANDIR=$(abspath $(TARGET_DIR))/share/man \
 		manpages install install-man
 
 	mkdir -p $(TARGET_DIR)/etc/rabbitmq
-	cp -a $(SOURCE_DIR)/docs/rabbitmq.config.example $(TARGET_DIR)/etc/rabbitmq
+	cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(TARGET_DIR)/etc/rabbitmq
 
 ## Here we set the RABBITMQ_HOME variable,
 ## then we make ERL_DIR point to our released erl
@@ -83,13 +87,16 @@ dist:
 
 # fix Erlang ROOTDIR
 	patch -o $(RLS_DIR)/erts-$(ERTS_VSN)/bin/erl $(RLS_DIR)/erts-$(ERTS_VSN)/bin/erl.src < erl.diff
+	rm -f $(RLS_DIR)/erts-$(ERTS_VSN)/bin/erl.orig
 
-	tar -zcf $(TARGET_TARBALL).tar.gz -C $(TARGET_DIR)/release $(TARGET_DIR)
+	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.gz "$(PACKAGES_DIR)"; \
+		mv $(TARGET_TARBALL).tar.xz "$(PACKAGES_DIR)"; \
 	fi
 
 clean: clean_partial
@@ -113,4 +120,5 @@ generate_release:
 	    -hidden \
 	    -s rabbit_release \
 	    -extra "$(RABBITMQ_PLUGINS_DIR)" "$(RABBITMQ_PLUGINS_EXPAND_DIR)" "$(RABBITMQ_HOME)"
+	test -f $(RABBITMQ_HOME)/rabbit.tar.gz
 	rm src/rabbit_release.beam
diff --git a/packaging/standalone/src/rabbit_release.erl b/packaging/standalone/src/rabbit_release.erl
index 21bf2484c5..4e16fd52b5 100644
--- a/packaging/standalone/src/rabbit_release.erl
+++ b/packaging/standalone/src/rabbit_release.erl
@@ -56,7 +56,9 @@ start() ->
     %% we need a list of ERTS apps we need to ship with rabbit
     {ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps),
 
-    BaseApps = SslAppsConfig ++ AllApps -- PluginAppNames,
+    BaseApps = lists:umerge(
+      lists:sort(SslAppsConfig),
+      lists:sort(AllApps -- PluginAppNames)),
 
     AppVersions = [determine_version(App) || App <- BaseApps],
     RabbitVersion = proplists:get_value(rabbit, AppVersions),
diff --git a/packaging/windows-exe/Makefile b/packaging/windows-exe/Makefile
index 047e208f09..fad0eae5f5 100644
--- a/packaging/windows-exe/Makefile
+++ b/packaging/windows-exe/Makefile
@@ -3,10 +3,13 @@ ZIP_DIR = ../windows
 else
 ZIP_DIR = $(PACKAGES_DIR)
 endif
-ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-[0-9.]*.zip))
+ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-$(VERSION).zip))
 
 VERSION = $(patsubst rabbitmq-server-windows-%.zip,%,$(ZIP))
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 all: dist
 	@:
 
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index f11293391d..4fc72b95c4 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -15,6 +15,9 @@ SOURCE_DIR = rabbitmq-server-$(VERSION)
 TARGET_DIR = rabbitmq_server-$(VERSION)
 TARGET_ZIP = rabbitmq-server-windows-$(VERSION)
 
+unexport DEPS_DIR
+unexport ERL_LIBS
+
 all: dist
 	@: