diff options
| author | Jordan Wilberding <[email protected]> | 2014-02-19 14:08:49 +0100 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2014-02-19 14:08:49 +0100 |
| commit | 7a93d8ff2333984877966a24d033628b147b8686 (patch) | |
| tree | b3a919e6ede513c3f34b4c0bd0d446db3f4f25ed | |
| parent | 031a6d6469c0982685cf63ba9d23c777639465ca (diff) | |
| parent | ba757e5a00b30eb89309e0fdc1cfbd02b1b32324 (diff) | |
| download | relx-7a93d8ff2333984877966a24d033628b147b8686.tar.gz relx-7a93d8ff2333984877966a24d033628b147b8686.tar.bz2 relx-7a93d8ff2333984877966a24d033628b147b8686.zip | |
Merge pull request #126 from kiela/master
Make relx be compatible with Erlang 17.0-rc1
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | rebar.config.script | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9b12a1c..9833c26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: erlang otp_release: + - 17.0-rc1 + - R16B03-1 + - R16B03 - R16B02 - R16B01 - R16B @@ -21,4 +24,4 @@ notifications: channels: - "irc.freenode.org#erlware" use_notice: true - skip_join: true
\ No newline at end of file + skip_join: true diff --git a/rebar.config.script b/rebar.config.script index c19a751..819fc7b 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -1,4 +1,4 @@ -{match, [ErtsNumber]} = re:run(erlang:system_info(otp_release), "R(\\d+).+", [{capture, [1], list}]), +{match, [ErtsNumber]} = re:run(erlang:system_info(otp_release), "(\\d+)", [{capture, [0], list}]), ErtsVsn = erlang:list_to_integer(ErtsNumber), Opts1 = case lists:keysearch(erl_opts, 1, CONFIG) of {value, {erl_opts, Opts0}} -> |