mirror of
https://github.com/correl/rebar.git
synced 2024-11-27 11:09:55 +00:00
Add forward-compatible escript_foldl function
escript:foldl/3 was undocumented and has been replaced with better APIs post-R13B04. The new exported funs are officially documented.
This commit is contained in:
parent
a49d257412
commit
dfb5af4049
2 changed files with 33 additions and 3 deletions
|
@ -110,7 +110,10 @@ create(_Config, _) ->
|
||||||
%% Scan the current escript for available files and cache in pdict.
|
%% Scan the current escript for available files and cache in pdict.
|
||||||
%%
|
%%
|
||||||
cache_escript_files() ->
|
cache_escript_files() ->
|
||||||
{ok, Files} = escript:foldl(fun(Name, _, GetBin, Acc) -> [{Name, GetBin()} | Acc] end,
|
{ok, Files} = rebar_utils:escript_foldl(
|
||||||
|
fun(Name, _, GetBin, Acc) ->
|
||||||
|
[{Name, GetBin()} | Acc]
|
||||||
|
end,
|
||||||
[], rebar_config:get_global(escript, undefined)),
|
[], rebar_config:get_global(escript, undefined)),
|
||||||
erlang:put(escript_files, Files).
|
erlang:put(escript_files, Files).
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,8 @@
|
||||||
now_str/0,
|
now_str/0,
|
||||||
ensure_dir/1,
|
ensure_dir/1,
|
||||||
beam_to_mod/2, beams/1,
|
beam_to_mod/2, beams/1,
|
||||||
abort/2]).
|
abort/2,
|
||||||
|
escript_foldl/3]).
|
||||||
|
|
||||||
-include("rebar.hrl").
|
-include("rebar.hrl").
|
||||||
|
|
||||||
|
@ -111,6 +112,14 @@ abort(String, Args) ->
|
||||||
?ERROR(String, Args),
|
?ERROR(String, Args),
|
||||||
halt(1).
|
halt(1).
|
||||||
|
|
||||||
|
escript_foldl(Fun, Acc, File) ->
|
||||||
|
case erlang:function_exported(zip, foldl, 3) of
|
||||||
|
true ->
|
||||||
|
emulate_escript_foldl(Fun, Acc, File);
|
||||||
|
false ->
|
||||||
|
escript:foldl(Fun, Acc, File)
|
||||||
|
end.
|
||||||
|
|
||||||
%% ====================================================================
|
%% ====================================================================
|
||||||
%% Internal functions
|
%% Internal functions
|
||||||
%% ====================================================================
|
%% ====================================================================
|
||||||
|
@ -144,3 +153,21 @@ beams(Dir) ->
|
||||||
filelib:fold_files(Dir, ".*\.beam\$", true,
|
filelib:fold_files(Dir, ".*\.beam\$", true,
|
||||||
fun(F, Acc) -> [F | Acc] end, []).
|
fun(F, Acc) -> [F | Acc] end, []).
|
||||||
|
|
||||||
|
emulate_escript_foldl(Fun, Acc, File) ->
|
||||||
|
case escript:extract(File, [compile_source]) of
|
||||||
|
{ok, [_Shebang, _Comment, _EmuArgs, Body]} ->
|
||||||
|
case Body of
|
||||||
|
{source, BeamCode} ->
|
||||||
|
GetInfo = fun() -> file:read_file_info(File) end,
|
||||||
|
GetBin = fun() -> BeamCode end,
|
||||||
|
{ok, Fun(".", GetInfo, GetBin, Acc)};
|
||||||
|
{beam, BeamCode} ->
|
||||||
|
GetInfo = fun() -> file:read_file_info(File) end,
|
||||||
|
GetBin = fun() -> BeamCode end,
|
||||||
|
{ok, Fun(".", GetInfo, GetBin, Acc)};
|
||||||
|
{archive, ArchiveBin} ->
|
||||||
|
zip:foldl(Fun, Acc, {File, ArchiveBin})
|
||||||
|
end;
|
||||||
|
{error, Reason} ->
|
||||||
|
{error, Reason}
|
||||||
|
end.
|
||||||
|
|
Loading…
Reference in a new issue