From a72376e84b7829736b5674d2434e5224df7183cc Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 11 Jul 2016 14:33:02 +0200
Subject: [reltool] Fix dependency bug for applications not in 'rel' specs

For applications that are not included in a 'rel' spec in the reltool
config, dependencies in the .app file are not followed. This is now
corrected.
---
 lib/reltool/src/reltool_server.erl | 103 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 2 deletions(-)

diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index fac1961c0e..89e90670cf 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -530,9 +530,14 @@ analyse(#state{sys=Sys} = S, Apps, Status) ->
     %% Write all #app to app_tab and all #mod to mod_tab.
     Status2 = apps_init_is_included(S, Apps, RelApps, Status),
 
+    %% For each application that is not (directly or indirectly) part
+    %% of a release, but still has #app.is_included==true, propagate
+    %% is_included to the dependencies specified in the .app files.
+    app_propagate_is_included(S),
+
     %% For each module that has #mod.is_included==true, propagate
     %% is_included to the modules it uses.
-    propagate_is_included(S),
+    mod_propagate_is_included(S),
 
     %% Insert reverse dependencies - i.e. for each
     %% #mod{name=Mod, uses_mods=[UsedMod]},
@@ -747,6 +752,100 @@ false_to_undefined(Bool) ->
         _     -> Bool
     end.
 
+get_no_rel_apps_and_dependencies(S) ->
+    ets:select(S#state.app_tab, [{#app{name='$1',
+				       is_included=true,
+				       info=#app_info{applications='$2',
+						      incl_apps='$3',
+						      _='_'},
+				       rels=[],
+				       _='_'},
+				  [],
+				  [{{'$1','$2','$3'}}]}]).
+
+app_propagate_is_included(S) ->
+    lists:foreach(
+      fun({AppName,DepNames1,DepNames2}) ->
+	      app_mark_is_included(S,AppName,DepNames1++DepNames2)
+      end,
+      get_no_rel_apps_and_dependencies(S)).
+
+app_mark_is_included(#state{app_tab=AppTab, mod_tab=ModTab, sys=Sys}=S,UsedByName,[AppName|AppNames]) ->
+    case ets:lookup(AppTab, AppName) of
+	[A] ->
+	    case A#app.is_included of
+		undefined ->
+		    %% Not yet marked => mark and propagate
+		    A2 =
+			case A#app.incl_cond of
+			    include ->
+				A#app{is_pre_included = true,
+				      is_included = true};
+			    exclude ->
+				A#app{is_pre_included = false,
+				      is_included = false};
+			    AppInclCond when AppInclCond==undefined;
+					     AppInclCond==derived  ->
+				A#app{is_included = true}
+			end,
+		    ets:insert(AppTab, A2),
+
+		    ModCond =
+			case A#app.mod_cond of
+			    undefined -> Sys#sys.mod_cond;
+			    _         -> A#app.mod_cond
+			end,
+		    Filter =
+			fun(M) ->
+				case ModCond of
+				    all     -> true;
+				    app     -> M#mod.is_app_mod;
+				    ebin    -> M#mod.is_ebin_mod;
+				    derived -> false;
+				    none    -> false
+				end
+			end,
+		    Mods = lists:filter(Filter, A#app.mods),
+		    %% Mark the modules of this app, but no need to go
+		    %% recursive on modules since this is done in
+		    %% mod_mark_is_included.
+		    [case M#mod.is_included of
+			 undefined ->
+			     M2 =
+				 case M#mod.incl_cond of
+				     include ->
+					 M#mod{is_pre_included = true,
+					       is_included = true};
+				     exclude ->
+					 M#mod{is_pre_included = false,
+					       is_included = false};
+				     ModInclCond when ModInclCond==undefined;
+						      ModInclCond==derived  ->
+					 M#mod{is_included = true}
+				 end,
+			     ets:insert(ModTab, M2);
+			 _ ->
+			     ok
+		     end || M <- Mods],
+
+		    %% Go recursive on dependencies
+		    #app{info=#app_info{applications=DepNames1,
+					incl_apps=DepNames2}} = A,
+		    app_mark_is_included(S,AppName,DepNames1++DepNames2);
+		_ ->
+		    %% Already marked
+		    ok
+	    end;
+	[] ->
+	    %% Missing app
+	    reltool_utils:throw_error(
+	      "Application ~tp uses non existing application ~w",
+	      [UsedByName,AppName])
+    end,
+    app_mark_is_included(S, UsedByName, AppNames);
+app_mark_is_included(_S, _UsedByName, []) ->
+    ok.
+
 %% Return the list for {ModName, UsesModNames} for all modules where
 %% #mod.is_included==true.
 get_all_mods_and_dependencies(S) ->
@@ -757,7 +856,7 @@ get_all_mods_and_dependencies(S) ->
 				  [],
 				  [{{'$1','$2'}}]}]).
 
-propagate_is_included(S) ->
+mod_propagate_is_included(S) ->
     case lists:flatmap(
 	   fun({ModName,UsesModNames}) ->
 		   mod_mark_is_included(S,ModName,UsesModNames,[])
-- 
cgit v1.2.3