diff options
| author | Rickard Green <[email protected]> | 2013-12-10 09:52:50 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-12-10 12:27:15 +0100 |
| commit | 51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (patch) | |
| tree | 4173e9a8ed6c3e97327c75ec6d432439abf81abd /erts | |
| parent | 6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff) | |
| download | otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.gz otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.bz2 otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.zip | |
Update versions of OTP, erts, kernel, and stdlib
Update versions of OTP, erts, kernel, and stdlib to comply with
the new version scheme decided by the OTP technical board.
Diffstat (limited to 'erts')
| -rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 4 | ||||
| -rw-r--r-- | erts/etc/common/erlexec.c | 30 | ||||
| -rw-r--r-- | erts/vsn.mk | 4 |
3 files changed, 33 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 8fa3aa29eb..2b40f9272d 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -65,8 +65,8 @@ static Export *gather_gc_info_res_trap; #define DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1) /* Keep erts_system_version as a global variable for easy access from a core */ -static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE - " (erts-" ERLANG_VERSION ")" +static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE + " [erts-" ERLANG_VERSION "]" #if !HEAP_ON_C_STACK && !HALFWORD_HEAP " [no-c-stack-objects]" #endif diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 00540662fe..1d7811d570 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -1972,8 +1972,35 @@ get_file_args(char *filename, argv_buf *abp, argv_buf *xabp) } static void +write_erl_otp_flags(char *bufp) +{ + /* ERL_OTP<MAJOR-VSN>_FLAGS */ + int ix = 0; + char *otp_p; + char otp[] = OTP_SYSTEM_VERSION; + + bufp[ix++] = 'E'; + bufp[ix++] = 'R'; + bufp[ix++] = 'L'; + bufp[ix++] = '_'; + bufp[ix++] = 'O'; + bufp[ix++] = 'T'; + bufp[ix++] = 'P'; + for (otp_p = &otp[0]; '0' <= *otp_p && *otp_p <= '9'; otp_p++) + bufp[ix++] = *otp_p; + bufp[ix++] = '_'; + bufp[ix++] = 'F'; + bufp[ix++] = 'L'; + bufp[ix++] = 'A'; + bufp[ix++] = 'G'; + bufp[ix++] = 'S'; + bufp[ix] = '\0'; +} + +static void initial_argv_massage(int *argc, char ***argv) { + char erl_otp_flags_buf[] = "ERL_OTP" OTP_SYSTEM_VERSION "_FLAGS"; argv_buf ab = {0}, xab = {0}; int ix, vix, ac; char **av; @@ -1989,7 +2016,8 @@ initial_argv_massage(int *argc, char ***argv) vix = 0; - av = build_args_from_env("ERL_" OTP_SYSTEM_VERSION "_FLAGS"); + write_erl_otp_flags(erl_otp_flags_buf); + av = build_args_from_env(erl_otp_flags_buf); if (av) avv[vix++].argv = av; diff --git a/erts/vsn.mk b/erts/vsn.mk index 8baf169d6f..30aa870144 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,8 +17,8 @@ # %CopyrightEnd% # -VSN = 5.11 -SYSTEM_VSN = R17A +VSN = 6.0 +SYSTEM_VSN = 17.0-rc0 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |