Merge branch 'rickard/otp-17-vsn'

* rickard/otp-17-vsn:
  Update versions of OTP, erts, kernel, and stdlib

8 files changed, 43 insertions, 15 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
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index ae2666d496..b946c2d1af 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
   {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
   {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
  %% Down to - max two major revisions back
- [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
   {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
   {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
 }.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 23af0599fc..dd5316b825 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.17
+KERNEL_VSN = 3.0
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 4c828e4434..749a9a4201 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
   {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
   {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
  %% Down to - max two major revisions back
- [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
   {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
   {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
 }.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index c9d596f737..37a6590b06 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.20
+STDLIB_VSN = 2.0
diff --git a/otp_build b/otp_build
index 093fde8034..ca3ffa21a8 100755
--- a/otp_build
+++ b/otp_build
@@ -1308,12 +1308,12 @@ cd $ERL_TOP
 
 determine_version_controller
 
-# Unset ERL_FLAGS and ERL_<Release>_FLAGS during bootstrap to
+# Unset ERL_FLAGS and ERL_OTP<Major-VSN>_FLAGS during bootstrap to
 # prevent potential problems
-sys_vsn=`awk '/SYSTEM_VSN = / {print $3}' < erts/vsn.mk`
-sys_erl_flags="ERL_${sys_vsn}_FLAGS"
+otp_major_vsn=`cat erts/vsn.mk | grep SYSTEM_VSN | sed "s|SYSTEM_VSN[^=]*=[^0-9]*\([0-9]*\).*|\1|"`
+erl_otp_flags="ERL_OTP${otp_major_vsn}_FLAGS"
 unset ERL_FLAGS
-unset ${sys_erl_flags}
+unset ${erl_otp_flags}
 
 # Target first guess, won't necessarily hold, may be changed for 
 # certain parameters.