diff options
author | Jordan Wilberding <[email protected]> | 2015-09-19 15:15:23 -0700 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2015-09-19 15:15:23 -0700 |
commit | ef48300151158dff8527092ad5363e7e9aa200c6 (patch) | |
tree | eec0626456c411c44ce1d39cb54539d66a9761c0 /src | |
parent | a7272cffaa933f0676d1ef1422d66bcec783421a (diff) | |
parent | b907b2e9bfecc3cdba5096d0a76c47eecc83dede (diff) | |
download | relx-ef48300151158dff8527092ad5363e7e9aa200c6.tar.gz relx-ef48300151158dff8527092ad5363e7e9aa200c6.tar.bz2 relx-ef48300151158dff8527092ad5363e7e9aa200c6.zip |
Merge pull request #392 from tsloughter/updatesv3.6.0
update erlware_commons, remove unneeded 'v' prefix hack
Diffstat (limited to 'src')
-rw-r--r-- | src/relx.app.src | 2 | ||||
-rw-r--r-- | src/rlx_config.erl | 7 |
2 files changed, 5 insertions, 4 deletions
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), |