Maxim Sokhatsky 10 years ago
parent
commit
e695643591
6 changed files with 14 additions and 13 deletions
  1. BIN
      mad
  2. 4 4
      src/mad.erl
  3. 1 1
      src/mad_bundle.erl
  4. 6 5
      src/mad_plan.erl
  5. 2 2
      src/mad_repl.erl
  6. 1 1
      src/mad_utils.erl

BIN
mad


+ 4 - 4
src/mad.erl

@@ -57,10 +57,10 @@ repl(Cwd,ConfigFileName,Config,Params) ->
     io:format("Repl Params: ~p~n",[Params]),
     io:format("Repl Params: ~p~n",[Params]),
     mad_repl:main(Params).
     mad_repl:main(Params).
 
 
-tool(Cwd,ConfigFileName,Config,Params) ->
+bundle(Cwd,ConfigFileName,Config,Params) ->
     io:format("Tool Params: ~p~n",[Params]),
     io:format("Tool Params: ~p~n",[Params]),
     Name = case Params of [] -> filename:basename(mad_utils:cwd()); E -> E end,
     Name = case Params of [] -> filename:basename(mad_utils:cwd()); E -> E end,
-    mad_tool:main(Name).
+    mad_bundle:main(Name).
 
 
 help(Reason, Data) -> help(io_lib:format("~s ~p", [Reason, Data])).
 help(Reason, Data) -> help(io_lib:format("~s ~p", [Reason, Data])).
 help(Msg) -> io:format("Error: ~s~n~n", [Msg]), help().
 help(Msg) -> io:format("Error: ~s~n~n", [Msg]), help().
@@ -68,8 +68,8 @@ help() ->
     io:format("VXZ MAD Build Tool version 1.0~n"),
     io:format("VXZ MAD Build Tool version 1.0~n"),
     io:format("BNF: ~n"),
     io:format("BNF: ~n"),
     io:format("    invoke := mad params~n"),
     io:format("    invoke := mad params~n"),
-    io:format("    params := run params ~n"),
+    io:format("    params := [] | run params ~n"),
     io:format("       run := command [ help | options ]~n"),
     io:format("       run := command [ help | options ]~n"),
-    io:format("       cmd := deps | compile | run | stop | repl | attach | release | tool~n"),
+    io:format("       cmd := deps | compile | run | stop | repl | attach | release | bundle~n"),
     halt().
     halt().
 
 

+ 1 - 1
src/mad_tool.erl → src/mad_bundle.erl

@@ -1,4 +1,4 @@
--module(mad_tool).
+-module(mad_bundle).
 -compile(export_all).
 -compile(export_all).
 
 
 main(App) ->
 main(App) ->

+ 6 - 5
src/mad_plan.erl

@@ -1,11 +1,12 @@
 -module(mad_plan).
 -module(mad_plan).
 -compile(export_all).
 -compile(export_all).
 
 
-applist() ->
-    case file:read_file(".applist") of
-         {ok,Binary} -> parse_applist(binary_to_list(Binary)++"."); 
-         {error,Reason} -> main([ list_to_atom(filename:basename(App))
-                             || App <- filelib:wildcard("{apps,deps}/*")  ] -- ['rebar.config']) end.
+applist() -> [kernel,stdlib,crypto,mnesia,kvs,cowlib,ranch,cowboy,compiler,syntax_tools,erlydtl,gproc,xmerl,n2o,n2o_sample,fs,active,avz,rest].
+
+%    case file:read_file(".applist") of
+%         {ok,Binary} -> parse_applist(binary_to_list(Binary)++"."); 
+%         {error,Reason} -> main([ list_to_atom(filename:basename(App))
+%                             || App <- filelib:wildcard("{apps,deps}/*")  ] -- ['rebar.config']) end.
 
 
 parse_applist(AppList) ->
 parse_applist(AppList) ->
     {ok,Tokens,_EndLine} = erl_scan:string(AppList),
     {ok,Tokens,_EndLine} = erl_scan:string(AppList),

+ 2 - 2
src/mad_repl.erl

@@ -13,7 +13,7 @@ load_config() ->
               application:set_env(App,K,V) end || {K,V} <- Cfg ] end || {App,Cfg} <- Apps]
               application:set_env(App,K,V) end || {K,V} <- Cfg ] end || {App,Cfg} <- Apps]
              end.
              end.
 
 
-load_apps([]) -> [application:start(A)||A<-mad_plan:applist()];
+load_apps([]) -> [application:ensure_started(A)||A<-mad_plan:applist()];
 load_apps(Params) -> [application:ensure_all_started(list_to_atom(A))||A<-Params].
 load_apps(Params) -> [application:ensure_all_started(list_to_atom(A))||A<-Params].
 
 
-main(Params) -> load_config(), load_apps(Params), user_drv:start(), timer:sleep(infinity).
+main(Params) -> shell:start(), load_config(), load_apps(Params), timer:sleep(infinity).

+ 1 - 1
src/mad_utils.erl

@@ -68,7 +68,7 @@ to_atom(X) -> X.
 
 
 atomize("com"++_) -> compile;
 atomize("com"++_) -> compile;
 atomize("rep"++_) -> repl;
 atomize("rep"++_) -> repl;
-atomize("too"++_) -> tool;
+atomize("bun"++_) -> bundle;
 atomize("dep"++_) -> deps;
 atomize("dep"++_) -> deps;
 atomize("pla"++_) -> plan;
 atomize("pla"++_) -> plan;
 atomize(Else) -> Else.
 atomize(Else) -> Else.