Browse Source

fix plan generation

Maxim Sokhatsky 10 years ago
parent
commit
7781995b4a
4 changed files with 8 additions and 5 deletions
  1. BIN
      mad
  2. 2 1
      src/mad.erl
  3. 2 2
      src/mad_plan.erl
  4. 4 2
      src/mad_repl.erl

BIN
mad


+ 2 - 1
src/mad.erl

@@ -43,7 +43,8 @@ compile(Cwd, ConfigFile, Conf, Params) ->
 %% reltool apps resolving
 plan(Cwd,ConfigFileName,Config,Params) ->
     io:format("Plan Params: ~p~n",[Params]),
-    mad_plan:main(mad_plan:applist()).
+    mad_repl:load(),
+    mad_repl:applist().
 
 repl(Cwd,ConfigFileName,Config,Params) ->
     io:format("Repl Params: ~p~n",[Params]),

+ 2 - 2
src/mad_plan.erl

@@ -8,6 +8,6 @@ main(AppList) ->
     {ok, Server} = reltool:start_server([{config, Relconfig}]),
     {ok, {release, _Node, _Erts, Apps}} = reltool_server:get_rel(Server, "node"),
     Ordered = [element(1, A) || A <- Apps] -- mad_repl:disabled(),
-    io:format("Ordered: ~p~n",[Ordered]),
-    io:format("Applist Generation: ~w~n", [file:write_file(".applist",io_lib:format("~w",[Ordered]))]),
+    io:format("Ordered: ~p~n\r",[Ordered]),
+    io:format("Applist Generation: ~w~n\r", [file:write_file(".applist",io_lib:format("~w",[Ordered]))]),
     Ordered.

+ 4 - 2
src/mad_repl.erl

@@ -10,7 +10,7 @@ applist() ->
          {ok,Binary} -> parse_applist(Binary); 
          {error,Reason} ->
            case mad_repl:load_file(Name) of
-              <<>> -> main([ list_to_atom(filename:basename(App))
+              <<>> -> mad_plan:main([ list_to_atom(filename:basename(App))
                 || App <- filelib:wildcard("{apps,deps}/*"), filelib:is_dir(App) ]);
               Plan -> parse_applist(Plan) end end.
 
@@ -71,7 +71,9 @@ main(Params) ->
 
 load() ->
 
-    ets:new(filesystem,[set,named_table,{keypos,1},public]),
+    case ets:info(filesystem) of
+         undefined -> ets:new(filesystem,[set,named_table,{keypos,1},public]);
+         _ -> skip end,
 
     {ok,Sections} = escript:extract(escript:script_name(),[]),
     [Bin] = [B||{archive,B}<-Sections],