Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add {vsn, _} support for reltool.config

  • Loading branch information...
commit f47d61bc13d4b93c2dc234ceebf27d2d3a18507f 1 parent 1de48e4
@asabil asabil authored tuncer committed
Showing with 15 additions and 1 deletion.
  1. +15 −1 src/rebar_rel_utils.erl
View
16 src/rebar_rel_utils.erl
@@ -118,7 +118,7 @@ get_previous_release_path() ->
load_config(ReltoolFile) ->
case file:consult(ReltoolFile) of
{ok, Terms} ->
- Terms;
+ expand_version(Terms, filename:dirname(ReltoolFile));
Other ->
?ABORT("Failed to load expected config from ~s: ~p\n",
[ReltoolFile, Other])
@@ -208,3 +208,17 @@ make_proplist([H|T], Acc) ->
make_proplist(T, [{App,Ver}|Acc]);
make_proplist([], Acc) ->
Acc.
+
+expand_version(ReltoolConfig, Dir) ->
+ case lists:keyfind(sys, 1, ReltoolConfig) of
+ {sys, Sys} ->
+ ExpandedSys = {sys, [expand_rel_version(Term, Dir) || Term <- Sys]},
+ lists:keyreplace(sys, 1, ReltoolConfig, ExpandedSys);
+ _ ->
+ ReltoolConfig
+ end.
+
+expand_rel_version({rel, Name, Version, Apps}, Dir) ->
+ {rel, Name, rebar_utils:vcs_vsn(Version, Dir), Apps};
+expand_rel_version(Other, _Dir) ->
+ Other.
Please sign in to comment.
Something went wrong with that request. Please try again.