diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | inttest/bug_5_rt.erl | 28 | ||||
| l--------- | inttest/retest | 1 | ||||
| -rw-r--r-- | src/rebar_core.erl | 15 |
4 files changed, 38 insertions, 7 deletions
@@ -3,3 +3,4 @@ .~ \.orig \.swp +rt.work/* diff --git a/inttest/bug_5_rt.erl b/inttest/bug_5_rt.erl new file mode 100644 index 0000000..9f9711d --- /dev/null +++ b/inttest/bug_5_rt.erl @@ -0,0 +1,28 @@ +-module(bug_5_rt). + +-compile(export_all). + + +files() -> + [{create, "ebin/a1.app", app(a1)}, + {create, "deps/d1/src/d1.app.src", app(d1)}, + {create, "rebar.config", + <<"{deps, [{d1, \"1\", {hg, \"http://example.com\", \"tip\"}}]}.\n">>}, + {copy, "../rebar", "rebar"}]. + +run(_Dir) -> + {ok, _} = retest:sh("./rebar compile"). + + + +%% +%% Generate the contents of a simple .app file +%% +app(Name) -> + App = {application, Name, + [{description, atom_to_list(Name)}, + {vsn, "1"}, + {modules, []}, + {registered, []}, + {applications, [kernel, stdlib]}]}, + io_lib:format("~p.\n", [App]). diff --git a/inttest/retest b/inttest/retest new file mode 120000 index 0000000..ff9a17f --- /dev/null +++ b/inttest/retest @@ -0,0 +1 @@ +/Users/dizzyd/src/public/retest/retest
\ No newline at end of file diff --git a/src/rebar_core.erl b/src/rebar_core.erl index 8886251..8b7c74f 100644 --- a/src/rebar_core.erl +++ b/src/rebar_core.erl @@ -319,13 +319,14 @@ process_subdirs(Dir, Modules, Config, ModuleSetFile, Command, ProcessedDirs) -> %% 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 compile == Command) of - true -> - acc_modules(Modules, preprocess, UpdatedConfig, - ModuleSetFile); - false -> - {UpdatedConfig, Dirs} - end, + %% {UpdatedConfig1, _} = case (Dirs =/= [] andalso compile == Command) of + %% true -> + %% acc_modules(Modules, preprocess, UpdatedConfig, + %% ModuleSetFile); + %% false -> + %% {UpdatedConfig, Dirs} + %% end, + UpdatedConfig1 = UpdatedConfig, %% Make sure the CWD is reset properly; processing subdirs may have caused it %% to change |