diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugin | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugin.bat | 2 |
4 files changed, 8 insertions, 9 deletions
@@ -58,7 +58,7 @@ ERLC_OPTS=-I $(INCLUDE_DIR) -o $(EBIN_DIR) -Wall -v +debug_info $(call boolean_m VERSION=0.0.0 PLUGINS_SRC_DIR?=$(shell [ -d "plugins-src" ] && echo "plugins-src" || echo ) -PLUGINS_DIST_DIR?=provided_plugins +PLUGINS_DIST_DIR=plugins-dist TARBALL_NAME=rabbitmq-server-$(VERSION) TARGET_SRC_DIR=dist/$(TARBALL_NAME) @@ -108,8 +108,8 @@ ifneq "$(PLUGINS_SRC_DIR)" "" plugins: [ -d "$(PLUGINS_SRC_DIR)" ] || { echo "No plugins source distribution found (try linking public-umbrella to $(PLUGINS_SRC_DIR)"; false; } -ln -s $(CURDIR) "$(PLUGINS_SRC_DIR)/rabbitmq-server" - mkdir -p provided_plugins - PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/provided_plugins" VERSION=$(VERSION) + mkdir -p $(PLUGINS_DIST_DIR) + PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/$(PLUGINS_DIST_DIR)" VERSION=$(VERSION) else plugins: # Not building plugins @@ -157,7 +157,7 @@ $(BASIC_PLT): $(BEAM_TARGETS) clean: rm -f $(EBIN_DIR)/*.beam rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel - rm -f provided_plugins/*.ez + rm -f $(PLUGINS_DIST_DIR)/*.ez -PLUGINS_SRC_DIR="" PRESERVE_CLONE_DIR=1 make -C $(PLUGINS_SRC_DIR) clean rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing_amqp_*.erl codegen.pyc rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL) @@ -308,8 +308,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 + mkdir -p $(TARGET_DIR)/$(PLUGINS_DIST_DIR) + -cp $(PLUGINS_DIST_DIR)/*.ez $(TARGET_DIR)/$(PLUGINS_DIST_DIR) install_docs: docs_all install_dirs for section in 1 5; do \ diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index b3ebb9e281..815b8cde8b 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -30,7 +30,6 @@ scalable implementation of an AMQP broker. %define _rabbit_wrapper %{_builddir}/`basename %{S:2}` %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}` %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins -%define _provided_plugins_dir %{_localstatedir}/lib/rabbitmq/provided_plugins %define _maindir %{buildroot}%{_rabbit_erllibdir} diff --git a/scripts/rabbitmq-plugin b/scripts/rabbitmq-plugin index 4583873072..d6cf2befa4 100755 --- a/scripts/rabbitmq-plugin +++ b/scripts/rabbitmq-plugin @@ -19,7 +19,7 @@ [ "x" = "x$RABBITMQ_PLUGINS_DIR" ] && RABBITMQ_PLUGINS_DIR="${RABBITMQ_HOME}/plugins" -[ "x" = "x$RABBITMQ_PLUGINS_DIST_DIR" ] && RABBITMQ_PLUGINS_DIST_DIR="${RABBITMQ_HOME}/provided_plugins" +[ "x" = "x$RABBITMQ_PLUGINS_DIST_DIR" ] && RABBITMQ_PLUGINS_DIST_DIR="${RABBITMQ_HOME}/plugins-dist" exec erl \ -pa "${RABBITMQ_HOME}/ebin" \ diff --git a/scripts/rabbitmq-plugin.bat b/scripts/rabbitmq-plugin.bat index 0aaad0ef3c..d4fd96256d 100755 --- a/scripts/rabbitmq-plugin.bat +++ b/scripts/rabbitmq-plugin.bat @@ -36,7 +36,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" ( )
set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
-set RABBITMQ_PLUGINS_DIST_DIR=!TDP0!..\provided_plugins
+set RABBITMQ_PLUGINS_DIST_DIR=!TDP0!..\plugins-dist
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugin!RANDOM! -s rabbit_plugin -plugins_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIST_DIR:\=/!" -extra !STAR!
|