Maxim Sokhatsky 10 лет назад
Родитель
Сommit
5a8fc7d377
4 измененных файлов с 8 добавлено и 5 удалено
  1. BIN
      mad
  2. 1 1
      src/mad_compile.erl
  3. 1 1
      src/mad_plan.erl
  4. 6 3
      src/mad_repl.erl

+ 1 - 1
src/mad_compile.erl

@@ -40,7 +40,7 @@ dep(Cwd, _Conf, ConfigFile, Name) ->
 
             %% create EbinDir and add it to code path
             file:make_dir(EbinDir),
-%            code:add_path(EbinDir),
+            code:add_path(EbinDir),
 
             Opts = mad_utils:get_value(erl_opts, Conf1, []),
             lists:foreach(compile_fun(IncDir, EbinDir, Opts), Files),

+ 1 - 1
src/mad_plan.erl

@@ -7,7 +7,7 @@ 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.conifg']) end.
+                || App <- filelib:wildcard("{apps,deps}/*") ] -- ['rebar.config']) end.
 
 parse_applist(AppList) -> 
    Res = string:tokens(string:strip(string:strip(AppList,right,$]),left,$[),","),

+ 6 - 3
src/mad_repl.erl

@@ -14,13 +14,16 @@ load_config() ->
              end.
 
 load_apps([]) -> [ application:start(A) ||A<-mad_plan:applist()];
+load_apps(["applist"]) -> [ application:start(A) ||A<-mad_plan:applist()];
 load_apps(Params) -> [application:ensure_all_started(list_to_atom(A))||A<-Params].
 
 main(Params) -> 
     Path = filelib:wildcard("{apps,deps}/*/ebin") ++ 
            filelib:wildcard(code:root_dir() ++ 
-              "/lib/{compiler,syntax_tools,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib}-*/ebin"),
+              "/lib/{compiler,syntax_tools,sasl,tools,mnesia,reltool,xmerl,crypto,kernel,stdlib}-*/ebin"),
     code:set_path(Path),
     io:format("CodePath: ~p~n",[code:get_path()]),
-    load_config(), load_apps(Params), user_drv:start(), 
-     timer:sleep(infinity).
+    load_config(), load_apps(Params),
+    case Params of
+        ["applist"] -> skip;
+        _ -> user_drv:start(), timer:sleep(infinity) end.