mirror of
https://github.com/correl/rebar.git
synced 2024-11-14 19:19:30 +00:00
Adding rt for bug 5
This commit is contained in:
parent
30ae41dafd
commit
623200ec17
4 changed files with 38 additions and 7 deletions
|
@ -3,3 +3,4 @@
|
||||||
.~
|
.~
|
||||||
\.orig
|
\.orig
|
||||||
\.swp
|
\.swp
|
||||||
|
rt.work/*
|
||||||
|
|
28
inttest/bug_5_rt.erl
Normal file
28
inttest/bug_5_rt.erl
Normal file
|
@ -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]).
|
1
inttest/retest
Symbolic link
1
inttest/retest
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
/Users/dizzyd/src/public/retest/retest
|
|
@ -319,13 +319,14 @@ process_subdirs(Dir, Modules, Config, ModuleSetFile, Command, ProcessedDirs) ->
|
||||||
%% http://bitbucket.org/basho/rebar/issue/5
|
%% http://bitbucket.org/basho/rebar/issue/5
|
||||||
%% If the compiler ran, run the preprocess again because a new ebin dir
|
%% If the compiler ran, run the preprocess again because a new ebin dir
|
||||||
%% may have been produced.
|
%% may have been produced.
|
||||||
{UpdatedConfig1, _} = case (Dirs =/= [] andalso compile == Command) of
|
%% {UpdatedConfig1, _} = case (Dirs =/= [] andalso compile == Command) of
|
||||||
true ->
|
%% true ->
|
||||||
acc_modules(Modules, preprocess, UpdatedConfig,
|
%% acc_modules(Modules, preprocess, UpdatedConfig,
|
||||||
ModuleSetFile);
|
%% ModuleSetFile);
|
||||||
false ->
|
%% false ->
|
||||||
{UpdatedConfig, Dirs}
|
%% {UpdatedConfig, Dirs}
|
||||||
end,
|
%% end,
|
||||||
|
UpdatedConfig1 = UpdatedConfig,
|
||||||
|
|
||||||
%% Make sure the CWD is reset properly; processing subdirs may have caused it
|
%% Make sure the CWD is reset properly; processing subdirs may have caused it
|
||||||
%% to change
|
%% to change
|
||||||
|
|
Loading…
Reference in a new issue