root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Update erlang.mk and disable `edoc` plugin

This commit is contained in:
Jean-Sébastien Pédron 2015-08-25 18:34:52 +02:00 committed by Jean-Sébastien Pédron
parent 38184c99dc
commit 0f44fd8c76
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,6 +19,8 @@ USAGES_ERL = $(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
EXTRA_SOURCES += $(USAGES_ERL) EXTRA_SOURCES += $(USAGES_ERL)
ERLANG_MK_DISABLE_PLUGINS = edoc
include erlang.mk include erlang.mk
COMPILE_FIRST = $(basename \ COMPILE_FIRST = $(basename \

70
erlang.mk vendored
View File

@ -16,7 +16,7 @@
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
ERLANG_MK_VERSION = 1.2.0-646-g8f925a4 ERLANG_MK_VERSION = 1.2.0-646-g8f925a4-dirty
# Core configuration. # Core configuration.
@ -4544,6 +4544,8 @@ distclean-deps:
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring protobuffs,$(ERLANG_MK_DISABLE_PLUGINS)),)
# Verbosity. # Verbosity.
proto_verbose_0 = @echo " PROTO " $(filter %.proto,$(?F)); proto_verbose_0 = @echo " PROTO " $(filter %.proto,$(?F));
@ -4573,6 +4575,8 @@ ebin/$(PROJECT).app:: $(sort $(call core_find,src/,*.proto))
$(if $(strip $?),$(call compile_proto,$?)) $(if $(strip $?),$(call compile_proto,$?))
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
@ -4794,6 +4798,8 @@ endif
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring asciidoc,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: asciidoc asciidoc-guide asciidoc-manual install-asciidoc distclean-asciidoc .PHONY: asciidoc asciidoc-guide asciidoc-manual install-asciidoc distclean-asciidoc
MAN_INSTALL_PATH ?= /usr/local/share/man MAN_INSTALL_PATH ?= /usr/local/share/man
@ -4838,9 +4844,13 @@ distclean:: distclean-asciidoc
distclean-asciidoc: distclean-asciidoc:
$(gen_verbose) rm -rf doc/html/ doc/guide.pdf doc/man3/ doc/man7/ $(gen_verbose) rm -rf doc/html/ doc/guide.pdf doc/man3/ doc/man7/
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring bootstrap,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: bootstrap bootstrap-lib bootstrap-rel new list-templates .PHONY: bootstrap bootstrap-lib bootstrap-rel new list-templates
# Core targets. # Core targets.
@ -5238,9 +5248,13 @@ endif
list-templates: list-templates:
$(verbose) echo Available templates: $(sort $(patsubst tpl_%,%,$(filter tpl_%,$(.VARIABLES)))) $(verbose) echo Available templates: $(sort $(patsubst tpl_%,%,$(filter tpl_%,$(.VARIABLES))))
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2014-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring c_src,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: clean-c_src distclean-c_src-env .PHONY: clean-c_src distclean-c_src-env
# Configuration. # Configuration.
@ -5358,9 +5372,13 @@ distclean-c_src-env:
-include $(C_SRC_ENV) -include $(C_SRC_ENV)
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring ci,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: ci ci-setup distclean-kerl .PHONY: ci ci-setup distclean-kerl
KERL ?= $(CURDIR)/kerl KERL ?= $(CURDIR)/kerl
@ -5424,9 +5442,13 @@ distclean-kerl:
$(gen_verbose) rm -rf $(KERL) $(gen_verbose) rm -rf $(KERL)
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring ct,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: ct distclean-ct .PHONY: ct distclean-ct
# Configuration. # Configuration.
@ -5480,9 +5502,13 @@ $(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
distclean-ct: distclean-ct:
$(gen_verbose) rm -rf $(CURDIR)/logs/ $(gen_verbose) rm -rf $(CURDIR)/logs/
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring dialyzer,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: plt distclean-plt dialyze .PHONY: plt distclean-plt dialyze
# Configuration. # Configuration.
@ -5524,9 +5550,13 @@ dialyze: $(DIALYZER_PLT)
endif endif
$(verbose) dialyzer --no_native $(DIALYZER_DIRS) $(DIALYZER_OPTS) $(verbose) dialyzer --no_native $(DIALYZER_DIRS) $(DIALYZER_OPTS)
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring edoc,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: distclean-edoc edoc .PHONY: distclean-edoc edoc
# Configuration. # Configuration.
@ -5547,9 +5577,13 @@ edoc: doc-deps
distclean-edoc: distclean-edoc:
$(gen_verbose) rm -f doc/*.css doc/*.html doc/*.png doc/edoc-info $(gen_verbose) rm -f doc/*.css doc/*.html doc/*.png doc/edoc-info
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2015, Erlang Solutions Ltd. # Copyright (c) 2015, Erlang Solutions Ltd.
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring elvis,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: elvis distclean-elvis .PHONY: elvis distclean-elvis
# Configuration. # Configuration.
@ -5587,9 +5621,13 @@ elvis: $(ELVIS) $(ELVIS_CONFIG)
distclean-elvis: distclean-elvis:
$(gen_verbose) rm -rf $(ELVIS) $(gen_verbose) rm -rf $(ELVIS)
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring erlydtl,$(ERLANG_MK_DISABLE_PLUGINS)),)
# Configuration. # Configuration.
DTL_FULL_PATH ?= 0 DTL_FULL_PATH ?= 0
@ -5619,9 +5657,13 @@ ebin/$(PROJECT).app:: $(sort $(call core_find,templates/,*.dtl))
$(if $(strip $?),$(call compile_erlydtl,$?)) $(if $(strip $?),$(call compile_erlydtl,$?))
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2014 Dave Cottlehuber <dch@skunkwerks.at> # Copyright (c) 2014 Dave Cottlehuber <dch@skunkwerks.at>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring escript,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: distclean-escript escript .PHONY: distclean-escript escript
# Configuration. # Configuration.
@ -5684,10 +5726,14 @@ escript:: distclean-escript deps app
distclean-escript: distclean-escript:
$(gen_verbose) rm -f $(ESCRIPT_NAME) $(gen_verbose) rm -f $(ESCRIPT_NAME)
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2014, Enrique Fernandez <enrique.fernandez@erlang-solutions.com> # Copyright (c) 2014, Enrique Fernandez <enrique.fernandez@erlang-solutions.com>
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is contributed to erlang.mk and subject to the terms of the ISC License. # This file is contributed to erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring eunit,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: eunit .PHONY: eunit
# Configuration # Configuration
@ -5735,9 +5781,13 @@ eunit: test-build
$(gen_verbose) $(ERL) -pa $(TEST_DIR) $(DEPS_DIR)/*/ebin ebin \ $(gen_verbose) $(ERL) -pa $(TEST_DIR) $(DEPS_DIR)/*/ebin ebin \
-eval "$(subst $(newline),,$(subst ",\",$(call eunit.erl,$(EUNIT_MODS))))" -eval "$(subst $(newline),,$(subst ",\",$(call eunit.erl,$(EUNIT_MODS))))"
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2013-2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring relx,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: relx-rel distclean-relx-rel distclean-relx run .PHONY: relx-rel distclean-relx-rel distclean-relx run
# Configuration. # Configuration.
@ -5807,9 +5857,13 @@ help::
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2014, M Robert Martin <rob@version2beta.com> # Copyright (c) 2014, M Robert Martin <rob@version2beta.com>
# This file is contributed to erlang.mk and subject to the terms of the ISC License. # This file is contributed to erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring shell,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: shell .PHONY: shell
# Configuration. # Configuration.
@ -5836,9 +5890,13 @@ build-shell-deps: $(ALL_SHELL_DEPS_DIRS)
shell: build-shell-deps shell: build-shell-deps
$(gen_verbose) erl $(SHELL_PATH) $(SHELL_OPTS) $(gen_verbose) erl $(SHELL_PATH) $(SHELL_OPTS)
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu> # Copyright (c) 2015, Loïc Hoguin <essen@ninenines.eu>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring triq,$(ERLANG_MK_DISABLE_PLUGINS)),)
ifneq ($(wildcard $(DEPS_DIR)/triq),) ifneq ($(wildcard $(DEPS_DIR)/triq),)
.PHONY: triq .PHONY: triq
@ -5879,9 +5937,13 @@ triq: test-build
endif endif
endif endif
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright (c) 2015, Erlang Solutions Ltd. # Copyright (c) 2015, Erlang Solutions Ltd.
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring xref,$(ERLANG_MK_DISABLE_PLUGINS)),)
.PHONY: xref distclean-xref .PHONY: xref distclean-xref
# Configuration. # Configuration.
@ -5918,9 +5980,13 @@ xref: deps app $(XREFR)
distclean-xref: distclean-xref:
$(gen_verbose) rm -rf $(XREFR) $(gen_verbose) rm -rf $(XREFR)
endif # ERLANG_MK_DISABLE_PLUGINS
# Copyright 2015, Viktor Söderqvist <viktor@zuiderkwast.se> # Copyright 2015, Viktor Söderqvist <viktor@zuiderkwast.se>
# This file is part of erlang.mk and subject to the terms of the ISC License. # This file is part of erlang.mk and subject to the terms of the ISC License.
ifeq ($(findstring cover,$(ERLANG_MK_DISABLE_PLUGINS)),)
COVER_REPORT_DIR = cover COVER_REPORT_DIR = cover
# Hook in coverage to ct # Hook in coverage to ct
@ -6038,3 +6104,5 @@ cover-report:
endif endif
endif # ifneq ($(COVER_REPORT_DIR),) endif # ifneq ($(COVER_REPORT_DIR),)
endif # ERLANG_MK_DISABLE_PLUGINS