25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00

Make sure that lager is first on our deps list

This commit is contained in:
Paweł Chmielowski 2015-08-14 12:12:55 +02:00 committed by Christophe Romain
parent 5d11a19087
commit a1a7beb24d

View File

@ -167,6 +167,12 @@ TestConfig = case file:read_file_info(TestConfigFile) of
"" ""
end, end,
AllDeps0 = Deps ++ CfgDeps,
AllDeps = case lists:keytake(lager, 1, AllDeps0) of
{value, Tuple, Rest} -> [Tuple|Rest];
false -> AllDeps0
end,
Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
[{src_dirs, [asn1, src | SrcDirs]}]}, [{src_dirs, [asn1, src | SrcDirs]}]},
{sub_dirs, ["rel"]}, {sub_dirs, ["rel"]},
@ -180,7 +186,7 @@ Config = [{erl_opts, Macros ++ HiPE ++ DebugInfo ++
[{"(XC - UC) || (XU - X - B - " [{"(XC - UC) || (XU - X - B - "
++ string:join(CfgXrefs, " - ") ++ ")", []}]}, ++ string:join(CfgXrefs, " - ") ++ ")", []}]},
{post_hooks, PostHooks ++ CfgPostHooks}, {post_hooks, PostHooks ++ CfgPostHooks},
{deps, Deps ++ CfgDeps}] ++ ElixirConfig, {deps, AllDeps}] ++ ElixirConfig,
%%io:format("ejabberd configuration:~n ~p~n", [Config]), %%io:format("ejabberd configuration:~n ~p~n", [Config]),
Config. Config.