diff options
| author | Jared Morrow <jared@basho.com> | 2014-03-05 12:08:00 -0700 |
|---|---|---|
| committer | Jared Morrow <jared@basho.com> | 2014-03-05 12:08:00 -0700 |
| commit | 077f8e064a8b07824e4a639aefad9e87df02de62 (patch) | |
| tree | 45ad5b18b18a8f1d9247942897bcc159a4b86150 /src | |
| parent | 62b006227cc1c71102ff8a608b3b11e77a06fced (diff) | |
| parent | f2b370085c7a5fd16b3eac2594f6816bcbc7d5e3 (diff) | |
Merge pull request #175 from tuncer/cwd-plugins-regression
CWD plugins regression
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_core.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rebar_core.erl b/src/rebar_core.erl index 631cef2..4efc978 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -502,6 +502,8 @@ acc_modules([Module | Rest], Command, Config, File, Acc) -> %% plugin_modules(Config, PredirsAssoc) -> Modules = lists:flatten(rebar_config:get_all(Config, plugins)), + ?DEBUG("Plugins requested while processing ~s: ~p~n", + [rebar_utils:get_cwd(), Modules]), plugin_modules(Config, PredirsAssoc, ulist(Modules)). ulist(L) -> @@ -543,6 +545,7 @@ plugin_modules(Config, PredirsAssoc, FoundModules, MissingModules) -> load_plugin_modules(Config, PredirsAssoc, Modules) -> Cwd = rebar_utils:get_cwd(), PluginDirs = get_all_plugin_dirs(Config, Cwd, PredirsAssoc), + ?DEBUG("Plugin dirs for ~s:~n~p~n", [Cwd, PluginDirs]), %% Find relevant sources in base_dir and plugin_dir Erls = string:join([atom_to_list(M)++"\\.erl" || M <- Modules], "|"), @@ -558,7 +561,9 @@ load_plugin_modules(Config, PredirsAssoc, Modules) -> {Loaded, NotLoaded}. get_all_plugin_dirs(Config, Cwd, PredirsAssoc) -> - get_plugin_dir(Config, Cwd) ++ get_base_plugin_dirs(Cwd, PredirsAssoc). + [rebar_utils:get_cwd()] + ++ get_plugin_dir(Config, Cwd) + ++ get_base_plugin_dirs(Cwd, PredirsAssoc). get_plugin_dir(Config, Cwd) -> case rebar_config:get_local(Config, plugin_dir, undefined) of @@ -577,7 +582,7 @@ get_base_plugin_dirs(Cwd, PredirsAssoc) -> [filename:join(Dir, "plugins") || Dir <- get_plugin_base_dirs(Cwd, PredirsAssoc)]. -%% @doc PredirsAssoc is a dictionary of plugindir -> 'parent' pairs +%% @doc PredirsAssoc is a dictionary of plugindir -> 'parent' pairs. %% 'parent' in this case depends on plugin; therefore we have to give %% all plugins that Cwd ('parent' in this case) depends on. get_plugin_base_dirs(Cwd, PredirsAssoc) -> |