diff options
| -rw-r--r-- | priv/templates/nodetool | 1 | ||||
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | rebar.lock | 2 | ||||
| -rw-r--r-- | src/relx.app.src | 2 | ||||
| -rw-r--r-- | src/rlx_app_discovery.erl | 5 | ||||
| -rw-r--r-- | src/rlx_config.erl | 7 | ||||
| -rw-r--r-- | src/rlx_prv_release.erl | 5 | ||||
| -rw-r--r-- | src/rlx_topo.erl | 2 | ||||
| -rw-r--r-- | src/rlx_util.erl | 5 |
9 files changed, 9 insertions, 22 deletions
diff --git a/priv/templates/nodetool b/priv/templates/nodetool index dee14b4..0a0e229 100644 --- a/priv/templates/nodetool +++ b/priv/templates/nodetool @@ -1,3 +1,4 @@ +#!/usr/bin/env escript %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ft=erlang ts=4 sw=4 et %% ------------------------------------------------------------------- diff --git a/rebar.config b/rebar.config index fce0a53..751579f 100644 --- a/rebar.config +++ b/rebar.config @@ -1,6 +1,6 @@ %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- %% Dependencies ================================================================ -{deps, [{erlware_commons, "0.15.0"}, +{deps, [{erlware_commons, "0.16.0"}, {providers, "1.4.1"}, {getopt, "0.8.2"}, {bbmustache, "1.0.3"} @@ -1,4 +1,4 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.3">>},0}, - {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}, {<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0}]. 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_app_discovery.erl b/src/rlx_app_discovery.erl index 3d58185..3d3bdb1 100644 --- a/src/rlx_app_discovery.erl +++ b/src/rlx_app_discovery.erl @@ -300,8 +300,3 @@ get_deps(AppDir, AppName, AppVsn, AppDetail) -> %%%=================================================================== %%% Test Functions %%%=================================================================== - --ifndef(NOTEST). --include_lib("eunit/include/eunit.hrl"). - --endif. 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), diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl index bd58434..f83cce3 100644 --- a/src/rlx_prv_release.erl +++ b/src/rlx_prv_release.erl @@ -221,8 +221,3 @@ get_realized_release(State, RelName, RelVsn) -> %%%=================================================================== %%% Test Functions %%%=================================================================== - --ifndef(NOTEST). --include_lib("eunit/include/eunit.hrl"). - --endif. diff --git a/src/rlx_topo.erl b/src/rlx_topo.erl index d24f227..a07a4a7 100644 --- a/src/rlx_topo.erl +++ b/src/rlx_topo.erl @@ -169,7 +169,7 @@ remove_pairs(L1, L2) -> %%==================================================================== %% Tests %%==================================================================== --ifndef(NOTEST). +-ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). topo_1_test() -> diff --git a/src/rlx_util.erl b/src/rlx_util.erl index 2c7c129..9b86ad3 100644 --- a/src/rlx_util.erl +++ b/src/rlx_util.erl @@ -300,8 +300,3 @@ cp_r_win32(Source,Dest) -> %%%=================================================================== %%% Test Functions %%%=================================================================== - --ifndef(NOTEST). --include_lib("eunit/include/eunit.hrl"). - --endif. |