github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-12-18 03:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation of *_first_files

Browse source 
- Check the existence of first_files and fail if they are not present
 - Get first_files lists from local instead of inherited config
   definitions, since they only make sense in the local context
This commit is contained in:
Mihai Balea 2010-12-01 15:44:37 +01:00 committed by Tuncer Ayaz
parent b4b97c3660
commit 837192e34e
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/rebar_erlc_compiler.erl
View file

@ -57,15 +57,19 @@
-spec compile(Config::#config{}, AppFile::string()) -> 'ok'. -spec compile(Config::#config{}, AppFile::string()) -> 'ok'.
compile(Config, _AppFile) -> compile(Config, _AppFile) ->
rebar_base_compiler:run(Config, rebar_base_compiler:run(Config,
rebar_config:get_list(Config, xrl_first_files, []), check_files(rebar_config:get_local(Config,
xrl_first_files, [])),
"src", ".xrl", "src", ".erl", "src", ".xrl", "src", ".erl",
fun compile_xrl/3), fun compile_xrl/3),
rebar_base_compiler:run(Config, rebar_base_compiler:run(Config,
rebar_config:get_list(Config, yrl_first_files, []), check_files(rebar_config:get_local(Config,
yrl_first_files, [])),
"src", ".yrl", "src", ".erl", "src", ".yrl", "src", ".erl",
fun compile_yrl/3), fun compile_yrl/3),
doterl_compile(Config, "ebin"), doterl_compile(Config, "ebin"),
rebar_base_compiler:run(Config, rebar_config:get_list(Config, mib_first_files, []), rebar_base_compiler:run(Config,
check_files(rebar_config:get_local(Config,
mib_first_files, [])),
"mibs", ".mib", "priv/mibs", ".bin", "mibs", ".mib", "priv/mibs", ".bin",
fun compile_mib/3). fun compile_mib/3).
@ -355,3 +359,16 @@ filter_defines([{platform_define, ArchRegex, Key, Value} | Rest], Acc) ->
end; end;
filter_defines([Opt | Rest], Acc) -> filter_defines([Opt | Rest], Acc) ->
filter_defines(Rest, [Opt | Acc]). filter_defines(Rest, [Opt | Acc]).
%%
%% Ensure all files in a list are present and abort if one is missing
%%
-spec check_files(FileList::[string()]) -> [string()].
check_files(FileList) ->
[check_file(F) || F <- FileList].
check_file(File) ->
case filelib:is_regular(File) of
false -> ?ABORT("File ~p is missing, aborting\n", [File]);
true -> File
end.