Commit 9c2392f6 authored by Evgeny Khramtsov's avatar Evgeny Khramtsov

Merge branch 'master' of github.com:processone/ejabberd

parents 6013b4a3 f0bbc05b
...@@ -9,6 +9,11 @@ override_opts(add, Config, Opts) -> ...@@ -9,6 +9,11 @@ override_opts(add, Config, Opts) ->
lists:foldl(fun({Opt, Value}, Conf) -> lists:foldl(fun({Opt, Value}, Conf) ->
V = rebar_config:get_local(Conf, Opt, []), V = rebar_config:get_local(Conf, Opt, []),
rebar_config:set(Conf, Opt, V ++ Value) rebar_config:set(Conf, Opt, V ++ Value)
end, Config, Opts);
override_opts(del, Config, Opts) ->
lists:foldl(fun({Opt, Value}, Conf) ->
V = rebar_config:get_local(Conf, Opt, []),
rebar_config:set(Conf, Opt, V -- Value)
end, Config, Opts). end, Config, Opts).
preprocess(Config, _Dirs) -> preprocess(Config, _Dirs) ->
...@@ -24,6 +29,8 @@ preprocess(Config, _Dirs) -> ...@@ -24,6 +29,8 @@ preprocess(Config, _Dirs) ->
lists:foldl(fun({Type, AppName2, Opts}, Conf1) when lists:foldl(fun({Type, AppName2, Opts}, Conf1) when
AppName2 == AppName -> AppName2 == AppName ->
override_opts(Type, Conf1, Opts); override_opts(Type, Conf1, Opts);
({Type, Opts}, Conf1a) ->
override_opts(Type, Conf1a, Opts);
(_, Conf2) -> (_, Conf2) ->
Conf2 Conf2
end, C, TopOverrides); end, C, TopOverrides);
......
...@@ -148,6 +148,9 @@ ...@@ -148,6 +148,9 @@
{cover_export_enabled, true}. {cover_export_enabled, true}.
{recursive_cmds, ['configure-deps']}. {recursive_cmds, ['configure-deps']}.
{overrides, [
{del, [{erl_opts, [warnings_as_errors]}]}]}.
{post_hook_configure, [{"fast_tls", []}, {post_hook_configure, [{"fast_tls", []},
{"stringprep", []}, {"stringprep", []},
{"fast_yaml", []}, {"fast_yaml", []},
......
...@@ -299,7 +299,7 @@ fun(Hooks) -> ...@@ -299,7 +299,7 @@ fun(Hooks) ->
lists:map(fun({Pkg, Flags}) -> lists:map(fun({Pkg, Flags}) ->
DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"), DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
Line = lists:flatten(GenDepConfigureLine(DepPath, Flags)), Line = lists:flatten(GenDepConfigureLine(DepPath, Flags)),
{add, list_to_atom(Pkg), [{pre_hooks, [{'compile', Line}, {'configure-deps', Line}]}]} {add, list_to_atom(Pkg), [{pre_hooks, [{{pc, compile}, Line}, {'compile', Line}, {'configure-deps', Line}]}]}
end, Hooks) end, Hooks)
end, end,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment