Browse Source

cleanup release files

Namdak Tonpa 6 years ago
parent
commit
e39af67da5
4 changed files with 9 additions and 5 deletions
  1. 1 1
      include/mad.hrl
  2. BIN
      mad
  3. 0 1
      src/mad_release.erl
  4. 8 3
      src/package/mad_systools.erl

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"5f2112").
+-define(VERSION,"c40ff7").

BIN
mad


+ 0 - 1
src/mad_release.erl

@@ -60,6 +60,5 @@ system_deps(A) ->
 resolve(_) ->
     case orderapps() of
          {ok,Ordered}   -> file:write_file(".applist",io_lib:format("~w",[Ordered])),
-                           mad:info("Generated ~p~n",[Ordered]),
                            {ok,Ordered};
          {error,Reason} -> {error,Reason} end.

+ 8 - 3
src/package/mad_systools.erl

@@ -48,12 +48,17 @@ beam_release(N) ->
     {Release,Apps} = release(N),
     file:write_file(N ++ ".rel",io_lib:format("~p.",[Release])),
     Res = systools:make_script(N),
-%    systools:make_tar(N),
     Files = [ {"/bin/" ++ filename:basename(F), F}
         || F <- mad_repl:wildcards([code:root_dir() ++
             "/erts-" ++ erlang:system_info(version) ++
             "/bin/{epmd,erlexec,run_erl,to_erl,escript,beam.smp,erl_child_setup,inet_gethost}"]) ] ++
         apps(Apps) ++ scripts(N),
     erl_tar:create(N ++ ".tgz",Files,[compressed]),
-    mad:info("~s.boot: ~p~n",[N,Res]),
-    {ok,N}.
+    [ file:delete(X) || X <- [N ++ I || I <- [".boot",".rel",".script"]]],
+    case Res of
+         ok -> {ok,N};
+         {ok,_,_} -> {ok,N};
+         error -> {error,"Systools script failed."};
+         {error,Module,_} ->
+             {error,"Systools script failed. Module "++lists:concat([Module])++"."}
+    end.