Merge branch 'master' into rabbitmq-server-351

2 files changed, 45 insertions, 45 deletions

diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 5dc802a8c2..beda5752be 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -1,43 +1,43 @@
-VERSION=0.0.0
-SOURCE_DIR=rabbitmq-server-$(VERSION)
-TARGET_DIR=rabbitmq_server-$(VERSION)
-TARGET_ZIP=rabbitmq-server-windows-$(VERSION)
+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
+ifneq ($(words $(SOURCE_DIST_FILE)),1)
+$(error Multile source archives found; please specify SOURCE_DIST_FILE)
+endif
+
+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)
+TARGET_ZIP = rabbitmq-server-windows-$(VERSION)
+
+unexport DEPS_DIR
+unexport ERL_LIBS
+
+all: dist
+	@:
 
 dist:
-	tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
-	$(MAKE) -C $(SOURCE_DIR)
-
-	mkdir -p $(SOURCE_DIR)/sbin
-	mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin
-	mkdir -p $(SOURCE_DIR)/etc
-	cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(SOURCE_DIR)/etc/rabbitmq.config.example
-	cp README-etc $(SOURCE_DIR)/etc/README.txt
-	rm -rf $(SOURCE_DIR)/scripts
-	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile $(SOURCE_DIR)/*mk
-	rm -f $(SOURCE_DIR)/README
-	rm -rf $(SOURCE_DIR)/docs
-	rm -rf $(SOURCE_DIR)/src
-	rm -rf $(SOURCE_DIR)/dist
-
-	mv $(SOURCE_DIR) $(TARGET_DIR)
-	mkdir -p $(TARGET_DIR)
-	mv $(TARGET_DIR)/plugins/README $(TARGET_DIR)/plugins/README.txt
-	xmlto -o . xhtml-nochunks ../../docs/rabbitmq-service.xml
-	elinks -dump -no-references -no-numbering rabbitmq-service.html \
-		> $(TARGET_DIR)/readme-service.txt
-	todos $(TARGET_DIR)/readme-service.txt
-	todos $(TARGET_DIR)/INSTALL
-	todos $(TARGET_DIR)/LICENSE*
-	todos $(TARGET_DIR)/plugins/README.txt
-	todos $(TARGET_DIR)/etc/rabbitmq.config.example
-	todos $(TARGET_DIR)/etc/README.txt
-	rm -rf $(TARGET_DIR)/plugins-src
+	tar -Jxf $(SOURCE_DIST_FILE)
+	$(MAKE) -C $(SOURCE_DIR) install-windows \
+		DESTDIR=$(abspath $(TARGET_DIR)) \
+		WINDOWS_PREFIX=
+
+	cp -a README-etc $(TARGET_DIR)/etc/README.txt
+
 	zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
-	rm -rf $(TARGET_DIR) rabbitmq-service.html
 
-clean: clean_partial
-	rm -f rabbitmq-server-windows-*.zip
+	if test "$(PACKAGES_DIR)"; then \
+		mkdir -p "$(PACKAGES_DIR)"; \
+		mv $(TARGET_ZIP).zip "$(PACKAGES_DIR)"; \
+	fi
 
-clean_partial:
-	rm -rf $(SOURCE_DIR)
-	rm -rf $(TARGET_DIR)
+clean:
+	rm -rf rabbitmq-server-* rabbitmq_server-*
diff --git a/packaging/windows/README-etc b/packaging/windows/README-etc
index 807698e81f..b431247c6b 100644
--- a/packaging/windows/README-etc
+++ b/packaging/windows/README-etc
@@ -1,7 +1,7 @@
-In this directory you can find an example configuration file for RabbitMQ.
-
-Note that this directory is *not* where the real RabbitMQ
-configuration lives. The default location for the real configuration
-file is %APPDATA%\RabbitMQ\rabbitmq.config.
-
-%APPDATA% usually expands to C:\Users\%USERNAME%\AppData\Roaming or similar.
+In this directory you can find an example configuration file for RabbitMQ.

+

+Note that this directory is *not* where the real RabbitMQ

+configuration lives. The default location for the real configuration

+file is %APPDATA%\RabbitMQ\rabbitmq.config.

+

+%APPDATA% usually expands to C:\Users\%USERNAME%\AppData\Roaming or similar.