diff options
| -rw-r--r-- | src/rebar_base_compiler.erl | 3 | ||||
| -rw-r--r-- | src/rebar_core.erl | 104 | ||||
| -rw-r--r-- | src/rebar_erlc_compiler.erl | 3 |
3 files changed, 76 insertions, 34 deletions
diff --git a/src/rebar_base_compiler.erl b/src/rebar_base_compiler.erl index 8ca0a7b..a83ffe5 100644 --- a/src/rebar_base_compiler.erl +++ b/src/rebar_base_compiler.erl @@ -179,7 +179,8 @@ compile_worker(QueuePid, Config, CompileFn) -> QueuePid ! {skipped, Source}, compile_worker(QueuePid, Config, CompileFn); Error -> - QueuePid ! {fail, Error}, + QueuePid ! {fail, [{error, Error}, + {source, Source}]}, ok end; diff --git a/src/rebar_core.erl b/src/rebar_core.erl index 2210c23..8025f00 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -72,7 +72,9 @@ run(RawArgs) -> ?DEBUG("Rebar location: ~p\n", [rebar_config:get_global(escript, undefined)]), %% Load rebar.config, if it exists - process_dir(rebar_utils:get_cwd(), rebar_config:new(), CommandAtoms). + [process_dir(rebar_utils:get_cwd(), rebar_config:new(), [Command]) + || Command <- CommandAtoms], + ok. %% =================================================================== @@ -277,44 +279,82 @@ process_dir(Dir, ParentConfig, Commands) -> Modules = AnyDirModules ++ DirModules, - %% Give the modules a chance to tweak config and indicate if there - %% are any other dirs that might need processing first. - {UpdatedConfig, Dirs} = acc_modules(select_modules(Modules, preprocess, []), - preprocess, Config, ModuleSetFile, []), - ?DEBUG("~s subdirs: ~p\n", [Dir, Dirs]), - - %% Add ebin to path if this app has any plugins configured locally. - prep_plugin_modules(UpdatedConfig), + ok = process_subdirs(Dir, Modules, Config, ModuleSetFile, Commands), - [process_dir(D, UpdatedConfig, Commands) || D <- Dirs], - - %% Make sure the CWD is reset properly; processing subdirs may have caused it - %% to change - ok = file:set_cwd(Dir), + %% Once we're all done processing, reset the code path to whatever + %% the parent initialized it to + restore_code_path(CurrentCodePath), + ok + end. - %% http://bitbucket.org/basho/rebar/issue/5 - %% If the compiler ran, run the preprocess again because a new ebin dir - %% may have been produced. - case Dirs =/= [] andalso lists:member(compile, Commands) of - true -> - acc_modules(select_modules(Modules, preprocess, []), - preprocess, Config, ModuleSetFile, []); - false -> - ok - end, +%% +%% Run the preprocessors and execute commands on all newly +%% found Dirs until no new Dirs are found by the preprocessors. +%% +process_subdirs(Dir, Modules, Config, ModuleSetFile, Commands) -> + process_subdirs(Dir, Modules, Config, ModuleSetFile, Commands, sets:new()). + +process_subdirs(Dir, Modules, Config, ModuleSetFile, Commands, ProcessedDirs) -> + %% Give the modules a chance to tweak config and indicate if there + %% are any other dirs that might need processing first. + {UpdatedConfig, Dirs} = acc_modules(select_modules(Modules, preprocess, []), + preprocess, Config, ModuleSetFile, []), + ?DEBUG("~s subdirs: ~p\n", [Dir, Dirs]), + + %% Add ebin to path if this app has any plugins configured locally. + prep_plugin_modules(UpdatedConfig), + + %% Process subdirs that haven't already been processed. + F = fun (D, S) -> + case filelib:is_dir(D) andalso (not sets:is_element(D, S)) of + true -> + process_dir(D, UpdatedConfig, Commands), + sets:add_element(D, S); + false -> + S + end + end, + NewProcessedDirs = lists:foldl(F, sets:add_element(parent, ProcessedDirs), Dirs), + + %% http://bitbucket.org/basho/rebar/issue/5 + %% If the compiler ran, run the preprocess again because a new ebin dir + %% may have been produced. + {UpdatedConfig1, _} = case (Dirs =/= [] andalso + lists:member(compile, Commands)) of + true -> + acc_modules( + select_modules(Modules, preprocess, []), + preprocess, UpdatedConfig, ModuleSetFile, []); + false -> + {UpdatedConfig, Dirs} + end, + + %% Make sure the CWD is reset properly; processing subdirs may have caused it + %% to change + ok = file:set_cwd(Dir), + + %% Run the parent commands exactly once as well + case sets:is_element(parent, ProcessedDirs) of + true -> + ok; + false -> %% Get the list of plug-in modules from rebar.config. These modules are %% processed LAST and do not participate in preprocess. - {ok, PluginModules} = plugin_modules(UpdatedConfig), + {ok, PluginModules} = plugin_modules(UpdatedConfig1), %% Finally, process the current working directory ?DEBUG("Commands: ~p Modules: ~p Plugins: ~p\n", [Commands, Modules, PluginModules]), - apply_commands(Commands, Modules ++ PluginModules, UpdatedConfig, ModuleSetFile), + apply_commands(Commands, Modules ++ PluginModules, UpdatedConfig1, ModuleSetFile) + end, - %% Once we're all done processing, reset the code path to whatever - %% the parent initialized it to - restore_code_path(CurrentCodePath), - ok + %% Repeat the process if there are new SeenDirs + case NewProcessedDirs =:= ProcessedDirs of + true -> + ok; + false -> + process_subdirs(Dir, Modules, UpdatedConfig1, ModuleSetFile, Commands, + NewProcessedDirs) end. %% @@ -347,7 +387,7 @@ prep_plugin_modules(Config) -> %% plugin_modules(Config) -> Modules = lists:flatten(rebar_config:get_all(Config, rebar_plugins)), - plugin_modules(Config, Modules). + plugin_modules(Config, ulist(Modules)). ulist(L) -> ulist(L, sets:new(), []). @@ -373,7 +413,7 @@ plugin_modules(_Config, Modules) -> ?DEBUG("Missing plugins: ~p\n", [Modules -- FoundModules]), ok end, - {ok, ulist(FoundModules)}. + {ok, FoundModules}. %% %% Return .app file if the current directory is an OTP app diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl index 8cdaf75..ea17b30 100644 --- a/src/rebar_erlc_compiler.erl +++ b/src/rebar_erlc_compiler.erl @@ -116,7 +116,8 @@ doterl_compile(Config, OutDir, MoreSources) -> [{F, compile_priority(F)} || F <- RestErls ])], - %% Make sure that ebin/ is on the path + %% Make sure that ebin/ exists and is on the path + ok = filelib:ensure_dir(filename:join("ebin", "dummy.beam")), CurrPath = code:get_path(), code:add_path("ebin"), rebar_base_compiler:run(Config, FirstErls, SortedRestErls, |