From d590c18b5a2e6fbe5a2e5c7490438a2f1d348018 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Wed, 29 Sep 2010 21:28:20 +0200 Subject: Fix dialyzer warning for filename:join/2 calls --- src/rebar_deps.erl | 4 ++-- src/rebar_port_compiler.erl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl index 641f92c..9f7ea06 100644 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@ -148,7 +148,7 @@ update_deps_code_path([]) -> update_deps_code_path([Dep | Rest]) -> case is_app_available(Dep#dep.app, Dep#dep.vsn_regex, Dep#dep.dir) of {true, _} -> - code:add_patha(filename:join(Dep#dep.dir, ebin)); + code:add_patha(filename:join(Dep#dep.dir, "ebin")); false -> ok end, @@ -249,7 +249,7 @@ use_source(Dep, Count) -> {true, _} -> %% Available version matches up -- we're good to go; add the %% app dir to our code path - code:add_patha(filename:join(Dep#dep.dir, ebin)), + code:add_patha(filename:join(Dep#dep.dir, "ebin")), Dep; false -> %% The app that was downloaded doesn't match up (or had diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl index d07b369..d962b28 100644 --- a/src/rebar_port_compiler.erl +++ b/src/rebar_port_compiler.erl @@ -315,7 +315,7 @@ default_env() -> {"CC", "cc"}, {"CXX", "c++"}, {"ERL_CFLAGS", lists:concat([" -I", code:lib_dir(erl_interface, include), - " -I", filename:join(erts_dir(), include), + " -I", filename:join(erts_dir(), "include"), " "])}, {"ERL_LDFLAGS", lists:concat([" -L", code:lib_dir(erl_interface, lib), " -lerl_interface -lei"])}, -- cgit v1.1