From 59ab113f3bedee12bac6b4c41ab0cc5dd5edc285 Mon Sep 17 00:00:00 2001 From: Bob Ippolito Date: Sat, 8 May 2010 07:07:28 -0700 Subject: [PATCH] Run the preprocess again if subdirs were compiled, fixes http://bitbucket.org/basho/rebar/issue/5 --- src/rebar_core.erl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/rebar_core.erl b/src/rebar_core.erl index 117d6cf..061fd5c 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -287,6 +287,17 @@ process_dir(Dir, ParentConfig, Commands) -> %% to change ok = file:set_cwd(Dir), + %% 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, + %% Finally, process the current working directory ?DEBUG("Commands: ~p Modules: ~p\n", [Commands, Modules]), apply_commands(Commands, Modules, UpdatedConfig, ModuleSetFile),