From aa8592e919be537231f3b187ae78d4b1f796b983 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 21 Jun 2015 22:59:47 -0500 Subject: no longer run release before tar or relup, the user must call it --- src/rlx_prv_archive.erl | 2 +- src/rlx_prv_release.erl | 2 +- src/rlx_prv_relup.erl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rlx_prv_archive.erl b/src/rlx_prv_archive.erl index 59fbdc2..40b512e 100644 --- a/src/rlx_prv_archive.erl +++ b/src/rlx_prv_archive.erl @@ -31,7 +31,7 @@ -include("relx.hrl"). -define(PROVIDER, tar). --define(DEPS, [release]). +-define(DEPS, [resolve_release]). %%============================================================================ %% API diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl index bd58434..3729c03 100644 --- a/src/rlx_prv_release.erl +++ b/src/rlx_prv_release.erl @@ -29,7 +29,7 @@ -include("relx.hrl"). -define(PROVIDER, resolve_release). --define(DEPS, [app_discover]). +-define(DEPS, [rel_discover]). %%============================================================================ %% API diff --git a/src/rlx_prv_relup.erl b/src/rlx_prv_relup.erl index 6bf5d56..985be90 100644 --- a/src/rlx_prv_relup.erl +++ b/src/rlx_prv_relup.erl @@ -31,7 +31,7 @@ -include("relx.hrl"). -define(PROVIDER, relup). --define(DEPS, [rel_discover, release]). +-define(DEPS, [resolve_release]). %%============================================================================ %% API -- cgit v1.2.3 From f0bff23aa82aca74b50399b31c638779cf6d144a Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 23 Jun 2015 09:58:28 -0500 Subject: major version bump --- src/relx.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/relx.app.src b/src/relx.app.src index ad18a6c..b7afdeb 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,"2.1.1"}, + {vsn,"3.0.0"}, {modules,[]}, {registered,[]}, {applications,[kernel,stdlib,getopt,erlware_commons,bbmustache, -- cgit v1.2.3 From 1aa945c7859d1da91bc32da4675e8093278482d4 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Thu, 25 Jun 2015 20:55:09 -0500 Subject: update for 18 time function changes --- test/rlx_discover_SUITE.erl | 4 ++-- test/rlx_test_utils.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/rlx_discover_SUITE.erl b/test/rlx_discover_SUITE.erl index 4a3b817..2a8933c 100644 --- a/test/rlx_discover_SUITE.erl +++ b/test/rlx_discover_SUITE.erl @@ -223,11 +223,11 @@ get_bad_app_metadata(Name, Vsn) -> create_random_name(Name) -> - random:seed(erlang:now()), + random:seed(os:timestamp()), Name ++ erlang:integer_to_list(random:uniform(1000000)). create_random_vsn() -> - random:seed(erlang:now()), + random:seed(os:timestamp()), lists:flatten([erlang:integer_to_list(random:uniform(100)), ".", erlang:integer_to_list(random:uniform(100)), ".", erlang:integer_to_list(random:uniform(100))]). diff --git a/test/rlx_test_utils.erl b/test/rlx_test_utils.erl index 4e0fc0d..9db2835 100644 --- a/test/rlx_test_utils.erl +++ b/test/rlx_test_utils.erl @@ -45,11 +45,11 @@ get_app_metadata(Name, Vsn, Deps, LibDeps) -> {applications, Deps}]}. create_random_name(Name) -> - random:seed(erlang:now()), + random:seed(os:timestamp()), Name ++ erlang:integer_to_list(random:uniform(1000000)). create_random_vsn() -> - random:seed(erlang:now()), + random:seed(os:timestamp()), lists:flatten([erlang:integer_to_list(random:uniform(100)), ".", erlang:integer_to_list(random:uniform(100)), ".", erlang:integer_to_list(random:uniform(100))]). -- cgit v1.2.3