Skip to content

Commit

Permalink
fix resolving
Browse files Browse the repository at this point in the history
  • Loading branch information
5HT committed Sep 29, 2015
1 parent a000fdf commit 2c14130
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/mad.hrl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-define(VERSION,"bccd2c").
-define(VERSION,"a000fd").
Binary file modified mad
Binary file not shown.
6 changes: 5 additions & 1 deletion src/package/mad_systools.erl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ release(Name) ->
{Ver,Dir} = lists:unzip(R),
NameVer = [ X || X <- lists:zip(L,Ver), element(1,X) /= active,
element(1,X) /= fs ],
{{release,{Name,"1"},{erts,erlang:system_info(version)},NameVer},Sorted}.
Version = case lists:keyfind(list_to_atom(Name),2,Triples) of
{_,_,{Vsn,_}} -> Vsn;
_ -> "1" end,
{{release,{Name,Version},{erts,erlang:system_info(version)},NameVer},Sorted}.

beam_release(N) ->
mad_resolve:main([]),
Expand All @@ -41,6 +44,7 @@ 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) ++
Expand Down
1 change: 0 additions & 1 deletion src/provision/mad_repl.erl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ cwd() -> case file:get_cwd() of {ok, Cwd} -> Cwd; _ -> "." end.

sh(Params) ->
{ _Cwd,_ConfigFileName,_Config } = mad_utils:configs(),
mad_resolve:main([]),
SystemPath = filelib:wildcard(code:root_dir() ++ "/lib/{"
++ string:join([atom_to_list(X)||X<-mad_repl:system()],",") ++ "}-*/ebin"),
UserPath = wildcards(["{apps,deps}/*/ebin","ebin"]),
Expand Down
1 change: 0 additions & 1 deletion src/provision/mad_run.erl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-compile(export_all).

start(App) -> % run_dir > < log_dir
mad_resolve:main([]),
mad:info("Scripting: ~p~n",[escript:script_name()]),
{_,Status,X} = sh:run("run_erl",["-daemon",".",".","exec "++escript:script_name()++" sh"],
binary,".",
Expand Down

0 comments on commit 2c14130

Please sign in to comment.