diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-23 19:33:09 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-10-23 19:33:09 +0200 |
| commit | 4a70392a104a6eb863432b3e2fdb3b4b0948f46e (patch) | |
| tree | ebd1273c046f35904f601258332293e9b1e23d0c | |
| parent | 5b654bad0f07cbe19c72bfaba00d4dcb27792465 (diff) | |
| download | rabbitmq-server-git-4a70392a104a6eb863432b3e2fdb3b4b0948f46e.tar.gz | |
Update erlang.mk's build.config
| -rw-r--r-- | build.config | 2 | ||||
| -rw-r--r-- | erlang.mk | 49 |
2 files changed, 51 insertions, 0 deletions
diff --git a/build.config b/build.config index 776e0bb726..138af905ca 100644 --- a/build.config +++ b/build.config @@ -15,7 +15,9 @@ plugins/protobuffs # Core modules, continued. core/erlc core/docs +core/rel core/test +core/compat # Plugins. plugins/asciidoc @@ -4992,6 +4992,26 @@ endif # 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. +.PHONY: rel-deps + +# Configuration. + +ALL_REL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(REL_DEPS)) + +# Targets. + +$(foreach dep,$(REL_DEPS),$(eval $(call dep_target,$(dep)))) + +ifneq ($(SKIP_DEPS),) +rel-deps: +else +rel-deps: $(ALL_REL_DEPS_DIRS) + $(verbose) for dep in $(ALL_REL_DEPS_DIRS) ; do $(MAKE) -C $$dep; done +endif + +# 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. + .PHONY: test-deps test-dir test-build clean-test-dir # Configuration. @@ -5041,6 +5061,35 @@ endif # 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. +.PHONY: rebar.config + +# We strip out -Werror because we don't want to fail due to +# warnings when used as a dependency. + +compat_prepare_erlc_opts = $(shell echo "$1" | sed 's/, */,/') + +define compat_convert_erlc_opts +$(if $(filter-out -Werror,$1),\ + $(if $(findstring +,$1),\ + $(shell echo $1 | cut -b 2-))) +endef + +define compat_rebar_config +{deps, [$(call comma_list,$(foreach d,$(DEPS),\ + {$(call dep_name,$d),".*",{git,"$(call dep_repo,$d)","$(call dep_commit,$d)"}}))]}. +{erl_opts, [$(call comma_list,$(foreach o,$(call compat_prepare_erlc_opts,$(ERLC_OPTS)),\ + $(call compat_convert_erlc_opts,$o)))]}. +endef + +$(eval _compat_rebar_config = $$(compat_rebar_config)) +$(eval export _compat_rebar_config) + +rebar.config: + $(gen_verbose) echo "$${_compat_rebar_config}" > rebar.config + +# 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. + .PHONY: asciidoc asciidoc-guide asciidoc-manual install-asciidoc distclean-asciidoc MAN_INSTALL_PATH ?= /usr/local/share/man |