summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-09-02 22:02:24 -0500
committerTristan Sloughter <t@crashfast.com>2014-09-02 22:02:24 -0500
commit4ed688f0ddf29747cebe9b59072c89fd5fa0c621 (patch)
treea991e89d760fedf6f131f03fef963ac32cf1f6ef
parent6c50d0a5669722e083d7999b6268f0e3858a3293 (diff)
fix bug compiling app with no .app.src
-rw-r--r--src/rebar_app_info.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index dc0d298..008bfd2 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -112,10 +112,10 @@ config(AppInfo=#app_info_t{}, Config) ->
-spec app_file_src(t()) -> file:name().
app_file_src(#app_info_t{app_file_src=undefined, dir=Dir, name=Name}) ->
- AppFileSrc = filename:join([Dir, "src", <<Name/binary, ".app.src">>]),
+ AppFileSrc = filename:join([ec_cnv:to_list(Dir), "src", ec_cnv:to_list(Name)++".app.src"]),
case filelib:is_file(AppFileSrc) of
true ->
- ec_cnv:to_list(AppFileSrc);
+ AppFileSrc;
false ->
undefined
end;
@@ -124,11 +124,11 @@ app_file_src(#app_info_t{app_file_src=AppFileSrc}) ->
-spec app_file_src(t(), file:name()) -> t().
app_file_src(AppInfo=#app_info_t{}, AppFileSrc) ->
- AppInfo#app_info_t{app_file_src=AppFileSrc}.
+ AppInfo#app_info_t{app_file_src=ec_cnv:to_list(AppFileSrc)}.
-spec app_file(t()) -> file:name().
app_file(#app_info_t{app_file=undefined, dir=Dir, name=Name}) ->
- AppFile = filename:join([Dir, "ebin", <<Name/binary, ".app">>]),
+ AppFile = filename:join([ec_cnv:to_list(Dir), "ebin", ec_cnv:to_list(Name)++".app"]),
case filelib:is_file(AppFile) of
true ->
AppFile;
@@ -140,7 +140,7 @@ app_file(#app_info_t{app_file=AppFile}) ->
-spec app_file(t(), file:name()) -> t().
app_file(AppInfo=#app_info_t{}, AppFile) ->
- AppInfo#app_info_t{app_file=AppFile}.
+ AppInfo#app_info_t{app_file=ec_cnv:to_list(AppFile)}.
-spec app_details(t()) -> list().
app_details(#app_info_t{app_details=AppDetails}) ->