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

Merge branch 'stable'

This commit is contained in:
Jean-Sébastien Pédron 2016-09-28 17:36:37 +02:00
parent 47ffad2697 aa211a1c7b
commit b8bf3e65b7
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
8 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/RPMS/Fedora/Makefile
View File

@ -46,6 +46,7 @@ endif
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
.PHONY: all prepare server clean .PHONY: all prepare server clean

4
packaging/RPMS/Fedora/rabbitmq-server.spec
View File

@ -51,12 +51,12 @@ RabbitMQ is an open source multi-protocol messaging broker.
%build %build
cp -a deps/rabbit/docs/README-for-packages %{_builddir}/rabbitmq-server-%{version}/README cp -a deps/rabbit/docs/README-for-packages %{_builddir}/rabbitmq-server-%{version}/README
make %{?_smp_mflags} dist manpages env -u DEPS_DIR make %{?_smp_mflags} dist manpages
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install install-bin install-man DESTDIR=%{buildroot} PREFIX=%{_exec_prefix} RMQ_ROOTDIR=%{_rabbit_libdir} MANDIR=%{_mandir} env -u DEPS_DIR make install install-bin install-man DESTDIR=%{buildroot} PREFIX=%{_exec_prefix} RMQ_ROOTDIR=%{_rabbit_libdir} MANDIR=%{_mandir}
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq

3
packaging/debs/Debian/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(SOURCE_DIST_FILE),)
$(error Cannot find source archive; please specify SOURCE_DIST_FILE) $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
endif endif
ifneq ($(words $(SOURCE_DIST_FILE)),1) ifneq ($(words $(SOURCE_DIST_FILE)),1)
$(error Multile source archives found; please specify SOURCE_DIST_FILE) $(error Multiple source archives found; please specify SOURCE_DIST_FILE)
endif endif
VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE))) VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
@ -26,6 +26,7 @@ endif
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
all: package all: package
@: @:

2
packaging/debs/Debian/debian/rules
View File

@ -7,6 +7,8 @@
DEB_DESTDIR = debian/rabbitmq-server DEB_DESTDIR = debian/rabbitmq-server
VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {version=$$0; sub(/Version: /, "", version); sub(/-.*/, "", version); print version;}') VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {version=$$0; sub(/Version: /, "", version); sub(/-.*/, "", version); print version;}')
unexport DEPS_DIR
%: %:
dh $@ --parallel --with systemd dh $@ --parallel --with systemd

3
packaging/generic-unix/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(SOURCE_DIST_FILE),)
$(error Cannot find source archive; please specify SOURCE_DIST_FILE) $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
endif endif
ifneq ($(words $(SOURCE_DIST_FILE)),1) ifneq ($(words $(SOURCE_DIST_FILE)),1)
$(error Multile source archives found; please specify SOURCE_DIST_FILE) $(error Multiple source archives found; please specify SOURCE_DIST_FILE)
endif endif
VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE))) VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
@ -20,6 +20,7 @@ TARGET_TARBALL = rabbitmq-server-generic-unix-$(VERSION)
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
all: dist all: dist
@: @:

3
packaging/standalone/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(SOURCE_DIST_FILE),)
$(error Cannot find source archive; please specify SOURCE_DIST_FILE) $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
endif endif
ifneq ($(words $(SOURCE_DIST_FILE)),1) ifneq ($(words $(SOURCE_DIST_FILE)),1)
$(error Multile source archives found; please specify SOURCE_DIST_FILE) $(error Multiple source archives found; please specify SOURCE_DIST_FILE)
endif endif
VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE))) VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
@ -35,6 +35,7 @@ fix_defaults = sed -e $(1) $(RABBITMQ_DEFAULTS) > $(RABBITMQ_DEFAULTS).tmp \
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
all: dist all: dist
@: @:

1
packaging/windows-exe/Makefile
View File

@ -9,6 +9,7 @@ VERSION = $(patsubst rabbitmq-server-windows-%.zip,%,$(ZIP))
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
all: dist all: dist
@: @:

3
packaging/windows/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(SOURCE_DIST_FILE),)
$(error Cannot find source archive; please specify SOURCE_DIST_FILE) $(error Cannot find source archive; please specify SOURCE_DIST_FILE)
endif endif
ifneq ($(words $(SOURCE_DIST_FILE)),1) ifneq ($(words $(SOURCE_DIST_FILE)),1)
$(error Multile source archives found; please specify SOURCE_DIST_FILE) $(error Multiple source archives found; please specify SOURCE_DIST_FILE)
endif endif
VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE))) VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE)))
@ -20,6 +20,7 @@ TARGET_ZIP = rabbitmq-server-windows-$(VERSION)
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
MAKEOVERRIDES =
all: dist all: dist
@: @: