diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-12-11 18:01:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 18:01:40 +0100 |
| commit | 178757932e65704abd95a1bf64c460956a9391fa (patch) | |
| tree | 16732ab4722bc4a5e565c2158cc374477392d5de /Makefile | |
| parent | 5e6043ac59abbafd62bae2d3721a01ed232fc5f3 (diff) | |
| parent | 4ca6d804765dde93508d3f475117faeea7e7c3dc (diff) | |
| download | rabbitmq-server-git-178757932e65704abd95a1bf64c460956a9391fa.tar.gz | |
Merge pull request #2142 from rabbitmq/rabbitmq-server-script-replacement
Move rabbitmq-server(8) scripts to Erlang
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 31 |
1 files changed, 13 insertions, 18 deletions
@@ -133,11 +133,19 @@ define PROJECT_ENV ] endef -LOCAL_DEPS = sasl mnesia os_mon inets compiler public_key crypto ssl syntax_tools xmerl +# With Erlang.mk default behavior, the value of `$(APPS_DIR)` is always +# relative to the top-level executed Makefile. In our case, it could be +# a plugin for instance. However, the rabbitmq_prelaunch application is +# in this repository, not the plugin's. That's why we need to override +# this value here. +APPS_DIR := $(CURDIR)/apps + +LOCAL_DEPS = sasl rabbitmq_prelaunch os_mon inets compiler public_key crypto ssl syntax_tools xmerl BUILD_DEPS = rabbitmq_cli syslog -DEPS = ranch lager rabbit_common ra sysmon_handler stdout_formatter recon observer_cli +DEPS = cuttlefish ranch lager rabbit_common ra sysmon_handler stdout_formatter recon observer_cli TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck proper +dep_cuttlefish = hex 2.2.0 dep_syslog = git https://github.com/schlagert/syslog 3.4.5 define usage_xml_to_erl @@ -164,6 +172,9 @@ ERLANG_MK_COMMIT = rabbitmq-tmp include rabbitmq-components.mk include erlang.mk +# See above why we mess with `$(APPS_DIR)`. +unexport APPS_DIR + ifeq ($(strip $(BATS)),) BATS := $(ERLANG_MK_TMP)/bats/bin/bats endif @@ -240,20 +251,6 @@ 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 -.PHONY: copy-escripts clean-extra-sources clean-escripts - -CLI_ESCRIPTS_DIR = escript - -copy-escripts: - $(gen_verbose) $(MAKE) -C $(DEPS_DIR)/rabbitmq_cli install \ - PREFIX="$(abspath $(CLI_ESCRIPTS_DIR))" \ - DESTDIR= - -clean:: clean-escripts - -clean-escripts: - $(gen_verbose) rm -rf "$(CLI_ESCRIPTS_DIR)" - # -------------------------------------------------------------------- # Documentation. # -------------------------------------------------------------------- @@ -297,5 +294,3 @@ distclean:: distclean-manpages distclean-manpages:: $(gen_verbose) rm -f $(WEB_MANPAGES) - -app-build: copy-escripts |