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

Cleanup rebar_core and rebar_erlc_compiler

Browse source 
Rename rebar_core functions for improved readability.
Remove redundant comments and blank lines.
This commit is contained in:
Tuncer Ayaz 2012-11-10 21:07:55 +01:00
parent 92fb083011
commit a015892e21
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/rebar_core.erl
View file

@ -53,9 +53,10 @@ process_commands([Command | Rest], ParentConfig) ->
ParentConfig4 = ParentConfig4 =
try try
%% Convert the code path so that all the entries are absolute paths. %% Convert the code path so that all the entries are
%% If not, code:set_path() may choke on invalid relative paths when trying %% absolute paths. If not, code:set_path() may choke on
%% to restore the code path from inside a subdirectory. %% invalid relative paths when trying to restore the code
%% path from inside a subdirectory.
true = rebar_utils:expand_code_path(), true = rebar_utils:expand_code_path(),
{ParentConfig2, _DirSet} = process_dir(rebar_utils:get_cwd(), {ParentConfig2, _DirSet} = process_dir(rebar_utils:get_cwd(),
ParentConfig1, Command, ParentConfig1, Command,
@ -68,8 +69,9 @@ process_commands([Command | Rest], ParentConfig) ->
_ -> _ ->
ok ok
end, end,
%% TODO: reconsider after config inheritance removal/redesign %% TODO: reconsider after config inheritance removal/re-design
ParentConfig3 = rebar_config:clean_config(ParentConfig1, ParentConfig2), ParentConfig3 = rebar_config:clean_config(ParentConfig1,
ParentConfig2),
%% Wipe out vsn cache to avoid invalid hits when %% Wipe out vsn cache to avoid invalid hits when
%% dependencies are updated %% dependencies are updated
rebar_config:set_xconf(ParentConfig3, vsn_cache, dict:new()) rebar_config:set_xconf(ParentConfig3, vsn_cache, dict:new())
@ -107,29 +109,29 @@ process_dir(Dir, ParentConfig, Command, DirSet) ->
%% to process this dir. %% to process this dir.
{ok, AvailModuleSets} = application:get_env(rebar, modules), {ok, AvailModuleSets} = application:get_env(rebar, modules),
ModuleSet = choose_module_set(AvailModuleSets, Dir), ModuleSet = choose_module_set(AvailModuleSets, Dir),
maybe_process_dir(ModuleSet, Config, CurrentCodePath, skip_or_process_dir(ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) Dir, Command, DirSet)
end. end.
maybe_process_dir({[], undefined}=ModuleSet, Config, CurrentCodePath, skip_or_process_dir({[], undefined}=ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) -> Dir, Command, DirSet) ->
process_dir0(Dir, Command, DirSet, Config, CurrentCodePath, ModuleSet); process_dir1(Dir, Command, DirSet, Config, CurrentCodePath, ModuleSet);
maybe_process_dir({_, ModuleSetFile}=ModuleSet, Config, CurrentCodePath, skip_or_process_dir({_, ModuleSetFile}=ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) -> Dir, Command, DirSet) ->
case lists:suffix(".app.src", ModuleSetFile) case lists:suffix(".app.src", ModuleSetFile)
orelse lists:suffix(".app", ModuleSetFile) of orelse lists:suffix(".app", ModuleSetFile) of
true -> true ->
%% .app or .app.src file, check if is_skipped_app %% .app or .app.src file, check if is_skipped_app
maybe_process_dir0(ModuleSetFile, ModuleSet, skip_or_process_dir1(ModuleSetFile, ModuleSet,
Config, CurrentCodePath, Dir, Config, CurrentCodePath, Dir,
Command, DirSet); Command, DirSet);
false -> false ->
%% not an app dir, no need to consider apps=/skip_apps= %% not an app dir, no need to consider apps=/skip_apps=
process_dir0(Dir, Command, DirSet, Config, process_dir1(Dir, Command, DirSet, Config,
CurrentCodePath, ModuleSet) CurrentCodePath, ModuleSet)
end. end.
maybe_process_dir0(AppFile, ModuleSet, Config, CurrentCodePath, skip_or_process_dir1(AppFile, ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) -> Dir, Command, DirSet) ->
case rebar_app_utils:is_skipped_app(Config, AppFile) of case rebar_app_utils:is_skipped_app(Config, AppFile) of
{Config1, {true, SkippedApp}} -> {Config1, {true, SkippedApp}} ->
@ -137,11 +139,11 @@ maybe_process_dir0(AppFile, ModuleSet, Config, CurrentCodePath,
Config2 = increment_operations(Config1), Config2 = increment_operations(Config1),
{Config2, DirSet}; {Config2, DirSet};
{Config1, false} -> {Config1, false} ->
process_dir0(Dir, Command, DirSet, Config1, process_dir1(Dir, Command, DirSet, Config1,
CurrentCodePath, ModuleSet) CurrentCodePath, ModuleSet)
end. end.
process_dir0(Dir, Command, DirSet, Config0, CurrentCodePath, process_dir1(Dir, Command, DirSet, Config0, CurrentCodePath,
{DirModules, ModuleSetFile}) -> {DirModules, ModuleSetFile}) ->
%% Get the list of modules for "any dir". This is a catch-all list %% Get the list of modules for "any dir". This is a catch-all list
%% of modules that are processed in addition to modules associated %% of modules that are processed in addition to modules associated
@ -270,7 +272,6 @@ process_each([Dir | Rest], Command, Config, ModuleSetFile, DirSet) ->
process_each(Rest, Command, Config3, ModuleSetFile, DirSet2) process_each(Rest, Command, Config3, ModuleSetFile, DirSet2)
end. end.
%% %%
%% Given a list of module sets from rebar.app and a directory, find %% Given a list of module sets from rebar.app and a directory, find
%% the appropriate subset of modules for this directory %% the appropriate subset of modules for this directory

6
src/rebar_erlc_compiler.erl
View file

@ -265,11 +265,6 @@ doterl_compile(Config, OutDir, MoreSources) ->
true = code:set_path(CurrPath), true = code:set_path(CurrPath),
ok. ok.
%% ===================================================================
%% Internal functions
%% ===================================================================
-spec include_path(file:filename(), -spec include_path(file:filename(),
rebar_config:config()) -> [file:filename(), ...]. rebar_config:config()) -> [file:filename(), ...].
include_path(Source, Config) -> include_path(Source, Config) ->
@ -414,7 +409,6 @@ gather_src([], Srcs) ->
gather_src([Dir|Rest], Srcs) -> gather_src([Dir|Rest], Srcs) ->
gather_src(Rest, Srcs ++ rebar_utils:find_files(Dir, ".*\\.erl\$")). gather_src(Rest, Srcs ++ rebar_utils:find_files(Dir, ".*\\.erl\$")).
-spec dirs(file:filename()) -> [file:filename()]. -spec dirs(file:filename()) -> [file:filename()].
dirs(Dir) -> dirs(Dir) ->
[F || F <- filelib:wildcard(filename:join([Dir, "*"])), filelib:is_dir(F)]. [F || F <- filelib:wildcard(filename:join([Dir, "*"])), filelib:is_dir(F)].