Commit 05bc4e6f authored by olgeni's avatar olgeni
Browse files

Update devel/relx to version 3.23.0.

parent 251c1eb3
# $FreeBSD$
PORTNAME= relx
PORTVERSION= 3.22.2
PORTREVISION= 1
PORTVERSION= 3.23.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
MASTER_SITES+= LOCAL/olgeni:deps \
http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
https://s3.amazonaws.com/s3.hex.pm/tarballs/:hex
DISTFILES= relx-cache-13${EXTRACT_SUFX}:deps
DISTFILES= relx-cache-14${EXTRACT_SUFX}:deps
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
relx-cache-13${EXTRACT_SUFX}
relx-cache-14${EXTRACT_SUFX}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Sane, simple release creation for Erlang
......@@ -30,7 +29,7 @@ GH_ACCOUNT= erlware
REBAR_DEPS= bbmustache-1.0.4 \
cf-0.2.2 \
erlware_commons-0.22.0 \
erlware_commons-1.0.0 \
getopt-0.8.2 \
providers-1.6.0
......
TIMESTAMP = 1483547960
SHA256 (relx-cache-13.tar.gz) = 82e76bd84fee5f53902185bc5f32ceaad0dec7f95fe59450a428602250d178a3
SIZE (relx-cache-13.tar.gz) = 1381975
TIMESTAMP = 1495717817
SHA256 (relx-cache-14.tar.gz) = e276a312204b0667b44b5ac939a5f92e2aab7d30888a3ab24e0491195ea901e3
SIZE (relx-cache-14.tar.gz) = 1904129
SHA256 (bbmustache-1.0.4.tar) = 03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12
SIZE (bbmustache-1.0.4.tar) = 20480
SHA256 (cf-0.2.2.tar) = 48283b3019bc7fad56e7b23028a5da4d3e6cd598a553ab2a99a2153bf5f19b21
SIZE (cf-0.2.2.tar) = 10240
SHA256 (erlware_commons-0.22.0.tar) = 4ee0dc3dfda1d3cbe368f61b9d4bad8bc2d710f6acdb87168c7c1eba1e1c688a
SIZE (erlware_commons-0.22.0.tar) = 61440
SHA256 (erlware_commons-1.0.0.tar) = a77f1beb3e4a0501c7b8bf3db646f88a718c0ad822f96679eb348529f3827772
SIZE (erlware_commons-1.0.0.tar) = 61440
SHA256 (getopt-0.8.2.tar) = 736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7
SIZE (getopt-0.8.2.tar) = 20480
SHA256 (providers-1.6.0.tar) = 0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f
SIZE (providers-1.6.0.tar) = 20480
SHA256 (erlware-relx-v3.22.2_GH0.tar.gz) = 497c5ebf17f3463a27aa77cdcaab55a066ea72c4a9e95e4fbd899c9f4c2ab27f
SIZE (erlware-relx-v3.22.2_GH0.tar.gz) = 111687
SHA256 (erlware-relx-v3.23.0_GH0.tar.gz) = 605c39be8ddf3276466770171b6835800657fd1e8e9ad28022a63f1abd09e881
SIZE (erlware-relx-v3.23.0_GH0.tar.gz) = 114342
--- src/rlx_prv_assembler.erl.orig 2016-12-27 16:21:42 UTC
+++ src/rlx_prv_assembler.erl
@@ -121,7 +121,10 @@ format_error({start_clean_script_generat
rlx_util:indent(2), Module:format_error(Errors)];
format_error({strip_release, Reason}) ->
io_lib:format("Stripping debug info from release beam files failed becuase ~s",
- [beam_lib:format_error(Reason)]).
+ [beam_lib:format_error(Reason)]);
+format_error({rewrite_app_file, AppFile, Error}) ->
+ io_lib:format("Unable to rewrite .app file ~s due to ~p",
+ [AppFile, Error]).
%%%===================================================================
%%% Internal Functions
@@ -255,13 +258,16 @@ rewrite_app_file(State, App, TargetDir)
,AppData2
,{modules, OldModules -- ExcludedModules})
end,
- Spec = io_lib:format("~p.\n", [{application, AppName, AppData3}]),
- write_file_if_contents_differ(AppFile, Spec).
+ Spec = [{application, AppName, AppData3}],
+ case write_file_if_contents_differ(AppFile, Spec) of
+ ok -> ok;
+ Error -> ?RLX_ERROR({rewrite_app_file, AppFile, Error})
+ end.
-write_file_if_contents_differ(Filename, Bytes) ->
- ToWrite = iolist_to_binary(Bytes),
- case file:read_file(Filename) of
- {ok, ToWrite} ->
+write_file_if_contents_differ(Filename, Spec) ->
+ ToWrite = io_lib:format("~p.\n", Spec),
+ case file:consult(Filename) of
+ {ok, Spec} ->
ok;
{ok, _} ->
file:write_file(Filename, ToWrite);
......@@ -26,6 +26,7 @@ lib/erlang/lib/relx-%%VERSION%%/include/relx.hrl
lib/erlang/lib/relx-%%VERSION%%/priv/templates/bin
lib/erlang/lib/relx-%%VERSION%%/priv/templates/bin_windows
lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_pid
lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_status
lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_wait_for_process
lib/erlang/lib/relx-%%VERSION%%/priv/templates/builtin_hook_wait_for_vm_start
lib/erlang/lib/relx-%%VERSION%%/priv/templates/erl_ini
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment