diff options
author | Jordan Wilberding <[email protected]> | 2015-04-23 17:04:27 -0700 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2015-04-23 17:04:27 -0700 |
commit | f8af9f5cd9f70ff43a043fe274dda4e56be82a2d (patch) | |
tree | 027dfe513c3a5dd724ec5b07b0180dccd15a758e | |
parent | 3f2462807fe4afb82bc52dd3ff8ff9244aad3bd3 (diff) | |
parent | a36609536aaf7d98b5bd5d3364cab739dc6689b5 (diff) | |
download | relx-f8af9f5cd9f70ff43a043fe274dda4e56be82a2d.tar.gz relx-f8af9f5cd9f70ff43a043fe274dda4e56be82a2d.tar.bz2 relx-f8af9f5cd9f70ff43a043fe274dda4e56be82a2d.zip |
Merge pull request #337 from tsloughter/otp18
update for 18.0
-rw-r--r-- | rebar.config | 2 | ||||
-rw-r--r-- | rebar.lock | 4 | ||||
-rwxr-xr-x | rebar3 | bin | 1297607 -> 1364550 bytes | |||
-rw-r--r-- | src/rlx_app_info.erl | 2 | ||||
-rw-r--r-- | src/rlx_prv_overlay.erl | 4 | ||||
-rw-r--r-- | src/rlx_release.erl | 2 | ||||
-rw-r--r-- | src/rlx_state.erl | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/rebar.config b/rebar.config index 8f27793..74ae226 100644 --- a/rebar.config +++ b/rebar.config @@ -33,7 +33,7 @@ force_recompile, {compiler_options, [report, return, debug_info]}]}. -{provider_hooks, [{post, [{compile, {erlydtl, compile}}]}]}. +{provider_hooks, [{pre, [{compile, {erlydtl, compile}}]}]}. %% Profiles ==================================================================== @@ -12,7 +12,7 @@ 1}, {<<"providers">>, {git,"https://github.com/tsloughter/providers.git", - {ref,"f06c616dd680f787fd344c5e84d1b28b5dc6568c"}}, + {ref,"d565693cbbca3457df34d95c53c47e1faa8cde6c"}}, 0}, {<<"getopt">>, {git,"https://github.com/jcomellas/getopt.git", @@ -20,7 +20,7 @@ 0}, {<<"erlydtl">>, {git,"https://github.com/erlydtl/erlydtl.git", - {ref,"a4ac28680d6e066aabf86b3be9f073352a1a4d40"}}, + {ref,"de00ccf522be8d3f9b0dcb7cd680f83b4fb7267a"}}, 0}, {<<"erlware_commons">>, {git,"https://github.com/erlware/erlware_commons.git", Binary files differdiff --git a/src/rlx_app_info.erl b/src/rlx_app_info.erl index 931c139..618b1e2 100644 --- a/src/rlx_app_info.erl +++ b/src/rlx_app_info.erl @@ -71,7 +71,7 @@ %%============================================================================ %% types %%============================================================================ --opaque t() :: record(app_info_t). +-opaque t() :: #app_info_t{}. %%============================================================================ %% API diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl index 47b0b3c..d9c409c 100644 --- a/src/rlx_prv_overlay.erl +++ b/src/rlx_prv_overlay.erl @@ -349,7 +349,7 @@ do_individual_overlay(State, OverlayVars, {copy, From, To}) -> end); do_individual_overlay(State, OverlayVars, {link, From, To}) -> case rlx_state:dev_mode(State) of - false -> + false -> do_individual_overlay(State, OverlayVars, {copy, From, To}); true -> FromTemplateName = make_template_name("rlx_copy_from_template", From), @@ -530,7 +530,7 @@ file_render_do(OverlayVars, Data, TemplateName, NextAction) -> -spec make_template_name(string(), term()) -> module(). make_template_name(Base, Value) -> %% Seed so we get different values each time - random:seed(erlang:now()), + random:seed(os:timestamp()), Hash = erlang:phash2(Value), Ran = random:uniform(10000000), erlang:list_to_atom(Base ++ "_" ++ diff --git a/src/rlx_release.erl b/src/rlx_release.erl index 1d333bf..a84bad3 100644 --- a/src/rlx_release.erl +++ b/src/rlx_release.erl @@ -87,7 +87,7 @@ {app_type(), incl_apps() | void}). --opaque t() :: record(release_t). +-opaque t() :: #release_t{}. %%============================================================================ %% API diff --git a/src/rlx_state.erl b/src/rlx_state.erl index 3bd818a..01bc07c 100644 --- a/src/rlx_state.erl +++ b/src/rlx_state.erl @@ -127,7 +127,7 @@ -type caller() :: command_line | api. -type action() :: release | relup | tar. --opaque t() :: record(state_t). +-opaque t() :: #state_t{}. %%============================================================================ %% API |