Packaging location changes for debs, macports, windows and RPMS

6 files changed, 73 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 9c372a28..9e599597 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ srcdist: distclean
 	sed -i.save 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in && rm -f $(TARGET_SRC_DIR)/ebin/rabbit_app.in.save
 
 	cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
-	cp codegen.py Makefile generate_app $(TARGET_SRC_DIR)
+	cp codegen.py Makefile generate_app calculate-relative $(TARGET_SRC_DIR)
 
 	cp -r scripts $(TARGET_SRC_DIR)
 	cp -r docs $(TARGET_SRC_DIR)
@@ -162,7 +162,8 @@ distclean: clean
 
 docs_all: $(MANPAGES)
 
-install: all docs_all
+install: SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR))
+install: all docs_all install_dirs
 	@[ -n "$(TARGET_DIR)" ] || (echo "Please set TARGET_DIR."; false)
 	@[ -n "$(SBIN_DIR)" ] || (echo "Please set SBIN_DIR."; false)
 	@[ -n "$(MAN_DIR)" ] || (echo "Please set MAN_DIR."; false)
@@ -171,13 +172,17 @@ install: all docs_all
 	cp -r ebin include LICENSE LICENSE-MPL-RabbitMQ INSTALL $(TARGET_DIR)
 
 	chmod 0755 scripts/*
-	mkdir -p $(SBIN_DIR)
-	cp scripts/rabbitmq-server $(SBIN_DIR)
-	cp scripts/rabbitmqctl $(SBIN_DIR)
-	cp scripts/rabbitmq-multi $(SBIN_DIR)
+	for script in rabbitmq-server rabbitmqctl rabbitmq-multi activate-plugins; do \
+		cp scripts/$$script $(TARGET_DIR)/sbin; \
+		[ -e $(SBIN_DIR)/$$script ] || ln -s $(SCRIPTS_REL_PATH)/$$script $(SBIN_DIR)/$$script; \
+ 	done
 	for section in 1 5; do \
 		mkdir -p $(MAN_DIR)/man$$section; \
 		for manpage in docs/*.$$section.pod; do \
 			cp docs/`basename $$manpage .pod`.gz $(MAN_DIR)/man$$section; \
 		done; \
 	done
+
+install_dirs:
+	mkdir -p $(SBIN_DIR)
+	mkdir -p $(TARGET_DIR)/sbin
diff --git a/calculate-relative b/calculate-relative
new file mode 100755
index 00000000..3c3e2b1f
--- /dev/null
+++ b/calculate-relative
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+#
+# relpath.py
+# R.Barran 30/08/2004
+# Retrieved from http://code.activestate.com/recipes/302594/
+
+import os
+import sys
+
+def relpath(target, base=os.curdir):
+    """
+    Return a relative path to the target from either the current dir or an optional base dir.
+    Base can be a directory specified either as absolute or relative to current dir.
+    """
+
+    if not os.path.exists(target):
+        raise OSError, 'Target does not exist: '+target
+
+    if not os.path.isdir(base):
+        raise OSError, 'Base is not a directory or does not exist: '+base
+
+    base_list = (os.path.abspath(base)).split(os.sep)
+    target_list = (os.path.abspath(target)).split(os.sep)
+
+    # On the windows platform the target may be on a completely different drive from the base.
+    if os.name in ['nt','dos','os2'] and base_list[0] <> target_list[0]:
+        raise OSError, 'Target is on a different drive to base. Target: '+target_list[0].upper()+', base: '+base_list[0].upper()
+
+    # Starting from the filepath root, work out how much of the filepath is
+    # shared by base and target.
+    for i in range(min(len(base_list), len(target_list))):
+        if base_list[i] <> target_list[i]: break
+    else:
+        # If we broke out of the loop, i is pointing to the first differing path elements.
+        # If we didn't break out of the loop, i is pointing to identical path elements.
+        # Increment i so that in all cases it points to the first differing path elements.
+        i+=1
+
+    rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:]
+    if (len(rel_list) == 0):
+        return "."
+    return os.path.join(*rel_list)
+
+if __name__ == "__main__":
+    print(relpath(sys.argv[1], sys.argv[2]))
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index eb953b81..20aa37f0 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -22,7 +22,7 @@ RabbitMQ is an implementation of AMQP, the emerging standard for high
 performance enterprise messaging. The RabbitMQ server is a robust and
 scalable implementation of an AMQP broker.
 
-%define _rabbit_erllibdir %{_libdir}/erlang/lib/rabbitmq_server-%{version}
+%define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version}
 %define _rabbit_libdir %{_libdir}/rabbitmq
 %define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
 
@@ -51,6 +51,7 @@ install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-multi
+install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/activate-plugins
 
 install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
 
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 31904851..105e445c 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-RABBIT_LIB=$(DEB_DESTDIR)usr/lib/erlang/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)/
+RABBIT_LIB=$(DEB_DESTDIR)usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)/
 RABBIT_BIN=$(DEB_DESTDIR)usr/lib/rabbitmq/bin/
 
 DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) MAN_DIR=$(DEB_DESTDIR)usr/share/man/
@@ -14,6 +14,6 @@ DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
 install/rabbitmq-server::
 	mkdir -p $(DOCDIR)
 	rm $(RABBIT_LIB)LICENSE*
-	for script in rabbitmqctl rabbitmq-server rabbitmq-multi; do \
+	for script in rabbitmqctl rabbitmq-server rabbitmq-multi activate-plugins; do \
 		install -p -D -m 0755 debian/rabbitmq-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \
 	done
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
index b8096d20..efeb93b5 100644
--- a/packaging/macports/net/rabbitmq-server/Portfile
+++ b/packaging/macports/net/rabbitmq-server/Portfile
@@ -42,7 +42,7 @@ use_parallel_build yes
 build.args      PYTHON=${prefix}/bin/python2.5
 
 destroot.destdir \
-    TARGET_DIR=${destroot}${prefix}/lib/erlang/lib/rabbitmq_server-${version} \
+    TARGET_DIR=${destroot}${prefix}/rabbitmq/erlang/lib/rabbitmq_server-${version} \
     SBIN_DIR=${sbindir} \
     MAN_DIR=${destroot}${prefix}/share/man
 
@@ -63,23 +63,28 @@ post-destroot {
     reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
         ${sbindir}/rabbitmq-multi \
         ${sbindir}/rabbitmq-server \
-        ${sbindir}/rabbitmqctl
+        ${sbindir}/rabbitmqctl \
+        ${sbindir}/activate-plugins
     reinplace -E "s:(CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
         ${sbindir}/rabbitmq-multi \
         ${sbindir}/rabbitmq-server \
-        ${sbindir}/rabbitmqctl
+        ${sbindir}/rabbitmqctl \
+        ${sbindir}/activate-plugins
     reinplace -E "s:(LOG_BASE)=/:\\1=${prefix}/:" \
         ${sbindir}/rabbitmq-multi \
         ${sbindir}/rabbitmq-server \
-        ${sbindir}/rabbitmqctl
+        ${sbindir}/rabbitmqctl \
+        ${sbindir}/activate-plugins
     reinplace -E "s:(MNESIA_BASE)=/:\\1=${prefix}/:" \
         ${sbindir}/rabbitmq-multi \
         ${sbindir}/rabbitmq-server \
-        ${sbindir}/rabbitmqctl
+        ${sbindir}/rabbitmqctl \
+        ${sbindir}/activate-plugins
     reinplace -E "s:(PIDS_FILE)=/:\\1=${prefix}/:" \
         ${sbindir}/rabbitmq-multi \
         ${sbindir}/rabbitmq-server \
-        ${sbindir}/rabbitmqctl
+        ${sbindir}/rabbitmqctl \
+        ${sbindir}/activate-plugins
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-multi
@@ -90,6 +95,7 @@ post-destroot {
                 ${wrappersbin}/rabbitmq-multi
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+    file copy ${wrappersbin}/activate-plugins ${wrappersbin}/activate-plugins
 
 }
 
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 59101cb2..0525831a 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -13,6 +13,7 @@ dist:
 	mv $(SOURCE_DIR)/scripts/rabbitmq-service.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmqctl.bat $(SOURCE_DIR)/sbin
 	mv $(SOURCE_DIR)/scripts/rabbitmq-multi.bat $(SOURCE_DIR)/sbin
+	mv $(SOURCE_DIR)/scripts/activate-plugins.bat $(SOURCE_DIR)/sbin
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
 	rm -f $(SOURCE_DIR)/README