aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2015-06-25 21:38:41 -0700
committerJordan Wilberding <[email protected]>2015-06-25 21:38:41 -0700
commit0e1880fd3b677af039a3bca73f1695d8b55cae29 (patch)
tree5e2df96d35f33bc9784a0ca56801c8dc1d30d1a3
parentde9a40aa699d26e1651e11c6776f2f6b1c9c1c1f (diff)
parent1aa945c7859d1da91bc32da4675e8093278482d4 (diff)
downloadrelx-0e1880fd3b677af039a3bca73f1695d8b55cae29.tar.gz
relx-0e1880fd3b677af039a3bca73f1695d8b55cae29.tar.bz2
relx-0e1880fd3b677af039a3bca73f1695d8b55cae29.zip
Merge pull request #353 from tsloughter/unchainv3.0.0
no longer run release before tar or relup, the user must call it
-rw-r--r--src/relx.app.src2
-rw-r--r--src/rlx_prv_archive.erl2
-rw-r--r--src/rlx_prv_release.erl2
-rw-r--r--src/rlx_prv_relup.erl2
-rw-r--r--test/rlx_discover_SUITE.erl4
-rw-r--r--test/rlx_test_utils.erl4
6 files changed, 8 insertions, 8 deletions
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,
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
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))]).