Browse Source

mad include

Namdak Tonpa 8 years ago
parent
commit
a35d0ec730
4 changed files with 12 additions and 4 deletions
  1. 1 1
      include/mad.hrl
  2. BIN
      mad
  3. 1 0
      src/mad_release.erl
  4. 10 3
      src/provision/mad_repl.erl

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"41140c").
+-define(VERSION,"2382a0").

BIN
mad


+ 1 - 0
src/mad_release.erl

@@ -9,4 +9,5 @@ release(["script"])      -> release(["script","sample"]);
 release(["ling",N])      -> mad_ling:ling(N);
 release(["ling",N])      -> mad_ling:ling(N);
 release(["script",N])    -> mad_escript:main(N);
 release(["script",N])    -> mad_escript:main(N);
 release(["beam",N])      -> mad_systools:beam_release(N);
 release(["beam",N])      -> mad_systools:beam_release(N);
+release(["depot",N])     -> mad_synrc:depot_release(N);
 release([X])             -> release(["script",X]).
 release([X])             -> release(["script",X]).

+ 10 - 3
src/provision/mad_repl.erl

@@ -4,7 +4,7 @@
 
 
 disabled() -> [].
 disabled() -> [].
 system() -> [compiler,syntax_tools,sasl,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib,ssh,eldap,
 system() -> [compiler,syntax_tools,sasl,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib,ssh,eldap,
-             wx,webtool,ssl,runtime_tools,public_key,observer,inets,asn1,et,eunit,hipe,os_mon,parsetools,odbc].
+             wx,ssl,runtime_tools,public_key,observer,inets,asn1,et,eunit,hipe,os_mon,parsetools,odbc].
 
 
 local_app() ->
 local_app() ->
     case filename:basename(filelib:wildcard("ebin/*.app"),".app") of
     case filename:basename(filelib:wildcard("ebin/*.app"),".app") of
@@ -14,7 +14,7 @@ local_app() ->
 applist() ->
 applist() ->
     Name = ".applist",
     Name = ".applist",
     case file:read_file(Name) of
     case file:read_file(Name) of
-         {ok,Binary} -> parse_applist(Binary); 
+         {ok,Binary} -> parse_applist(Binary);
          {error,_} ->
          {error,_} ->
            case mad_repl:load_file(Name) of
            case mad_repl:load_file(Name) of
               {error,_} -> mad_resolve:main([]);
               {error,_} -> mad_resolve:main([]);
@@ -37,7 +37,14 @@ load_config() ->
               {ok,[A]} -> A end end.
               {ok,[A]} -> A end end.
 
 
 load_config(AppConfigs,[]) ->
 load_config(AppConfigs,[]) ->
-    [ [application:set_env(App,K,V) || {K,V} <- Cfg] || {App,Cfg} <- AppConfigs].
+    [ [application:set_env(App,K,V) || {K,V} <- Cfg] || {App,Cfg} <- AppConfigs],
+    load_includes(AppConfigs).
+
+load_includes(AppConfigs) ->
+    [ begin Apps = case file:consult(File) of
+                        {error,_} -> [];
+                        {ok,[A]} -> A end,
+             load_config(Apps, []) end || File <- AppConfigs, is_list(File) ].
 
 
 acc_start(A,Acc) ->
 acc_start(A,Acc) ->
    case application:start(A) of
    case application:start(A) of