diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-08 14:16:32 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-08 14:16:32 +0100 |
| commit | 8113a819f08f99ece57e033603941b56ee43ab23 (patch) | |
| tree | 53dfbcfdeee42875ddaeea753a9ddf5778f436b0 | |
| parent | f2ac67c88d06dec3ce18eb1a9777ea37eb3334d0 (diff) | |
| download | rabbitmq-server-git-8113a819f08f99ece57e033603941b56ee43ab23.tar.gz | |
add plugins to generic unix archive
Since we don't want to build the entire public-umbrella several times when
building the broker artifacts (once for each of generic-unix, windows, deb and
rpm), we make the location of the built plugins configurable in the broker's
Makefile. I.e. the broker will normally install the plugins from
provided_plugins/ (build by make plugin), but, if PLUGIN_DIST_DIR is set, it
will install the plugins from there. This applies only to the install target.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/rabbitmq-server.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/rabbitmq-service.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/rabbitmqctl.bat | 0 |
5 files changed, 8 insertions, 2 deletions
@@ -58,6 +58,7 @@ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_m VERSION=0.0.0 PLUGINS_SRC_DIR= +PLUGINS_DIST_DIR=provided_plugins TARBALL_NAME=rabbitmq-server-$(VERSION) TARGET_SRC_DIR=dist/$(TARBALL_NAME) @@ -102,9 +103,10 @@ endif all: $(TARGETS) +.PHONY: plugins plugins: - [ -d "plugins-src" ] || echo No plugins source distribution found - ln -s .. plugins-src/rabbitmq-server + [ -d "plugins-src" ] || { echo No plugins source distribution found; false; } + ln -sf .. plugins-src/rabbitmq-server mkdir -p provided_plugins $(MAKE) -C plugins-src plugins-dist PLUGINS_DIST_DIR=$(CURDIR)/provided_plugins VERSION=$(VERSION) @@ -299,6 +301,8 @@ install_bin: all install_dirs done mkdir -p $(TARGET_DIR)/plugins echo Put your .ez plugin files in this directory. > $(TARGET_DIR)/plugins/README + mkdir -p $(TARGET_DIR)/provided_plugins + -cp $(PLUGINS_DIST_DIR)/*.ez $(TARGET_DIR)/provided_plugins install_docs: docs_all install_dirs for section in 1 5; do \ diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index b5c342aad7..0c8b26ea79 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -2,6 +2,7 @@ VERSION=0.0.0 SOURCE_DIR=rabbitmq-server-$(VERSION) TARGET_DIR=rabbitmq_server-$(VERSION) TARGET_TARBALL=rabbitmq-server-generic-unix-$(VERSION) +PLUGINS_DIST_DIR= dist: tar -zxf ../../dist/$(SOURCE_DIR).tar.gz @@ -10,6 +11,7 @@ dist: TARGET_DIR=`pwd`/$(TARGET_DIR) \ SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \ MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \ + PLUGINS_DIST_DIR=$(PLUGINS_DIST_DIR) \ install tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR) diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 5e2097dbe9..5e2097dbe9 100644..100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index b2aa4f58c9..b2aa4f58c9 100644..100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat index a74a91fd91..a74a91fd91 100644..100755 --- a/scripts/rabbitmqctl.bat +++ b/scripts/rabbitmqctl.bat |