github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 11:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix detection and processing of .app.src.script

Browse source 
Loading .app, .app.src or .app.src.script returns now the value as per
the documentation (was wrapped in a list in some cases).

More places in the code detect .app.src.script and handle it.
This commit is contained in:
Vlad Dumitrescu 2014-12-03 18:39:17 +01:00
parent b44b4f4199
commit 7d55c9986f
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -129,3 +129,4 @@ Andras Horvath
Drew Varner
Roberto Aloi
Luis Rascao
Vlad Dumitrescu

31
src/rebar_app_utils.erl
View file

@ -73,10 +73,17 @@ is_app_dir(Dir) ->
is_app_src(Filename) ->
%% If removing the extension .app.src yields a shorter name,
%% this is an .app.src file.
Filename =/= filename:rootname(Filename, ".app.src").
Filename =/= filename:rootname(Filename, ".app.src") orelse
Filename =/= filename:rootname(Filename, ".app.src.script").
app_src_to_app(Filename) ->
filename:join("ebin", filename:basename(Filename, ".app.src") ++ ".app").
Filebase = case filename:rootname(Filename, ".app.src") of
Filename ->
filename:basename(Filename, ".app.src.script");
_ ->
filename:basename(Filename, ".app.src")
end,
filename:join("ebin", Filebase ++ ".app").
app_name(Config, AppFile) ->
case load_app_file(Config, AppFile) of
@ -140,13 +147,13 @@ load_app_file(Config, Filename) ->
case rebar_config:get_xconf(Config, {appfile, AppFile}, undefined) of
undefined ->
case consult_app_file(Filename) of
{ok, [{application, AppName, AppData}]} ->
{ok, {application, AppName, AppData}} ->
Config1 = rebar_config:set_xconf(Config,
{appfile, AppFile},
{AppName, AppData}),
{ok, Config1, AppName, AppData};
{error, _} = Error ->
Error;
{error, {error, Error}};
Other ->
{error, {unexpected_terms, Other}}
end;
@ -160,11 +167,17 @@ load_app_file(Config, Filename) ->
%% config. However, in the case of *.app, rebar should not manipulate
%% that file. This enforces that dichotomy between app and app.src.
consult_app_file(Filename) ->
case lists:suffix(".app.src", Filename) of
false ->
file:consult(Filename);
true ->
rebar_config:consult_file(Filename)
Result = case lists:suffix(".app", Filename) of
true ->
file:consult(Filename);
false ->
rebar_config:consult_file(Filename)
end,
case Result of
{ok, [Term]} ->
{ok, Term};
_ ->
Result
end.
get_value(Key, AppInfo, AppFile) ->