Namdak Tonpa 10 years ago
parent
commit
22fefabbcf
7 changed files with 7 additions and 6 deletions
  1. 1 1
      Makefile
  2. 1 1
      include/mad.hrl
  3. BIN
      mad
  4. 1 1
      src/mad_compile.erl
  5. 1 1
      src/mad_deps.erl
  6. 1 1
      src/mad_plan.erl
  7. 2 1
      src/mad_run.erl

+ 1 - 1
Makefile

@@ -1,5 +1,5 @@
 default: escript
 escript:
 	echo "-define(VERSION,\"`git rev-parse HEAD | head -c 6`\")." > include/mad.hrl
-	./mad dep com bun mad
+	./mad cle dep com bun mad
 .PHONY: escript

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"9fc629").
+-define(VERSION,"875ddb").

BIN
mad


+ 1 - 1
src/mad_compile.erl

@@ -65,7 +65,7 @@ dep(Cwd, _Conf, ConfigFile, Name) ->
             DepsRes orelse FilesStatus orelse DTLStatus orelse PortStatus
     end.
 
-compile_files([],Inc,Bin,Opt,Deps) -> false;
+compile_files([],_,_,_,_) -> false;
 compile_files([File|Files],Inc,Bin,Opt,Deps) ->
     case (module(filetype(File))):compile(File,Inc,Bin,Opt,Deps) of
          true -> true;

+ 1 - 1
src/mad_deps.erl

@@ -59,7 +59,7 @@ fetch_dep(Cwd, Config, ConfigFile, Name, Cmd, Uri, Co, Cache) ->
         {_,Rev} -> git_clone(Uri,Fast,TrunkPath,Rev);
         Master  -> git_clone(Uri,Fast,TrunkPath,Master) end,
 
-    io:format("Fetch: ~s~n",[R]),
+    %io:format("Fetch: ~s~n",[R]),
 
     FetchStatus = case filelib:is_dir(TrunkPath) of
                        true -> {skip,0,list_to_binary("Directory "++TrunkPath++" exists.")};

+ 1 - 1
src/mad_plan.erl

@@ -30,7 +30,7 @@ orderapps() ->
 
 system_deps(A) ->
     case file:consult(code:where_is_file(lists:concat([A,".app"]))) of
-         {ok,[{application,Name,Opt}]} -> [ {A,Name} || A <- proplists:get_value(applications,Opt,[]) ];
+         {ok,[{application,Name,Opt}]} -> [ {_A,Name} || _A <- proplists:get_value(applications,Opt,[]) ];
          {error,_} -> [] end.
 
 main(_) ->

+ 2 - 1
src/mad_run.erl

@@ -16,4 +16,5 @@ attach(_) ->
 
 stop(_) -> ok. % TODO: stop box
 
-clean(_) -> [ file:delete(X) || X <- filelib:wildcard("{apps,deps}/*/ebin/**") ], false.
+clean(_) -> [ file:delete(X) || X <- filelib:wildcard("{apps,deps}/*/ebin/**") ++
+                                     filelib:wildcard("ebin/**")], false.