Update erlang.mk's build.config
This commit is contained in:
parent
9be322dbb9
commit
867cf67468
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue