Permalink
Browse files

Adding rt for bug 5

  • Loading branch information...
1 parent 30ae41d commit 623200ec17c23973e137f2169a48d6837dd57a3c @dizzyd dizzyd committed Jun 4, 2010
Showing with 38 additions and 7 deletions.
  1. +1 −0 .hgignore
  2. +28 −0 inttest/bug_5_rt.erl
  3. +1 −0 inttest/retest
  4. +8 −7 src/rebar_core.erl
View
@@ -3,3 +3,4 @@
.~
\.orig
\.swp
+rt.work/*
View
@@ -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]).
View
View
@@ -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

0 comments on commit 623200e

Please sign in to comment.