diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rwxr-xr-x | scripts/rabbitmq-diagnostics | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins | 39 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 42 | ||||
| -rwxr-xr-x | scripts/run-escript | 9 |
5 files changed, 28 insertions, 80 deletions
@@ -1,9 +1,11 @@ PROJECT = rabbit VERSION ?= $(call get_app_version,src/$(PROJECT).app.src) -DEPS = ranch lager rabbit_common +DEPS = ranch lager rabbit_common rabbitmq_cli TEST_DEPS = rabbitmq_ct_helpers amqp_client meck proper +dep_rabbitmq_cli = git_rmq rabbitmq-cli $(current_rmq_ref) $(base_rmq_ref) rabbitmq-cli-integration + define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) endef @@ -17,7 +19,11 @@ USAGES_ERL = $(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) EXTRA_SOURCES += $(USAGES_ERL) .DEFAULT_GOAL = all -$(PROJECT).d:: $(EXTRA_SOURCES) +$(PROJECT).d:: $(EXTRA_SOURCES) gen_escripts + +gen_escripts: + cp -r ${DEPS_DIR}/rabbitmq_cli/escript ./scripts + DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ rabbit_common/mk/rabbitmq-run.mk \ @@ -56,11 +62,14 @@ USE_PROPER_QC := $(shell $(ERL) -eval 'io:format({module, proper} =:= code:ensur RMQ_ERLC_OPTS += $(if $(filter true,$(USE_PROPER_QC)),-Duse_proper_qc) endif -clean:: clean-extra-sources +clean:: clean-extra-sources clean-escripts clean-extra-sources: $(gen_verbose) rm -f $(EXTRA_SOURCES) +clean-escripts: + $(gen_verbose) rm -rf scripts/escript + # -------------------------------------------------------------------- # Documentation. # -------------------------------------------------------------------- diff --git a/scripts/rabbitmq-diagnostics b/scripts/rabbitmq-diagnostics new file mode 100755 index 0000000000..22adfb12ca --- /dev/null +++ b/scripts/rabbitmq-diagnostics @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +`dirname $0`/run-escript `dirname $0`/escript/rabbitmq-diagnostics
\ No newline at end of file diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index d72df8ad86..a7058295fe 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -1,38 +1,3 @@ -#!/bin/sh -e -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License -## at http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -## the License for the specific language governing rights and -## limitations under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. -## +#!/usr/bin/env bash -# Get default settings with user overrides for (RABBITMQ_)<var_name> -# Non-empty defaults should be set in rabbitmq-env -. `dirname $0`/rabbitmq-env - -# Disable erl_crash.dump by default for control scripts. -if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; then - export ERL_CRASH_DUMP_SECONDS=0 -fi - -RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \ -exec ${ERL_DIR}erl \ - -pa "${RABBITMQ_HOME}/ebin" \ - -noinput \ - -hidden \ - ${RABBITMQ_CTL_ERL_ARGS} \ - -boot "${CLEAN_BOOT_FILE}" \ - -s rabbit_plugins_main \ - -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \ - -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \ - -nodename $RABBITMQ_NODENAME \ - -extra "$@" +`dirname $0`/run-escript `dirname $0`/escript/rabbitmq-plugins
\ No newline at end of file diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 2336c3d466..b3f9661e1e 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -1,41 +1,3 @@ -#!/bin/sh -e -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License -## at http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -## the License for the specific language governing rights and -## limitations under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. -## +#!/usr/bin/env bash -# Get default settings with user overrides for (RABBITMQ_)<var_name> -# Non-empty defaults should be set in rabbitmq-env -. `dirname $0`/rabbitmq-env - -# Disable erl_crash.dump by default for control scripts. -if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; then - export ERL_CRASH_DUMP_SECONDS=0 -fi - -# We specify Mnesia dir and sasl error logger since some actions -# (e.g. forget_cluster_node --offline) require us to impersonate the -# real node. -RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \ -exec ${ERL_DIR}erl \ - -pa "${RABBITMQ_HOME}/ebin" \ - -noinput +B \ - -hidden \ - ${RABBITMQ_CTL_ERL_ARGS} \ - -boot "${CLEAN_BOOT_FILE}" \ - -sasl errlog_type error \ - -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - -s rabbit_control_main \ - -nodename $RABBITMQ_NODENAME \ - -extra "$@" +`dirname $0`/run-escript `dirname $0`/escript/rabbitmqctl $@
\ No newline at end of file diff --git a/scripts/run-escript b/scripts/run-escript new file mode 100755 index 0000000000..e481afc7f6 --- /dev/null +++ b/scripts/run-escript @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -a + +. `dirname $0`/rabbitmq-env + +escript $@ + + |