github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #139 from rnewson/depmods

Browse source 
Allow specification of module dependencies for appups
This commit is contained in:
Jared Morrow 2014-03-05 13:35:11 -07:00
commit a361719781
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/rebar_appups.erl
View file

@ -50,6 +50,8 @@
PrevRelPath = rebar_rel_utils:get_previous_release_path(Config), PrevRelPath = rebar_rel_utils:get_previous_release_path(Config),
OldVerPath = filename:join([TargetParentDir, PrevRelPath]), OldVerPath = filename:join([TargetParentDir, PrevRelPath]),
ModDeps = rebar_config:get(Config, module_deps, []),
%% Get the new and old release name and versions %% Get the new and old release name and versions
{Name, _Ver} = rebar_rel_utils:get_reltool_release_info(ReltoolConfig), {Name, _Ver} = rebar_rel_utils:get_reltool_release_info(ReltoolConfig),
NewVerPath = filename:join([TargetParentDir, Name]), NewVerPath = filename:join([TargetParentDir, Name]),
@ -77,7 +79,7 @@
UpgradeApps = genappup_which_apps(Upgraded, AppUpApps), UpgradeApps = genappup_which_apps(Upgraded, AppUpApps),
%% Generate appup files for upgraded apps %% Generate appup files for upgraded apps
generate_appup_files(NewVerPath, OldVerPath, UpgradeApps), generate_appup_files(NewVerPath, OldVerPath, ModDeps, UpgradeApps),
{ok, Config1}. {ok, Config1}.
@ -139,9 +141,9 @@ genappup_which_apps(UpgradedApps, [First|Rest]) ->
genappup_which_apps(Apps, []) -> genappup_which_apps(Apps, []) ->
Apps. Apps.
generate_appup_files(NewVerPath, OldVerPath, [{_App, {undefined, _}}|Rest]) -> generate_appup_files(NewVerPath, OldVerPath, ModDeps, [{_App, {undefined, _}}|Rest]) ->
generate_appup_files(NewVerPath, OldVerPath, Rest); generate_appup_files(NewVerPath, OldVerPath, ModDeps, Rest);
generate_appup_files(NewVerPath, OldVerPath, [{App, {OldVer, NewVer}}|Rest]) -> generate_appup_files(NewVerPath, OldVerPath, ModDeps, [{App, {OldVer, NewVer}}|Rest]) ->
OldEbinDir = filename:join([OldVerPath, "lib", OldEbinDir = filename:join([OldVerPath, "lib",
atom_to_list(App) ++ "-" ++ OldVer, "ebin"]), atom_to_list(App) ++ "-" ++ OldVer, "ebin"]),
NewEbinDir = filename:join([NewVerPath, "lib", NewEbinDir = filename:join([NewVerPath, "lib",
@ -150,9 +152,14 @@ generate_appup_files(NewVerPath, OldVerPath, [{App, {OldVer, NewVer}}|Rest]) ->
{AddedFiles, DeletedFiles, ChangedFiles} = beam_lib:cmp_dirs(NewEbinDir, {AddedFiles, DeletedFiles, ChangedFiles} = beam_lib:cmp_dirs(NewEbinDir,
OldEbinDir), OldEbinDir),
ChangedNames = [list_to_atom(file_to_name(F)) || {F, _} <- ChangedFiles],
ModDeps1 = [{N, [M1 || M1 <- M, lists:member(M1, ChangedNames)]}
|| {N, M} <- ModDeps],
Added = [generate_instruction(added, File) || File <- AddedFiles], Added = [generate_instruction(added, File) || File <- AddedFiles],
Deleted = [generate_instruction(deleted, File) || File <- DeletedFiles], Deleted = [generate_instruction(deleted, File) || File <- DeletedFiles],
Changed = [generate_instruction(changed, File) || File <- ChangedFiles], Changed = [generate_instruction(changed, ModDeps1, File)
|| File <- ChangedFiles],
Inst = lists:append([Added, Deleted, Changed]), Inst = lists:append([Added, Deleted, Changed]),
@ -164,8 +171,8 @@ generate_appup_files(NewVerPath, OldVerPath, [{App, {OldVer, NewVer}}|Rest]) ->
OldVer, Inst, OldVer])), OldVer, Inst, OldVer])),
?CONSOLE("Generated appup for ~p~n", [App]), ?CONSOLE("Generated appup for ~p~n", [App]),
generate_appup_files(NewVerPath, OldVerPath, Rest); generate_appup_files(NewVerPath, OldVerPath, ModDeps, Rest);
generate_appup_files(_, _, []) -> generate_appup_files(_, _, _, []) ->
?CONSOLE("Appup generation complete~n", []). ?CONSOLE("Appup generation complete~n", []).
generate_instruction(added, File) -> generate_instruction(added, File) ->
@ -173,25 +180,27 @@ generate_instruction(added, File) ->
{add_module, Name}; {add_module, Name};
generate_instruction(deleted, File) -> generate_instruction(deleted, File) ->
Name = list_to_atom(file_to_name(File)), Name = list_to_atom(file_to_name(File)),
{delete_module, Name}; {delete_module, Name}.
generate_instruction(changed, {File, _}) ->
generate_instruction(changed, ModDeps, {File, _}) ->
{ok, {Name, List}} = beam_lib:chunks(File, [attributes, exports]), {ok, {Name, List}} = beam_lib:chunks(File, [attributes, exports]),
Behavior = get_behavior(List), Behavior = get_behavior(List),
CodeChange = is_code_change(List), CodeChange = is_code_change(List),
generate_instruction_advanced(Name, Behavior, CodeChange). Deps = proplists:get_value(Name, ModDeps, []),
generate_instruction_advanced(Name, Behavior, CodeChange, Deps).
generate_instruction_advanced(Name, undefined, undefined) -> generate_instruction_advanced(Name, undefined, undefined, Deps) ->
%% Not a behavior or code change, assume purely functional %% Not a behavior or code change, assume purely functional
{load_module, Name}; {load_module, Name, Deps};
generate_instruction_advanced(Name, [supervisor], _) -> generate_instruction_advanced(Name, [supervisor], _, _) ->
%% Supervisor %% Supervisor
{update, Name, supervisor}; {update, Name, supervisor};
generate_instruction_advanced(Name, _, code_change) -> generate_instruction_advanced(Name, _, code_change, Deps) ->
%% Includes code_change export %% Includes code_change export
{update, Name, {advanced, []}}; {update, Name, {advanced, []}, Deps};
generate_instruction_advanced(Name, _, _) -> generate_instruction_advanced(Name, _, _, Deps) ->
%% Anything else %% Anything else
{load_module, Name}. {load_module, Name, Deps}.
get_behavior(List) -> get_behavior(List) ->
Attributes = proplists:get_value(attributes, List), Attributes = proplists:get_value(attributes, List),