Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Update spec from custom and allow modules dependencies (#1740)

Browse Source
This commit is contained in:
Christophe Romain 2017-08-01 13:33:14 +02:00
parent 67918b17d3
commit 7e6d1c24c2
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ext_mod.erl
View File

@ -146,16 +146,29 @@ get_commands_spec() ->
%% -- public modules functions %% -- public modules functions
update() -> update() ->
add_sources(?REPOS), Contrib = maps:put(?REPOS, [], maps:new()),
Jungles = lists:foldl(fun({Package, Spec}, Acc) ->
Repo = proplists:get_value(url, Spec, ""),
Mods = maps:get(Repo, Acc, []),
maps:put(Repo, [Package|Mods], Acc)
end, Contrib, modules_spec(sources_dir(), "*/*")),
Repos = maps:fold(fun(Repo, _Mods, Acc) ->
Update = add_sources(Repo),
?INFO_MSG("Update packages from repo ~s: ~p", [Repo, Update]),
case Update of
ok -> Acc;
Error -> [{repository, Repo, Error}|Acc]
end
end, [], Jungles),
Res = lists:foldl(fun({Package, Spec}, Acc) -> Res = lists:foldl(fun({Package, Spec}, Acc) ->
Path = proplists:get_value(url, Spec, ""), Repo = proplists:get_value(url, Spec, ""),
Update = add_sources(Package, Path), Update = add_sources(Package, Repo),
?INFO_MSG("Update package ~s: ~p", [Package, Update]), ?INFO_MSG("Update package ~s: ~p", [Package, Update]),
case Update of case Update of
ok -> Acc; ok -> Acc;
Error -> [Error|Acc] Error -> [{Package, Repo, Error}|Acc]
end end
end, [], modules_spec(sources_dir(), "*")), end, Repos, modules_spec(sources_dir(), "*")),
case Res of case Res of
[] -> ok; [] -> ok;
[Error|_] -> Error [Error|_] -> Error
@ -547,7 +560,9 @@ compile_result(Results) ->
compile_options() -> compile_options() ->
[verbose, report_errors, report_warnings] [verbose, report_errors, report_warnings]
++ [{i, filename:join(app_dir(App), "include")} ++ [{i, filename:join(app_dir(App), "include")}
|| App <- [fast_xml, xmpp, p1_utils, ejabberd]]. || App <- [fast_xml, xmpp, p1_utils, ejabberd]]
++ [{i, filename:join(mod_dir(Mod), "include")}
|| Mod <- installed()].
app_dir(App) -> app_dir(App) ->
case code:lib_dir(App) of case code:lib_dir(App) of
@ -562,6 +577,10 @@ app_dir(App) ->
Dir Dir
end. end.
mod_dir({Package, Spec}) ->
Default = filename:join(modules_dir(), Package),
proplists:get_value(path, Spec, Default).
compile_erlang_file(Dest, File) -> compile_erlang_file(Dest, File) ->
compile_erlang_file(Dest, File, compile_options()). compile_erlang_file(Dest, File, compile_options()).