File 0001-fix-build-on-Erlang-R15.patch of Package mad

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-fix-build-on-Erlang-R15.patch of Package mad (Revision c2fcc9b4d0bca6723b1c1e5fb9795644)

Currently displaying revision c2fcc9b4d0bca6723b1c1e5fb9795644 , Show latest

From 7eebfdc4ff4a9736725f0fa18462111e2756f493 Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Sun, 27 Sep 2015 04:16:02 +0300
Subject: [PATCH] fix build on Erlang R15

---
 rebar.config.script        |  5 +++++
 src/launching/mad_repl.erl | 27 ++++++++++++++++++++++++++-
 src/mad.erl                |  8 ++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 rebar.config.script

diff --git a/rebar.config.script b/rebar.config.script
new file mode 100644
index 0000000..8b2ad9c
--- /dev/null
+++ b/rebar.config.script
@@ -0,0 +1,5 @@
+case catch lists:member({get_env, 3}, application:module_info(exports)) of
+    true -> lists:keystore(erl_opts, 1, CONFIG,
+                           {erl_opts, [{d, 'HAVE_application__get_env_3'}, proplists:get_value(erl_opts, CONFIG, [])]});
+    _ -> CONFIG
+end.
diff --git a/src/launching/mad_repl.erl b/src/launching/mad_repl.erl
index e96ed13..eaa1206 100644
--- a/src/launching/mad_repl.erl
+++ b/src/launching/mad_repl.erl
@@ -55,7 +55,32 @@ load_apps([],_,_Acc) ->
        [] -> ok;
        _ -> mad:info("~nApps couldn't be loaded: ~p~n",[Res]) end;
 load_apps(["applist"],Config,Acc) -> load_apps([],Config,Acc);
-load_apps(Params,_,_Acc) -> [ application:ensure_all_started(list_to_atom(A))||A<-Params].
+load_apps(Params,_,_Acc) -> [ensure_all_started(list_to_atom(A))||A<-Params].
+
+-ifndef('HAVE_application__ensure_all_started_1').
+ensure_all_started(Application) ->
+    case ensure_all_started(Application,[]) of
+        {ok,Started} -> {ok,lists:reverse(Started)};
+        {error,Reason,Started} ->
+            lists:foreach(fun application:stop/1,Started),
+            {error,Reason}
+    end.
+
+ensure_all_started(Application,Started) ->
+    case application:start(Application) of
+        ok -> {ok,Application};
+        {error,{already_started,Application}} -> {ok,Started};
+        {error,{not_started,Dependency}} ->
+            case ensure_all_started(Dependency,Started) of
+                {ok,NewStarted} -> ensure_all_started(Application,NewStarted);
+                Error -> Error
+            end;
+        {error,Reason} -> {error,{Application,Reason},Started}
+    end.
+-else.
+ensure_all_started(Application) -> application:ensure_all_started(Application).
+-compile([{inline, ensure_all_started/1}]).
+-endif.
 
 cwd() -> case  file:get_cwd() of {ok, Cwd} -> Cwd; _ -> "." end.
 
diff --git a/src/mad.erl b/src/mad.erl
index 947559a..7572cc4 100644
--- a/src/mad.erl
+++ b/src/mad.erl
@@ -24,7 +24,15 @@ stop(Params)      -> mad_run:stop(Params).
 release(Params)   -> mad_release:release(Params).
 sh(Params)        -> mad_repl:sh(Params).
 up(Params)        -> mad_deps:up(Params).
+-ifndef('HAVE_application__get_env_3').
+profile()         ->
+    case application:get_env(mad,profile) of
+        {ok,V} -> V;
+        undefined -> mad
+    end.
+-else.
 profile()         -> application:get_env(mad,profile,mad).
+-endif.
 
 unknown([])       -> skip;
 unknown(Other)    -> info("Unknown: ~p~n",[Other]), help().
-- 
2.1.4

Places

File 0001-fix-build-on-Erlang-R15.patch of Package mad (Revision c2fcc9b4d0bca6723b1c1e5fb9795644)

Places