Merge branch 'dev' into major

* dev:
  tar_SUITE: Work around limited pathname length on Windows
  Merge the fourth bootstrap stage into the third bootstrap stage
  Remove unused lib/orber/include/Makefile
  Remove lib/orber/include/* from the primary bootstrap
  otp_build update_primary: Don't commit generated source files
  primary bootstrap: Remove source files

Conflicts:
	Makefile.in
	bootstrap/bin/start.script
	bootstrap/bin/start_clean.script
	bootstrap/lib/compiler/ebin/compiler.app
	bootstrap/lib/compiler/egen/beam_opcodes.erl
	bootstrap/lib/compiler/egen/core_parse.erl
	bootstrap/lib/kernel/ebin/kernel.app
	bootstrap/lib/kernel/ebin/kernel.appup
	bootstrap/lib/orber/include/Makefile
	bootstrap/lib/orber/include/corba.hrl
	bootstrap/lib/orber/include/orber_pi.hrl
	bootstrap/lib/stdlib/ebin/stdlib.app
	bootstrap/lib/stdlib/ebin/stdlib.appup
	bootstrap/lib/stdlib/egen/erl_parse.erl

2 files changed, 0 insertions, 226 deletions

diff --git a/bootstrap/bin/start.script b/bootstrap/bin/start.script
deleted file mode 100644
index 451eb55054..0000000000
--- a/bootstrap/bin/start.script
+++ /dev/null
@@ -1,113 +0,0 @@
-%% script generated at {2011,8,25} {11,38,20}
-{script,
-    {"OTP  APN 181 01","R15A"},
-    [{preLoaded,
-         [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
-          zlib]},
-     {progress,preloaded},
-     {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
-     {primLoad,[error_handler]},
-     {kernel_load_completed},
-     {progress,kernel_load_completed},
-     {path,["$ROOT/lib/kernel/ebin"]},
-     {primLoad,
-         [application,application_controller,application_master,
-          application_starter,auth,code,code_server,disk_log,disk_log_1,
-          disk_log_server,disk_log_sup,dist_ac,dist_util,erl_boot_server,
-          erl_ddll,erl_distribution,erl_epmd,erl_reply,error_logger,
-          erts_debug,file,file_io_server,file_server,gen_sctp,gen_tcp,gen_udp,
-          global,global_group,global_search,group,heart,hipe_unified_loader,
-          inet,inet6_sctp,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,
-          inet_db,inet_dns,inet_gethost_native,inet_hosts,inet_parse,inet_res,
-          inet_sctp,inet_tcp,inet_tcp_dist,inet_udp,kernel,kernel_config,net,
-          net_adm,net_kernel,os,packages,pg2,ram_file,rpc,seq_trace,
-          standard_error,user,user_drv,user_sup,wrap_log_reader]},
-     {path,["$ROOT/lib/stdlib/ebin"]},
-     {primLoad,
-         [array,base64,beam_lib,binary,c,calendar,dets,dets_server,dets_sup,
-          dets_utils,dets_v8,dets_v9,dict,digraph,digraph_utils,edlin,
-          edlin_expand,epp,erl_bits,erl_compile,erl_eval,erl_expand_records,
-          erl_internal,erl_lint,erl_parse,erl_posix_msg,erl_pp,erl_scan,
-          erl_tar,error_logger_file_h,error_logger_tty_h,escript,ets,
-          eval_bits,file_sorter,filelib,filename,gb_sets,gb_trees,gen,
-          gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,io_lib_fread,
-          io_lib_pretty,lib,lists,log_mf_h,math,ms_transform,orddict,ordsets,
-          otp_internal,pg,pool,proc_lib,proplists,qlc,qlc_pt,queue,random,re,
-          regexp,sets,shell,shell_default,slave,sofs,string,supervisor,
-          supervisor_bridge,sys,timer,unicode,win32reg,zip]},
-     {progress,modules_loaded},
-     {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
-     {kernelProcess,heart,{heart,start,[]}},
-     {kernelProcess,error_logger,{error_logger,start_link,[]}},
-     {kernelProcess,application_controller,
-         {application_controller,start,
-             [{application,kernel,
-                  [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.15"},
-                   {id,[]},
-                   {modules,
-                       [application,application_controller,application_master,
-                        application_starter,auth,code,packages,code_server,
-                        dist_util,erl_boot_server,erl_distribution,erl_reply,
-                        error_handler,error_logger,file,file_server,
-                        file_io_server,global,global_group,global_search,
-                        group,heart,hipe_unified_loader,inet6_tcp,
-                        inet6_tcp_dist,inet6_udp,inet6_sctp,inet_config,
-                        inet_hosts,inet_gethost_native,inet_tcp_dist,kernel,
-                        kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,
-                        user,user_drv,user_sup,disk_log,disk_log_1,
-                        disk_log_server,disk_log_sup,dist_ac,erl_ddll,
-                        erl_epmd,erts_debug,gen_tcp,gen_udp,gen_sctp,inet,
-                        inet_db,inet_dns,inet_parse,inet_res,inet_tcp,
-                        inet_udp,inet_sctp,pg2,seq_trace,standard_error,
-                        wrap_log_reader]},
-                   {registered,
-                       [application_controller,erl_reply,auth,boot_server,
-                        code_server,disk_log_server,disk_log_sup,
-                        erl_prim_loader,error_logger,file_server_2,
-                        fixtable_server,global_group,global_name_server,heart,
-                        init,kernel_config,kernel_sup,net_kernel,net_sup,rex,
-                        user,os_server,ddll_server,erl_epmd,inet_db,pg2]},
-                   {applications,[]},
-                   {included_applications,[]},
-                   {env,[{error_logger,tty}]},
-                   {start_phases,undefined},
-                   {maxT,infinity},
-                   {maxP,infinity},
-                   {mod,{kernel,[]}}]}]}},
-     {progress,init_kernel_started},
-     {apply,
-         {application,load,
-             [{application,stdlib,
-                  [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.18"},
-                   {id,[]},
-                   {modules,
-                       [array,base64,beam_lib,binary,c,calendar,dets,
-                        dets_server,dets_sup,dets_utils,dets_v8,dets_v9,dict,
-                        digraph,digraph_utils,edlin,edlin_expand,epp,
-                        eval_bits,erl_bits,erl_compile,erl_eval,
-                        erl_expand_records,erl_internal,erl_lint,erl_parse,
-                        erl_posix_msg,erl_pp,erl_scan,erl_tar,
-                        error_logger_file_h,error_logger_tty_h,escript,ets,
-                        file_sorter,filelib,filename,gb_trees,gb_sets,gen,
-                        gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,
-                        io_lib_fread,io_lib_pretty,lib,lists,log_mf_h,math,
-                        ms_transform,orddict,ordsets,otp_internal,pg,pool,
-                        proc_lib,proplists,qlc,qlc_pt,queue,random,re,regexp,
-                        sets,shell,shell_default,slave,sofs,string,supervisor,
-                        supervisor_bridge,sys,timer,unicode,win32reg,zip]},
-                   {registered,
-                       [timer_server,rsh_starter,take_over_monitor,
-                        pool_master,dets]},
-                   {applications,[kernel]},
-                   {included_applications,[]},
-                   {env,[]},
-                   {start_phases,undefined},
-                   {maxT,infinity},
-                   {maxP,infinity}]}]}},
-     {progress,applications_loaded},
-     {apply,{application,start_boot,[kernel,permanent]}},
-     {apply,{application,start_boot,[stdlib,permanent]}},
-     {apply,{c,erlangrc,[]}},
-     {progress,started}]}.
diff --git a/bootstrap/bin/start_clean.script b/bootstrap/bin/start_clean.script
deleted file mode 100644
index 451eb55054..0000000000
--- a/bootstrap/bin/start_clean.script
+++ /dev/null
@@ -1,113 +0,0 @@
-%% script generated at {2011,8,25} {11,38,20}
-{script,
-    {"OTP  APN 181 01","R15A"},
-    [{preLoaded,
-         [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
-          zlib]},
-     {progress,preloaded},
-     {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
-     {primLoad,[error_handler]},
-     {kernel_load_completed},
-     {progress,kernel_load_completed},
-     {path,["$ROOT/lib/kernel/ebin"]},
-     {primLoad,
-         [application,application_controller,application_master,
-          application_starter,auth,code,code_server,disk_log,disk_log_1,
-          disk_log_server,disk_log_sup,dist_ac,dist_util,erl_boot_server,
-          erl_ddll,erl_distribution,erl_epmd,erl_reply,error_logger,
-          erts_debug,file,file_io_server,file_server,gen_sctp,gen_tcp,gen_udp,
-          global,global_group,global_search,group,heart,hipe_unified_loader,
-          inet,inet6_sctp,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,
-          inet_db,inet_dns,inet_gethost_native,inet_hosts,inet_parse,inet_res,
-          inet_sctp,inet_tcp,inet_tcp_dist,inet_udp,kernel,kernel_config,net,
-          net_adm,net_kernel,os,packages,pg2,ram_file,rpc,seq_trace,
-          standard_error,user,user_drv,user_sup,wrap_log_reader]},
-     {path,["$ROOT/lib/stdlib/ebin"]},
-     {primLoad,
-         [array,base64,beam_lib,binary,c,calendar,dets,dets_server,dets_sup,
-          dets_utils,dets_v8,dets_v9,dict,digraph,digraph_utils,edlin,
-          edlin_expand,epp,erl_bits,erl_compile,erl_eval,erl_expand_records,
-          erl_internal,erl_lint,erl_parse,erl_posix_msg,erl_pp,erl_scan,
-          erl_tar,error_logger_file_h,error_logger_tty_h,escript,ets,
-          eval_bits,file_sorter,filelib,filename,gb_sets,gb_trees,gen,
-          gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,io_lib_fread,
-          io_lib_pretty,lib,lists,log_mf_h,math,ms_transform,orddict,ordsets,
-          otp_internal,pg,pool,proc_lib,proplists,qlc,qlc_pt,queue,random,re,
-          regexp,sets,shell,shell_default,slave,sofs,string,supervisor,
-          supervisor_bridge,sys,timer,unicode,win32reg,zip]},
-     {progress,modules_loaded},
-     {path,["$ROOT/lib/kernel/ebin","$ROOT/lib/stdlib/ebin"]},
-     {kernelProcess,heart,{heart,start,[]}},
-     {kernelProcess,error_logger,{error_logger,start_link,[]}},
-     {kernelProcess,application_controller,
-         {application_controller,start,
-             [{application,kernel,
-                  [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.15"},
-                   {id,[]},
-                   {modules,
-                       [application,application_controller,application_master,
-                        application_starter,auth,code,packages,code_server,
-                        dist_util,erl_boot_server,erl_distribution,erl_reply,
-                        error_handler,error_logger,file,file_server,
-                        file_io_server,global,global_group,global_search,
-                        group,heart,hipe_unified_loader,inet6_tcp,
-                        inet6_tcp_dist,inet6_udp,inet6_sctp,inet_config,
-                        inet_hosts,inet_gethost_native,inet_tcp_dist,kernel,
-                        kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,
-                        user,user_drv,user_sup,disk_log,disk_log_1,
-                        disk_log_server,disk_log_sup,dist_ac,erl_ddll,
-                        erl_epmd,erts_debug,gen_tcp,gen_udp,gen_sctp,inet,
-                        inet_db,inet_dns,inet_parse,inet_res,inet_tcp,
-                        inet_udp,inet_sctp,pg2,seq_trace,standard_error,
-                        wrap_log_reader]},
-                   {registered,
-                       [application_controller,erl_reply,auth,boot_server,
-                        code_server,disk_log_server,disk_log_sup,
-                        erl_prim_loader,error_logger,file_server_2,
-                        fixtable_server,global_group,global_name_server,heart,
-                        init,kernel_config,kernel_sup,net_kernel,net_sup,rex,
-                        user,os_server,ddll_server,erl_epmd,inet_db,pg2]},
-                   {applications,[]},
-                   {included_applications,[]},
-                   {env,[{error_logger,tty}]},
-                   {start_phases,undefined},
-                   {maxT,infinity},
-                   {maxP,infinity},
-                   {mod,{kernel,[]}}]}]}},
-     {progress,init_kernel_started},
-     {apply,
-         {application,load,
-             [{application,stdlib,
-                  [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.18"},
-                   {id,[]},
-                   {modules,
-                       [array,base64,beam_lib,binary,c,calendar,dets,
-                        dets_server,dets_sup,dets_utils,dets_v8,dets_v9,dict,
-                        digraph,digraph_utils,edlin,edlin_expand,epp,
-                        eval_bits,erl_bits,erl_compile,erl_eval,
-                        erl_expand_records,erl_internal,erl_lint,erl_parse,
-                        erl_posix_msg,erl_pp,erl_scan,erl_tar,
-                        error_logger_file_h,error_logger_tty_h,escript,ets,
-                        file_sorter,filelib,filename,gb_trees,gb_sets,gen,
-                        gen_event,gen_fsm,gen_server,io,io_lib,io_lib_format,
-                        io_lib_fread,io_lib_pretty,lib,lists,log_mf_h,math,
-                        ms_transform,orddict,ordsets,otp_internal,pg,pool,
-                        proc_lib,proplists,qlc,qlc_pt,queue,random,re,regexp,
-                        sets,shell,shell_default,slave,sofs,string,supervisor,
-                        supervisor_bridge,sys,timer,unicode,win32reg,zip]},
-                   {registered,
-                       [timer_server,rsh_starter,take_over_monitor,
-                        pool_master,dets]},
-                   {applications,[kernel]},
-                   {included_applications,[]},
-                   {env,[]},
-                   {start_phases,undefined},
-                   {maxT,infinity},
-                   {maxP,infinity}]}]}},
-     {progress,applications_loaded},
-     {apply,{application,start_boot,[kernel,permanent]}},
-     {apply,{application,start_boot,[stdlib,permanent]}},
-     {apply,{c,erlangrc,[]}},
-     {progress,started}]}.