github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2025-04-10 09:11:06 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fix whitespace errors

Browse source
This commit is contained in:
Tuncer Ayaz 2012-06-08 21:56:18 +02:00
parent 25c4515383
commit 8a046d898a
3 changed files with 15 additions and 9 deletions

6
src/rebar.erl
View file

@ -163,7 +163,8 @@ parse_args(Args) ->
proplists:get_bool(profile, Options)), proplists:get_bool(profile, Options)),
%% Setup flag to keep running after a single command fails %% Setup flag to keep running after a single command fails
rebar_config:set_global(keep_going, proplists:get_bool(keep_going, Options)), rebar_config:set_global(keep_going,
proplists:get_bool(keep_going, Options)),
%% Set global variables based on getopt options %% Set global variables based on getopt options
set_log_level(Options), set_log_level(Options),
@ -308,7 +309,8 @@ option_spec_list() ->
{jobs, $j, "jobs", integer, JobsHelp}, {jobs, $j, "jobs", integer, JobsHelp},
{config, $C, "config", string, "Rebar config file to use"}, {config, $C, "config", string, "Rebar config file to use"},
{profile, $p, "profile", undefined, "Profile this run of rebar"}, {profile, $p, "profile", undefined, "Profile this run of rebar"},
{keep_going, $k, "keep-going", undefined, "Keep running after a command fails"} {keep_going, $k, "keep-going", undefined,
"Keep running after a command fails"}
]. ].
%% %%

16
src/rebar_core.erl
View file

@ -82,8 +82,8 @@ process_commands([Command | Rest], ParentConfig) ->
Operations = erlang:get(operations), Operations = erlang:get(operations),
%% Convert the code path so that all the entries are absolute paths. %% Convert the code path so that all the entries are absolute paths.
%% If not, code:set_path() may choke on invalid relative paths when trying %% If not, code:set_path() may choke on invalid relative paths when
%% to restore the code path from inside a subdirectory. %% trying to restore the code path from inside a subdirectory.
true = rebar_utils:expand_code_path(), true = rebar_utils:expand_code_path(),
_ = process_dir(rebar_utils:get_cwd(), ParentConfig, _ = process_dir(rebar_utils:get_cwd(), ParentConfig,
Command, sets:new()), Command, sets:new()),
@ -120,7 +120,8 @@ process_dir(Dir, ParentConfig, Command, DirSet) ->
true -> true ->
AbsDir = filename:absname(Dir), AbsDir = filename:absname(Dir),
ShouldPrintDir = not (is_skip_dir(Dir) orelse processing_base_dir(Dir)), ShouldPrintDir = not (is_skip_dir(Dir)
orelse processing_base_dir(Dir)),
case ShouldPrintDir of case ShouldPrintDir of
true -> true ->
@ -272,7 +273,8 @@ remember_cwd_subdir(Cwd, Subdirs) ->
Store = fun(Dir, Dict) -> Store = fun(Dir, Dict) ->
case dict:find(Dir, Dict) of case dict:find(Dir, Dict) of
error -> error ->
?DEBUG("Associate sub_dir ~s with ~s~n", [Dir, Cwd]), ?DEBUG("Associate sub_dir ~s with ~s~n",
[Dir, Cwd]),
dict:store(Dir, Cwd, Dict); dict:store(Dir, Cwd, Dict);
{ok, Existing} -> {ok, Existing} ->
?ABORT("Internal consistency assertion failed.~n" ?ABORT("Internal consistency assertion failed.~n"
@ -514,11 +516,13 @@ plugin_modules(Config, SubdirAssoc, Modules) ->
plugin_modules(_Config, _SubdirAssoc, FoundModules, []) -> plugin_modules(_Config, _SubdirAssoc, FoundModules, []) ->
{ok, FoundModules}; {ok, FoundModules};
plugin_modules(Config, SubdirAssoc, FoundModules, MissingModules) -> plugin_modules(Config, SubdirAssoc, FoundModules, MissingModules) ->
{Loaded, NotLoaded} = load_plugin_modules(Config, SubdirAssoc, MissingModules), {Loaded, NotLoaded} = load_plugin_modules(Config, SubdirAssoc,
MissingModules),
AllViablePlugins = FoundModules ++ Loaded, AllViablePlugins = FoundModules ++ Loaded,
case NotLoaded =/= [] of case NotLoaded =/= [] of
true -> true ->
%% NB: we continue to ignore this situation, as did the original code %% NB: we continue to ignore this situation, as did the
%% original code
?WARN("Missing plugins: ~p\n", [NotLoaded]); ?WARN("Missing plugins: ~p\n", [NotLoaded]);
false -> false ->
?DEBUG("Loaded plugins: ~p~n", [AllViablePlugins]), ?DEBUG("Loaded plugins: ~p~n", [AllViablePlugins]),

2
src/rebar_edoc.erl
View file

@ -57,7 +57,7 @@ doc(Config, File) ->
%% Determine the age of the summary file %% Determine the age of the summary file
EDocInfoName = filename:join(proplists:get_value(dir, EDocOpts, "doc"), EDocInfoName = filename:join(proplists:get_value(dir, EDocOpts, "doc"),
"edoc-info"), "edoc-info"),
EDocInfoLastMod = filelib:last_modified(EDocInfoName), EDocInfoLastMod = filelib:last_modified(EDocInfoName),
%% For each source directory, look for a more recent file than %% For each source directory, look for a more recent file than