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

Fix leftover whitespace errors

Browse source
This commit is contained in:
Tuncer Ayaz 2011-05-23 16:26:24 +02:00
parent 892dc48a86
commit 1628879b21
1 changed files with 9 additions and 9 deletions

18
src/rebar_port_compiler.erl
View file

@ -116,7 +116,8 @@ compile(Config, AppFile) ->
%% and list of new binaries %% and list of new binaries
lists:foreach( lists:foreach(
fun({SoName,Bins}) -> fun({SoName,Bins}) ->
AllBins = [sets:from_list(Bins), sets:from_list(NewBins)], AllBins = [sets:from_list(Bins),
sets:from_list(NewBins)],
Intersection = sets:intersection(AllBins), Intersection = sets:intersection(AllBins),
case needs_link(SoName, sets:to_list(Intersection)) of case needs_link(SoName, sets:to_list(Intersection)) of
true -> true ->
@ -274,16 +275,17 @@ compiler(_) -> "$CC".
%% %%
apply_defaults(Vars, Defaults) -> apply_defaults(Vars, Defaults) ->
dict:to_list( dict:to_list(
dict:merge(fun(Key, VarValue, DefaultValue) -> dict:merge(fun(Key, VarValue, DefaultValue) ->
case is_expandable(DefaultValue) of case is_expandable(DefaultValue) of
true -> true ->
expand_env_variable(DefaultValue, expand_env_variable(DefaultValue,
Key, VarValue); Key, VarValue);
false -> VarValue false -> VarValue
end end
end, end,
dict:from_list(Vars), dict:from_list(Vars),
dict:from_list(Defaults))). dict:from_list(Defaults))).
%% %%
%% Given a list of {Key, Value} environment variables, where Key may be defined %% Given a list of {Key, Value} environment variables, where Key may be defined
%% multiple times, walk the list and expand each self-reference so that we %% multiple times, walk the list and expand each self-reference so that we
@ -340,7 +342,6 @@ expand_vars(Key, Value, Vars) ->
end, end,
[], Vars). [], Vars).
%% %%
%% Given a string, determine if it is expandable %% Given a string, determine if it is expandable
%% %%
@ -350,7 +351,6 @@ is_expandable(InStr) ->
nomatch -> false nomatch -> false
end. end.
%% %%
%% Given env. variable FOO we want to expand all references to %% Given env. variable FOO we want to expand all references to
%% it in InStr. References can have two forms: $FOO and ${FOO} %% it in InStr. References can have two forms: $FOO and ${FOO}