From b907b2e9bfecc3cdba5096d0a76c47eecc83dede Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 19 Sep 2015 17:10:00 -0500 Subject: update erlware_commons, remove unneeded 'v' prefix hack and back to 'git' vsn --- src/relx.app.src | 2 +- src/rlx_config.erl | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/relx.app.src b/src/relx.app.src index 639167a..8329eb9 100644 --- a/src/relx.app.src +++ b/src/relx.app.src @@ -1,6 +1,6 @@ {application,relx, [{description,"Release assembler for Erlang/OTP Releases"}, - {vsn,"3.5.0"}, + {vsn,"git"}, {modules,[]}, {registered,[]}, {applications,[kernel,stdlib,getopt,erlware_commons,bbmustache, diff --git a/src/rlx_config.erl b/src/rlx_config.erl index 0ee3543..b2de094 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -295,9 +295,10 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) -> end. parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" -> - parse_vsn({semver, "v"}); -parse_vsn({semver, Prefix}) -> - {ok, V} = ec_git_vsn:vsn({Prefix}), + {ok, V} = ec_git_vsn:vsn([]), + V; +parse_vsn({semver, _}) -> + {ok, V} = ec_git_vsn:vsn([]), V; parse_vsn({cmd, Command}) -> V = os:cmd(Command), -- cgit v1.2.3