summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rebar_app_discover.erl8
-rw-r--r--src/rebar_app_info.erl11
-rw-r--r--src/rebar_digraph.erl98
-rw-r--r--src/rebar_erlc_compiler.erl8
-rw-r--r--src/rebar_git_resource.erl41
-rw-r--r--src/rebar_hooks.erl5
-rw-r--r--src/rebar_packages.erl16
-rw-r--r--src/rebar_plugins.erl2
-rw-r--r--src/rebar_prv_compile.erl4
-rw-r--r--src/rebar_prv_dialyzer.erl381
-rw-r--r--src/rebar_prv_install_deps.erl20
-rw-r--r--src/rebar_prv_test_deps.erl2
-rw-r--r--src/rebar_prv_update.erl4
-rw-r--r--src/rebar_resource.erl10
-rw-r--r--src/rebar_state.erl4
-rw-r--r--src/rebar_topo.erl212
16 files changed, 502 insertions, 324 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 4005612..ea49075 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -119,7 +119,8 @@ create_app_info(AppDir, AppFile) ->
case file:consult(AppFile) of
{ok, [{application, AppName, AppDetails}]} ->
AppVsn = proplists:get_value(vsn, AppDetails),
- %AppDeps = proplists:get_value(applications, AppDetails, []),
+ Applications = proplists:get_value(applications, AppDetails, []),
+ IncludedApplications = proplists:get_value(included_applications, AppDetails, []),
C = rebar_config:consult(AppDir),
S = rebar_state:new(rebar_state:new(), C, AppDir),
AppDeps = rebar_state:deps_names(S),
@@ -134,8 +135,9 @@ create_app_info(AppDir, AppFile) ->
rebar_state:new()
end,
AppState1 = rebar_state:set(AppState, base_dir, AbsCwd),
- AppInfo1 = rebar_app_info:config(
- rebar_app_info:app_details(AppInfo, AppDetails), AppState1),
+ AppInfo1 = rebar_app_info:applications(rebar_app_info:config(
+ rebar_app_info:app_details(AppInfo, AppDetails)
+ ,AppState1), IncludedApplications++Applications),
rebar_app_info:dir(AppInfo1, AppDir);
_ ->
error
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 47dfcad..f790cd3 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -18,6 +18,8 @@
original_vsn/1,
original_vsn/2,
ebin_dir/1,
+ applications/1,
+ applications/2,
deps/1,
deps/2,
dep_level/1,
@@ -37,6 +39,7 @@
config :: rebar_state:t() | undefined,
original_vsn :: binary() | string() | undefined,
app_details=[] :: list(),
+ applications=[] :: list(),
deps=[] :: list(),
dep_level=0 :: integer(),
dir :: file:name(),
@@ -155,6 +158,14 @@ original_vsn(#app_info_t{original_vsn=Vsn}) ->
original_vsn(AppInfo=#app_info_t{}, Vsn) ->
AppInfo#app_info_t{original_vsn=Vsn}.
+-spec applications(t()) -> list().
+applications(#app_info_t{applications=Applications}) ->
+ Applications.
+
+-spec applications(t(), list()) -> t().
+applications(AppInfo=#app_info_t{}, Applications) ->
+ AppInfo#app_info_t{applications=Applications}.
+
-spec deps(t()) -> list().
deps(#app_info_t{deps=Deps}) ->
Deps.
diff --git a/src/rebar_digraph.erl b/src/rebar_digraph.erl
new file mode 100644
index 0000000..27bbdd2
--- /dev/null
+++ b/src/rebar_digraph.erl
@@ -0,0 +1,98 @@
+-module(rebar_digraph).
+
+-export([compile_order/1
+ ,restore_graph/1
+ ,cull_deps/2
+ ,subgraph/2
+ ,format_error/1]).
+
+-include("rebar.hrl").
+
+%% Sort apps with topological sort to get proper build order
+compile_order(Apps) ->
+ Graph = digraph:new(),
+ lists:foreach(fun(App) ->
+ Name = rebar_app_info:name(App),
+ Deps = rebar_app_info:deps(App),
+ add(Graph, {Name, Deps})
+ end, Apps),
+ case digraph_utils:topsort(Graph) of
+ false ->
+ {error, no_sort};
+ V ->
+ {ok, names_to_apps(lists:reverse(V), Apps)}
+ end.
+
+add(Graph, {PkgName, Deps}) ->
+ case digraph:vertex(Graph, PkgName) of
+ false ->
+ V = digraph:add_vertex(Graph, PkgName);
+ {V, []} ->
+ V
+ end,
+
+ lists:foreach(fun(DepName) ->
+ V3 = case digraph:vertex(Graph, DepName) of
+ false ->
+ digraph:add_vertex(Graph, DepName);
+ {V2, []} ->
+ V2
+ end,
+ digraph:add_edge(Graph, V, V3)
+ end, Deps).
+
+restore_graph({Vs, Es}) ->
+ Graph = digraph:new(),
+ lists:foreach(fun({V, LastUpdated}) ->
+ digraph:add_vertex(Graph, V, LastUpdated)
+ end, Vs),
+ lists:foreach(fun({V1, V2}) ->
+ digraph:add_edge(Graph, V1, V2)
+ end, Es),
+ Graph.
+
+%% Pick packages to fullfill dependencies
+%% The first dep while traversing the graph is chosen and any conflicting
+%% dep encountered later on is ignored.
+cull_deps(Graph, Vertices) ->
+ cull_deps(Graph, Vertices, lists:foldl(fun({Key, _}=N, Solution) ->
+ dict:store(Key, N, Solution)
+ end, dict:new(), Vertices)).
+
+cull_deps(_Graph, [], Solution) ->
+ {_, Vertices} = lists:unzip(dict:to_list(Solution)),
+ {ok, Vertices};
+cull_deps(Graph, Vertices, Solution) ->
+ {NV, NS} =
+ lists:foldl(fun(V, {NewVertices, SolutionAcc}) ->
+ OutNeighbors = digraph:out_neighbours(Graph, V),
+ lists:foldl(fun({Key, _}=N, {NewVertices1, SolutionAcc1}) ->
+ case dict:is_key(Key, SolutionAcc1) of
+ true ->
+ {NewVertices1, SolutionAcc1};
+ false ->
+ {[N | NewVertices1], dict:store(Key, N, SolutionAcc1)}
+ end
+ end, {NewVertices, SolutionAcc}, OutNeighbors)
+ end, {[], Solution}, Vertices),
+ cull_deps(Graph, NV, NS).
+
+subgraph(Graph, Vertices) ->
+ digraph_utils:subgraph(Graph, Vertices).
+
+format_error(no_solution) ->
+ io_lib:format("No solution for packages found.", []).
+
+%%====================================================================
+%% Internal Functions
+%%====================================================================
+
+-spec names_to_apps([atom()], [rebar_app_info:t()]) -> [rebar_app_info:t()].
+names_to_apps(Names, Apps) ->
+ [element(2, App) || App <- [find_app_by_name(Name, Apps) || Name <- Names], App =/= error].
+
+-spec find_app_by_name(atom(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
+find_app_by_name(Name, Apps) ->
+ ec_lists:find(fun(App) ->
+ ec_cnv:to_atom(rebar_app_info:name(App)) =:= ec_cnv:to_atom(Name)
+ end, Apps).
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 1277242..71ee780 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -49,14 +49,6 @@
-define(RE_PREFIX, "^[^._]").
--ifdef(namespaced_types).
-%% digraph:graph() exists starting from Erlang 17.
--type rebar_digraph() :: digraph:graph().
--else.
-%% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
--type rebar_digraph() :: digraph().
--endif.
-
%% ===================================================================
%% Public API
%% ===================================================================
diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl
index fee619a..bcd2374 100644
--- a/src/rebar_git_resource.erl
+++ b/src/rebar_git_resource.erl
@@ -22,23 +22,20 @@ lock(AppDir, {git, Url}) ->
%% Return true if either the git url or tag/branch/ref is not the same as the currently
%% checked out git repo for the dep
needs_update(Dir, {git, Url, {tag, Tag}}) ->
- {ok, CurrentUrl} = rebar_utils:sh(?FMT("git config --get remote.origin.url", []),
- [{cd, Dir}]),
{ok, Current} = rebar_utils:sh(?FMT("git describe --tags --exact-match", []),
[{cd, Dir}]),
Current1 = string:strip(string:strip(Current, both, $\n), both, $\r),
- CurrentUrl1 = string:strip(string:strip(CurrentUrl, both, $\n), both, $\r),
- ?DEBUG("Comparing git tag ~s with ~s and url ~s with ~s", [Tag, Current1, Url, CurrentUrl1]),
- not ((Current1 =:= Tag) andalso (CurrentUrl1 =:= Url));
+
+ ?DEBUG("Comparing git tag ~s with ~s", [Tag, Current1]),
+ not ((Current1 =:= Tag) andalso compare_url(Dir, Url));
needs_update(Dir, {git, Url, {branch, Branch}}) ->
- {ok, CurrentUrl} = rebar_utils:sh(?FMT("git config --get remote.origin.url", []),
- [{cd, Dir}]),
{ok, Current} = rebar_utils:sh(?FMT("git symbolic-ref -q --short HEAD", []),
[{cd, Dir}]),
Current1 = string:strip(string:strip(Current, both, $\n), both, $\r),
- CurrentUrl1 = string:strip(string:strip(CurrentUrl, both, $\n), both, $\r),
- ?DEBUG("Comparing git branch ~s with ~s and url ~s with ~s", [Branch, Current1, Url, CurrentUrl1]),
- not ((Current1 =:= Branch) andalso (CurrentUrl1 =:= Url));
+ ?DEBUG("Comparing git branch ~s with ~s", [Branch, Current1]),
+ not ((Current1 =:= Branch) andalso compare_url(Dir, Url));
+needs_update(Dir, {git, Url, "master"}) ->
+ needs_update(Dir, {git, Url, {branch, "master"}});
needs_update(Dir, {git, Url, Ref}) ->
case Ref of
{ref, Ref1} ->
@@ -46,14 +43,30 @@ needs_update(Dir, {git, Url, Ref}) ->
Ref1 ->
Ref1
end,
- {ok, CurrentUrl} = rebar_utils:sh(?FMT("git config --get remote.origin.url", []),
- [{cd, Dir}]),
+
{ok, Current} = rebar_utils:sh(?FMT("git rev-parse -q HEAD", []),
[{cd, Dir}]),
Current1 = string:strip(string:strip(Current, both, $\n), both, $\r),
+ ?DEBUG("Comparing git ref ~s with ~s", [Ref1, Current1]),
+ not ((Current1 =:= Ref1) andalso compare_url(Dir, Url)).
+
+compare_url(Dir, Url) ->
+ {ok, CurrentUrl} = rebar_utils:sh(?FMT("git config --get remote.origin.url", []),
+ [{cd, Dir}]),
CurrentUrl1 = string:strip(string:strip(CurrentUrl, both, $\n), both, $\r),
- ?DEBUG("Comparing git ref ~s with ~s and url ~s with ~s", [Ref1, Current1, Url, CurrentUrl1]),
- not ((Current1 =:= Ref1) andalso (CurrentUrl1 =:= Url)).
+ ParsedUrl = parse_git_url(Url),
+ ParsedCurrentUrl = parse_git_url(CurrentUrl1),
+ ParsedCurrentUrl =:= ParsedUrl.
+
+parse_git_url("git@" ++ HostPath) ->
+ [Host, Path] = string:tokens(HostPath, ":"),
+ {Host, filename:rootname(Path, ".git")};
+parse_git_url("git://" ++ HostPath) ->
+ [Host | Path] = string:tokens(HostPath, "/"),
+ {Host, filename:rootname(filename:join(Path), ".git")};
+parse_git_url("https://" ++ HostPath) ->
+ [Host | Path] = string:tokens(HostPath, "/"),
+ {Host, filename:rootname(filename:join(Path), ".git")}.
download(Dir, {git, Url}) ->
?WARN("WARNING: It is recommended to use {branch, Name}, {tag, Tag} or {ref, Ref}, otherwise updating the dep may not work as expected.", []),
diff --git a/src/rebar_hooks.erl b/src/rebar_hooks.erl
index 2599d8e..3e6d533 100644
--- a/src/rebar_hooks.erl
+++ b/src/rebar_hooks.erl
@@ -4,10 +4,11 @@
run_compile_hooks(Dir, Type, Command, State) ->
Hooks = rebar_state:get(State, Type, []),
+ Env = [{"REBAR_DEPS_DIR", rebar_prv_install_deps:get_deps_dir(State)}],
lists:foreach(fun({_, C, _}=Hook) when C =:= Command ->
- apply_hook(Dir, [], Hook);
+ apply_hook(Dir, Env, Hook);
({C, _}=Hook) when C =:= Command ->
- apply_hook(Dir, [], Hook);
+ apply_hook(Dir, Env, Hook);
(_) ->
continue
end, Hooks).
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index 7974fda..a0d1a9d 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -2,9 +2,15 @@
-export([get_packages/1]).
+-export_type([package/0]).
+
-include("rebar.hrl").
--spec get_packages(rebar_state:t()) -> {rebar_dict(), rlx_depsolver:t()}.
+-type pkg_name() :: binary() | atom().
+-type vsn() :: binary().
+-type package() :: pkg_name() | {pkg_name(), vsn()}.
+
+-spec get_packages(rebar_state:t()) -> {rebar_dict(), rebar_digraph()}.
get_packages(State) ->
Home = rebar_utils:home_dir(),
RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(Home, ?CONFIG_DIR)),
@@ -14,12 +20,12 @@ get_packages(State) ->
try
{ok, Binary} = file:read_file(PackagesFile),
{Dict, Graph} = binary_to_term(Binary),
- {Dict, Graph}
+ {Dict, rebar_digraph:restore_graph(Graph)}
catch
_:_ ->
- ?ERROR("Bad packages index, try to fix with `rebar update`~n", []),
- {dict:new(), rlx_depsolver:new_graph()}
+ ?ERROR("Bad packages index, try to fix with `rebar update`", []),
+ {dict:new(), digraph:new()}
end;
false ->
- {dict:new(), rlx_depsolver:new_graph()}
+ {dict:new(), digraph:new()}
end.
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 3b117e9..b7d81e2 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -55,7 +55,7 @@ validate_plugin(Plugin) ->
Exports = sets:from_list(Plugin:module_info(exports)),
Required = sets:from_list([{init,1},
{do,1},
- {format_error,2}]),
+ {format_error,1}]),
case sets:is_subset(Required, Exports) of
false ->
?WARN("Plugin ~p is not a provider. It will not be used.~n", [Plugin]),
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index b53742d..893fd76 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -43,6 +43,8 @@ do(State) ->
ProjectApps = rebar_state:project_apps(State1),
Deps = rebar_state:get(State1, deps_to_build, []),
+ Cwd = rebar_utils:get_cwd(),
+ rebar_hooks:run_compile_hooks(Cwd, pre_hooks, compile, State1),
%% Need to allow global config vars used on deps
%% Right now no way to differeniate and just give deps a new state
@@ -51,8 +53,6 @@ do(State) ->
build_apps(EmptyState1, Deps),
%% Use the project State for building project apps
- Cwd = rebar_utils:get_cwd(),
- rebar_hooks:run_compile_hooks(Cwd, pre_hooks, compile, State1),
%% Set hooks to empty so top-level hooks aren't run for each project app
State2 = rebar_state:set(rebar_state:set(State1, post_hooks, []), pre_hooks, []),
build_apps(State2, ProjectApps),
diff --git a/src/rebar_prv_dialyzer.erl b/src/rebar_prv_dialyzer.erl
index 20a58f3..6bff26b 100644
--- a/src/rebar_prv_dialyzer.erl
+++ b/src/rebar_prv_dialyzer.erl
@@ -20,47 +20,57 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
+ Opts = [{update_plt, $u, "update-plt", boolean, "Enable updating the PLT. Default: true"},
+ {succ_typings, $s, "succ-typings", boolean, "Enable success typing analysis. Default: true"}],
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
{bare, false},
{deps, ?DEPS},
{example, "rebar dialyzer"},
- {short_desc, "Run the Dialyzer analyzer on the project."},
- {desc, ""},
- {opts, []}])),
+ {short_desc, short_desc()},
+ {desc, desc()},
+ {opts, Opts}])),
{ok, State1}.
+desc() ->
+ short_desc() ++ "\n"
+ "\n"
+ "This command will build, and keep up-to-date, a suitable PLT and will use "
+ "it to carry out success typing analysis on the current project.\n"
+ "\n"
+ "The following (optional) configurations can be added to a rebar.config:\n"
+ "`dialyzer_warnings` - a list of dialyzer warnings\n"
+ "`dialyzer_plt` - the PLT file to use\n"
+ "`dialyzer_plt_apps` - a list of applications to include in the PLT file*\n"
+ "`dialyzer_plt_warnings` - display warnings when updating a PLT file "
+ "(boolean)\n"
+ "`dialyzer_base_plt` - the base PLT file to use**\n"
+ "`dialyzer_base_plt_dir` - the base PLT directory**\n"
+ "`dialyzer_base_plt_apps` - a list of applications to include in the base "
+ "PLT file**\n"
+ "\n"
+ "*The applications in `dialyzer_base_plt_apps` and any `applications` and "
+ "`included_applications` listed in their .app files will be added to the "
+ "list.\n"
+ "**The base PLT is a PLT containing the core OTP applications often "
+ "required for a project's PLT. One base PLT is created per OTP version and "
+ "stored in `dialyzer_base_plt_dir` (defaults to $HOME/.rebar3/). A base "
+ "PLT is used to create a project's initial PLT.".
+
+short_desc() ->
+ "Run the Dialyzer analyzer on the project.".
+
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
?INFO("Dialyzer starting, this may take a while...", []),
- BuildDir = rebar_state:get(State, base_dir, ?DEFAULT_BASE_DIR),
- {ProjectPlt, DepPlt} = get_plt_location(BuildDir),
+ Plt = get_plt_location(State),
Apps = rebar_state:project_apps(State),
- Deps = rebar_state:get(State, all_deps, []),
try
- ?INFO("Doing plt for dependencies...", []),
- update_dep_plt(State, DepPlt, Deps),
- ?INFO("Doing plt for project apps...", []),
- update_dep_plt(State, ProjectPlt, Apps),
- WarningTypes = rebar_state:get(State, dialyzer_warnings, default_warnings()),
- Paths = [filename:join(rebar_app_info:dir(App), "ebin") || App <- Apps],
- Opts = [{analysis_type, succ_typings},
- {from, byte_code},
- {files_rec, Paths},
- {warnings, WarningTypes},
- {plts, [ProjectPlt, DepPlt]}],
-
- case dialyzer:run(Opts) of
- [] ->
- {ok, State};
- Warnings ->
- [?CONSOLE(string:strip(dialyzer:format_warning(Warning), right, $\n), []) ||
- Warning <- Warnings],
- {ok, State}
- end
+ {ok, State1} = update_proj_plt(State, Plt, Apps),
+ succ_typings(State1, Plt, Apps)
catch
- _:{dialyzer_error, Error} ->
+ throw:{dialyzer_error, Error} ->
{error, {?MODULE, {error_processing_apps, Error, Apps}}}
end.
@@ -72,37 +82,294 @@ format_error(Reason) ->
%% Internal functions
-get_plt_location(BuildDir) ->
- {filename:join([BuildDir, ".project.plt"]),
- filename:join([BuildDir, ".deps.plt"])}.
-
-update_dep_plt(_State, DepPlt, AppList) ->
- Opts0 =
- case filelib:is_file(DepPlt) of
- true ->
- ?INFO("Plt is built, checking/updating...", []),
- [{analysis_type, plt_check},
- {plts, [DepPlt]}];
- false ->
- ?INFO("Building the plt, this will take a while...", []),
- [{analysis_type, plt_build},
- {output_plt, DepPlt}]
- end,
- Paths = [filename:join(rebar_app_info:dir(App), "ebin") || App <- AppList],
- Opts = [{files_rec, Paths},
- {from, byte_code}] ++ Opts0,
-
- dialyzer:run(Opts).
+get_plt_location(State) ->
+ BuildDir = rebar_state:get(State, base_dir, ?DEFAULT_BASE_DIR),
+ DefaultPlt = filename:join([BuildDir, default_plt()]),
+ rebar_state:get(State, dialyzer_plt, DefaultPlt).
+
+default_plt() ->
+ ".rebar3.otp-" ++ otp_version() ++ ".plt".
+
+otp_version() ->
+ Release = erlang:system_info(otp_release),
+ try otp_version(Release) of
+ Vsn ->
+ Vsn
+ catch
+ error:_ ->
+ Release
+ end.
+
+otp_version(Release) ->
+ File = filename:join([code:root_dir(), "releases", Release, "OTP_VERSION"]),
+ {ok, Contents} = file:read_file(File),
+ [Vsn] = binary:split(Contents, [<<$\n>>], [global, trim]),
+ [_ | _] = unicode:characters_to_list(Vsn).
+
+update_proj_plt(State, Plt, Apps) ->
+ {Args, _} = rebar_state:command_parsed_args(State),
+ case proplists:get_value(update_plt, Args) of
+ false ->
+ {ok, State};
+ _ ->
+ do_update_proj_plt(State, Plt, Apps)
+ end.
+
+do_update_proj_plt(State, Plt, Apps) ->
+ ?INFO("Updating plt...", []),
+ Files = get_plt_files(State, Apps),
+ case read_plt(State, Plt) of
+ {ok, OldFiles} ->
+ check_plt(State, Plt, OldFiles, Files);
+ {error, no_such_file} ->
+ build_proj_plt(State, Plt, Files)
+ end.
+
+get_plt_files(State, Apps) ->
+ BasePltApps = rebar_state:get(State, dialyzer_base_plt_apps,
+ default_plt_apps()),
+ PltApps = rebar_state:get(State, dialyzer_plt_apps, []),
+ DepApps = lists:flatmap(fun rebar_app_info:applications/1, Apps),
+ get_plt_files(BasePltApps ++ PltApps ++ DepApps, Apps, [], []).
+
+default_plt_apps() ->
+ [erts,
+ crypto,
+ kernel,
+ stdlib].
+
+get_plt_files([], _, _, Files) ->
+ Files;
+get_plt_files([AppName | DepApps], Apps, PltApps, Files) ->
+ case lists:member(AppName, PltApps) orelse app_member(AppName, Apps) of
+ true ->
+ get_plt_files(DepApps, Apps, PltApps, Files);
+ false ->
+ {DepApps2, Files2} = app_name_to_info(AppName),
+ DepApps3 = DepApps2 ++ DepApps,
+ Files3 = Files2 ++ Files,
+ get_plt_files(DepApps3, Apps, [AppName | PltApps], Files3)
+ end.
+
+app_member(AppName, Apps) ->
+ case rebar_app_utils:find(ec_cnv:to_binary(AppName), Apps) of
+ {ok, _App} ->
+ true;
+ error ->
+ false
+ end.
+
+app_name_to_info(AppName) ->
+ case app_name_to_ebin(AppName) of
+ {error, _} ->
+ ?CONSOLE("Unknown application ~s", [AppName]),
+ {[], []};
+ EbinDir ->
+ ebin_to_info(EbinDir, AppName)
+ end.
+
+app_name_to_ebin(AppName) ->
+ case code:lib_dir(AppName, ebin) of
+ {error, bad_name} ->
+ search_ebin(AppName);
+ EbinDir ->
+ check_ebin(EbinDir, AppName)
+ end.
+
+check_ebin(EbinDir, AppName) ->
+ case filelib:is_dir(EbinDir) of
+ true ->
+ EbinDir;
+ false ->
+ search_ebin(AppName)
+ end.
+
+search_ebin(AppName) ->
+ case code:where_is_file(atom_to_list(AppName) ++ ".app") of
+ non_existing ->
+ {error, bad_name};
+ AppFile ->
+ filename:dirname(AppFile)
+ end.
+
+ebin_to_info(EbinDir, AppName) ->
+ AppFile = filename:join(EbinDir, atom_to_list(AppName) ++ ".app"),
+ case file:consult(AppFile) of
+ {ok, [{application, AppName, AppDetails}]} ->
+ DepApps = proplists:get_value(applications, AppDetails, []),
+ IncApps = proplists:get_value(included_applications, AppDetails,
+ []),
+ Modules = proplists:get_value(modules, AppDetails, []),
+ Files = modules_to_files(Modules, EbinDir),
+ {IncApps ++ DepApps, Files};
+ _ ->
+ Error = io_lib:format("Could not parse ~p", [AppFile]),
+ throw({dialyzer_error, Error})
+ end.
+
+modules_to_files(Modules, EbinDir) ->
+ Ext = code:objfile_extension(),
+ Mod2File = fun(Module) -> module_to_file(Module, EbinDir, Ext) end,
+ rebar_utils:filtermap(Mod2File, Modules).
+
+module_to_file(Module, EbinDir, Ext) ->
+ File = filename:join(EbinDir, atom_to_list(Module) ++ Ext),
+ case filelib:is_file(File) of
+ true ->
+ {true, File};
+ false ->
+ ?CONSOLE("Unknown module ~s", [Module]),
+ false
+ end.
+
+read_plt(_State, Plt) ->
+ case dialyzer:plt_info(Plt) of
+ {ok, Info} ->
+ Files = proplists:get_value(files, Info, []),
+ {ok, Files};
+ {error, no_such_file} = Error ->
+ Error;
+ {error, read_error} ->
+ Error = io_lib:format("Could not read the PLT file ~p", [Plt]),
+ throw({dialyzer_error, Error})
+ end.
+
+check_plt(State, Plt, OldList, FilesList) ->
+ Old = sets:from_list(OldList),
+ Files = sets:from_list(FilesList),
+ Remove = sets:subtract(Old, Files),
+ {ok, State1} = remove_plt(State, Plt, sets:to_list(Remove)),
+ Check = sets:intersection(Files, Old),
+ {ok, State2} = check_plt(State1, Plt, sets:to_list(Check)),
+ Add = sets:subtract(Files, Old),
+ add_plt(State2, Plt, sets:to_list(Add)).
+
+remove_plt(State, _Plt, []) ->
+ {ok, State};
+remove_plt(State, Plt, Files) ->
+ ?INFO("Removing ~b files from ~p...", [length(Files), Plt]),
+ run_plt(State, Plt, plt_remove, Files).
+
+check_plt(State, _Plt, []) ->
+ {ok, State};
+check_plt(State, Plt, Files) ->
+ ?INFO("Checking ~b files in ~p...", [length(Files), Plt]),
+ run_plt(State, Plt, plt_check, Files).
+
+add_plt(State, _Plt, []) ->
+ {ok, State};
+add_plt(State, Plt, Files) ->
+ ?INFO("Adding ~b files to ~p...", [length(Files), Plt]),
+ run_plt(State, Plt, plt_add, Files).
+
+run_plt(State, Plt, Analysis, Files) ->
+ GetWarnings = rebar_state:get(State, dialyzer_plt_warnings, false),
+ Opts = [{analysis_type, Analysis},
+ {get_warnings, GetWarnings},
+ {init_plt, Plt},
+ {from, byte_code},
+ {files, Files}],
+ run_dialyzer(State, Opts).
+
+build_proj_plt(State, Plt, Files) ->
+ BasePlt = get_base_plt_location(State),
+ BaseFiles = get_base_plt_files(State),
+ {ok, State1} = update_base_plt(State, BasePlt, BaseFiles),
+ ?INFO("Copying ~p to ~p...", [BasePlt, Plt]),
+ case file:copy(BasePlt, Plt) of
+ {ok, _} ->
+ check_plt(State1, Plt, BaseFiles, Files);
+ {error, Reason} ->
+ Error = io_lib:format("Could not copy PLT from ~p to ~p: ~p",
+ [BasePlt, Plt, file:format_error(Reason)]),
+ throw({dialyzer_error, Error})
+ end.
+
+get_base_plt_location(State) ->
+ Home = rebar_utils:home_dir(),
+ GlobalConfigDir = filename:join(Home, ?CONFIG_DIR),
+ BaseDir = rebar_state:get(State, dialyzer_base_plt_dir, GlobalConfigDir),
+ BasePlt = rebar_state:get(State, dialyzer_base_plt, default_plt()),
+ filename:join(BaseDir, BasePlt).
+
+get_base_plt_files(State) ->
+ BasePltApps = rebar_state:get(State, dialyzer_base_plt_apps,
+ default_plt_apps()),
+ app_names_to_files(BasePltApps).
+
+app_names_to_files(AppNames) ->
+ ToFiles = fun(AppName) ->
+ {_, Files} = app_name_to_info(AppName),
+ Files
+ end,
+ lists:flatmap(ToFiles, AppNames).
+
+update_base_plt(State, BasePlt, BaseFiles) ->
+ ?INFO("Updating base plt...", []),
+ case read_plt(State, BasePlt) of
+ {ok, OldBaseFiles} ->
+ check_plt(State, BasePlt, OldBaseFiles, BaseFiles);
+ {error, no_such_file} ->
+ _ = filelib:ensure_dir(BasePlt),
+ build_plt(State, BasePlt, BaseFiles)
+ end.
+
+build_plt(State, Plt, Files) ->
+ ?INFO("Adding ~b files to ~p...", [length(Files), Plt]),
+ GetWarnings = rebar_state:get(State, dialyzer_plt_warnings, false),
+ Opts = [{analysis_type, plt_build},
+ {get_warnings, GetWarnings},
+ {output_plt, Plt},
+ {files, Files}],
+ run_dialyzer(State, Opts).
+
+succ_typings(State, Plt, Apps) ->
+ {Args, _} = rebar_state:command_parsed_args(State),
+ case proplists:get_value(succ_typings, Args) of
+ false ->
+ {ok, State};
+ _ ->
+ do_succ_typings(State, Plt, Apps)
+ end.
+
+do_succ_typings(State, Plt, Apps) ->
+ ?INFO("Doing success typing analysis...", []),
+ Files = apps_to_files(Apps),
+ ?INFO("Analyzing ~b files with ~p...", [length(Files), Plt]),
+ Opts = [{analysis_type, succ_typings},
+ {get_warnings, true},
+ {from, byte_code},
+ {files, Files},
+ {init_plt, Plt}],
+ run_dialyzer(State, Opts).
+
+apps_to_files(Apps) ->
+ lists:flatmap(fun app_to_files/1, Apps).
+
+app_to_files(App) ->
+ AppName = ec_cnv:to_atom(rebar_app_info:name(App)),
+ {_, Files} = app_name_to_info(AppName),
+ Files.
+
+run_dialyzer(State, Opts) ->
+ Warnings = rebar_state:get(State, dialyzer_warnings, default_warnings()),
+ Opts2 = [{warnings, Warnings} | Opts],
+ _ = [?CONSOLE("~s", [format_warning(Warning)])
+ || Warning <- dialyzer:run(Opts2)],
+ {ok, State}.
+
+format_warning(Warning) ->
+ string:strip(dialyzer_format_warning(Warning), right, $\n).
+
+dialyzer_format_warning(Warning) ->
+ case dialyzer:format_warning(Warning) of
+ ":0: " ++ Warning2 ->
+ Warning2;
+ Warning2 ->
+ Warning2
+ end.
default_warnings() ->
- [no_return,
- no_unused,
- no_improper_lists,
- no_fun_app,
- no_match,
- no_opaque,
- no_fail_call,
- error_handling,
- race_conditions,
+ [error_handling,
unmatched_returns,
underspecs].
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index f3c050e..9822b32 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -77,7 +77,7 @@ do(State) ->
end,
Source = ProjectApps ++ rebar_state:src_apps(State1),
- case rebar_topo:sort_apps(Source) of
+ case rebar_digraph:compile_order(Source) of
{ok, Sort} ->
{ok, rebar_state:set(State1, deps_to_build,
lists:dropwhile(fun rebar_app_info:valid/1, Sort -- ProjectApps))};
@@ -130,11 +130,13 @@ handle_deps(State, Deps, Update) ->
[];
PkgDeps1 ->
%% Find pkg deps needed
- S = case rlx_depsolver:solve(Graph, PkgDeps1) of
+ S = case rebar_digraph:cull_deps(Graph, PkgDeps1) of
+ {ok, []} ->
+ throw({rebar_digraph, no_solution});
{ok, Solution} ->
Solution;
- Reason ->
- throw({error, {rlx_depsolver, Reason}})
+ [] ->
+ throw({rebar_digraph, no_solution})
end,
%% Create app_info record for each pkg dep
@@ -156,19 +158,17 @@ handle_deps(State, Deps, Update) ->
%% Internal functions
%% ===================================================================
-package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
- Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
- FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
- case dict:find({Name, FmtVsn}, Packages) of
+package_to_app(DepsDir, Packages, {Name, Vsn}) ->
+ case dict:find({Name, Vsn}, Packages) of
error ->
[];
{ok, P} ->
PkgDeps = proplists:get_value(<<"deps">>, P, []),
Link = proplists:get_value(<<"link">>, P, ""),
- {ok, AppInfo} = rebar_app_info:new(Name, FmtVsn),
+ {ok, AppInfo} = rebar_app_info:new(Name, Vsn),
AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps),
AppInfo2 = rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, Name)),
- [rebar_app_info:source(AppInfo2, {pkg, Name, FmtVsn, Link})]
+ [rebar_app_info:source(AppInfo2, {pkg, Name, Vsn, Link})]
end.
-spec update_src_deps(integer(), rebar_state:t(), boolean(), sets:set(binary())) ->
diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl
index 7975f27..b7341d0 100644
--- a/src/rebar_prv_test_deps.erl
+++ b/src/rebar_prv_test_deps.erl
@@ -43,7 +43,7 @@ do(State) ->
AllDeps = rebar_state:get(State2, all_deps, []),
State3 = rebar_state:set(State2, deps_dir, DepsDir),
- case rebar_topo:sort_apps(ProjectApps1++AllDeps) of
+ case rebar_digraph:compile_order(ProjectApps1++AllDeps) of
{ok, Sort} ->
ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Sort -- ProjectApps1),
State4 = rebar_state:set(State3, deps_to_build, ToBuild),
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index 4751e05..16987be 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -40,8 +40,8 @@ do(State) ->
Home = rebar_utils:home_dir(),
PackagesFile = filename:join([Home, ?CONFIG_DIR, "packages"]),
filelib:ensure_dir(PackagesFile),
- {ok, _RequestId} = httpc:request(get, {Url, []}, [], [{stream, TmpFile}
- ,{sync, true}]),
+ {ok, _RequestId} = httpc:request(get, {Url, [{"Accept", "application/erlang"}]},
+ [], [{stream, TmpFile}, {sync, true}]),
ok = ec_file:copy(TmpFile, PackagesFile)
catch
_:_ ->
diff --git a/src/rebar_resource.erl b/src/rebar_resource.erl
index 04b8d73..ee7d2d3 100644
--- a/src/rebar_resource.erl
+++ b/src/rebar_resource.erl
@@ -4,17 +4,17 @@
-export([]).
--export_types([resource/0
- ,type/0
- ,location/0
- ,ref/0]).
+-export_type([resource/0
+ ,type/0
+ ,location/0
+ ,ref/0]).
-type resource() :: {type(), location(), ref()}.
-type type() :: atom().
-type location() :: string().
-type ref() :: any().
--ifdef(have_callback_support).
+-ifdef(no_callback_support).
%% In the case where R14 or lower is being used to compile the system
%% we need to export a behaviour info
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index f39251d..840b428 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -28,7 +28,7 @@
src_deps = [],
src_apps = [],
- pkg_deps = [] :: [rlx_depsolver:constraint()],
+ pkg_deps = [] :: [rebar_packages:package()],
project_apps = [],
providers = []}).
@@ -103,7 +103,7 @@ deps_names(State) ->
ec_cnv:to_binary(Dep)
end, Deps).
--spec pkg_deps(t()) -> [rlx_depsolver:constraint()].
+-spec pkg_deps(t()) -> [rebar_packages:package()].
pkg_deps(#state_t{pkg_deps=PkgDeps}) ->
PkgDeps.
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
deleted file mode 100644
index d9f426d..0000000
--- a/src/rebar_topo.erl
+++ /dev/null
@@ -1,212 +0,0 @@
-%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 80 -*-
-%%% Copyright 2012 Erlware, LLC. All Rights Reserved.
-%%%
-%%% This file is provided to you under the Apache License,
-%%% Version 2.0 (the "License"); you may not use this file
-%%% except in compliance with the License. You may obtain
-%%% a copy of the License at
-%%%
-%%% http://www.apache.org/licenses/LICENSE-2.0
-%%%
-%%% Unless required by applicable law or agreed to in writing,
-%%% software distributed under the License is distributed on an
-%%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%%% KIND, either express or implied. See the License for the
-%%% specific language governing permissions and limitations
-%%% under the License.
-%%%-------------------------------------------------------------------
-%%% @author Joe Armstrong
-%%% @author Eric Merritt
-%%% @doc
-%%% This is a pretty simple topological sort for erlang. It was
-%%% originally written for ermake by Joe Armstrong back in '98. It
-%%% has been pretty heavily modified by Eric Merritt since '06 and modified again for Relx.
-%%%
-%%% A partial order on the set S is a set of pairs {Xi,Xj} such that
-%%% some relation between Xi and Xj is obeyed.
-%%%
-%%% A topological sort of a partial order is a sequence of elements
-%%% [X1, X2, X3 ...] such that if whenever {Xi, Xj} is in the partial
-%%% order i &lt; j
-%%% @end
-%%%-------------------------------------------------------------------
--module(rebar_topo).
-
--export([sort/1,
- sort_apps/1,
- format_error/1]).
-
--include("rebar.hrl").
-
-%%====================================================================
-%% Types
-%%====================================================================
--type pair() :: {DependentApp::atom(), PrimaryApp::atom()}.
--type name() :: AppName::atom().
--type element() :: name() | pair().
-
-%%====================================================================
-%% API
-%%====================================================================
-
-%% @doc This only does a topo sort on the list of applications and
-%% assumes that there is only *one* version of each app in the list of
-%% applications. This implies that you have already done the
-%% constraint solve before you pass the list of apps here to be
-%% sorted.
--spec sort_apps([rebar_app_info:t()]) -> {ok, [rebar_app_info:t()]} | {error, any()}.
-sort_apps(Apps) ->
- Pairs = apps_to_pairs(Apps),
- case sort(Pairs) of
- {ok, Names} ->
- {ok, names_to_apps(Names, Apps)};
- E ->
- E
- end.
-
-%% @doc Do a topological sort on the list of pairs.
--spec sort([pair()]) -> {ok, [atom()]} | {error, any()}.
-sort(Pairs) ->
- iterate(Pairs, [], all(Pairs)).
-
-%% @doc nicely format the error from the sort.
--spec format_error(Reason::term()) -> iolist().
-format_error({cycle, Pairs}) ->
- ["Cycle detected in dependency graph, this must be resolved "
- "before we can continue:\n",
- case Pairs of
- [{P1, P2}] ->
- [rebar_utils:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1)];
- [{P1, P2} | Rest] ->
- [rebar_utils:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1),
- [["-> ", erlang:atom_to_list(PP2), " -> ", erlang:atom_to_list(PP1)] || {PP1, PP2} <- Rest]];
- [] ->
- []
- end].
-
-%%====================================================================
-%% Internal Functions
-%%====================================================================
--spec names_to_apps([atom()], [rebar_app_info:t()]) -> [rebar_app_info:t()].
-names_to_apps(Names, Apps) ->
- [element(2, App) || App <- [find_app_by_name(Name, Apps) || Name <- Names], App =/= error].
-
--spec find_app_by_name(atom(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
-find_app_by_name(Name, Apps) ->
- ec_lists:find(fun(App) ->
- ec_cnv:to_atom(rebar_app_info:name(App)) =:= ec_cnv:to_atom(Name)
- end, Apps).
-
--spec apps_to_pairs([rebar_app_info:t()]) -> [pair()].
-apps_to_pairs(Apps) ->
- lists:flatten([app_to_pairs(App) || App <- Apps]).
-
--spec app_to_pairs(rebar_app_info:t()) -> [pair()].
-app_to_pairs(App) ->
- [{ec_cnv:to_atom(DepApp), ec_cnv:to_atom(rebar_app_info:name(App))} ||
- DepApp <-
- rebar_app_info:deps(App)].
-
-
-%% @doc Iterate over the system. @private
--spec iterate([pair()], [name()], [name()]) ->
- {ok, [name()]} | {error, iolist()}.
-iterate([], L, All) ->
- {ok, remove_duplicates(L ++ subtract(All, L))};
-iterate(Pairs, L, All) ->
- case subtract(lhs(Pairs), rhs(Pairs)) of
- [] ->
- {error, format_error({cycle, Pairs})};
- Lhs ->
- iterate(remove_pairs(Lhs, Pairs), L ++ Lhs, All)
- end.
-
--spec all([pair()]) -> [atom()].
-all(L) ->
- lhs(L) ++ rhs(L).
-
--spec lhs([pair()]) -> [atom()].
-lhs(L) ->
- [X || {X, _} <- L].
-
--spec rhs([pair()]) -> [atom()].
-rhs(L) ->
- [Y || {_, Y} <- L].
-
-%% @doc all the elements in L1 which are not in L2
-%% @private
--spec subtract([element()], [element()]) -> [element()].
-subtract(L1, L2) ->
- [X || X <- L1, not lists:member(X, L2)].
-
-%% @doc remove dups from the list. @private
--spec remove_duplicates([element()]) -> [element()].
-remove_duplicates([H|T]) ->
- case lists:member(H, T) of
- true ->
- remove_duplicates(T);
- false ->
- [H|remove_duplicates(T)]
- end;
-remove_duplicates([]) ->
- [].
-
-%% @doc
-%% removes all pairs from L2 where the first element
-%% of each pair is a member of L1
-%%
-%% L2' L1 = [X] L2 = [{X,Y}].
-%% @private
--spec remove_pairs([atom()], [pair()]) -> [pair()].
-remove_pairs(L1, L2) ->
- [All || All={X, _Y} <- L2, not lists:member(X, L1)].
-
-%%====================================================================
-%% Tests
-%%====================================================================
--ifndef(NOTEST).
--include_lib("eunit/include/eunit.hrl").
-
-topo_1_test() ->
- Pairs = [{one,two},{two,four},{four,six},
- {two,ten},{four,eight},
- {six,three},{one,three},
- {three,five},{five,eight},
- {seven,five},{seven,nine},
- {nine,four},{nine,ten}],
- ?assertMatch({ok, [one,seven,two,nine,four,six,three,five,eight,ten]},
- sort(Pairs)).
-topo_2_test() ->
- Pairs = [{app2, app1}, {zapp1, app1}, {stdlib, app1},
- {app3, app2}, {kernel, app1}, {kernel, app3},
- {app2, zapp1}, {app3, zapp1}, {zapp2, zapp1}],
- ?assertMatch({ok, [stdlib, kernel, zapp2,
- app3, app2, zapp1, app1]},
- sort(Pairs)).
-
-topo_pairs_cycle_test() ->
- Pairs = [{app2, app1}, {app1, app2}, {stdlib, app1}],
- ?assertMatch({error, _}, sort(Pairs)).
-
-topo_apps_cycle_test() ->
- {ok, App1} = rebar_app_info:new(app1, "0.1", "/no-dir", [app2]),
- {ok, App2} = rebar_app_info:new(app2, "0.1", "/no-dir", [app1]),
- Apps = [App1, App2],
- ?assertMatch({error, _}, sort_apps(Apps)).
-
-topo_apps_good_test() ->
- Apps = [App ||
- {ok, App} <-
- [rebar_app_info:new(app1, "0.1", "/no-dir", [app2, zapp1]),
- rebar_app_info:new(app2, "0.1", "/no-dir", [app3]),
- rebar_app_info:new(app3, "0.1", "/no-dir", [kernel]),
- rebar_app_info:new(zapp1, "0.1", "/no-dir", [app2,app3,zapp2]),
- rebar_app_info:new(stdlib, "0.1", "/no-dir", []),
- rebar_app_info:new(kernel, "0.1", "/no-dir", []),
- rebar_app_info:new(zapp2, "0.1", "/no-dir", [])]],
- {ok, Sorted} = sort_apps(Apps),
- ?assertMatch([stdlib, kernel, zapp2,
- app3, app2, zapp1, app1],
- [ec_cnv:to_atom(rebar_app_info:name(App)) || App <- Sorted]).
-
--endif.
generated by cgit v1.1 at 2025-04-03 03:59:19 +0000