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

1 files changed, 3 insertions, 8 deletions

diff --git a/otp_build b/otp_build
index ed4609435f..aed34b76a8 100755
--- a/otp_build
+++ b/otp_build
@@ -878,8 +878,10 @@ do_primary_git ()
     git add -A bootstrap/lib/kernel \
         bootstrap/lib/stdlib \
 	bootstrap/lib/compiler \
-	bootstrap/lib/orber/include \
 	bootstrap/bin
+    find bootstrap -name egen -o -name '*.script' -o \
+	-name '*.app' -o -name '*.appup' |
+        xargs git reset HEAD
     git commit --no-verify -m 'Update primary bootstrap'
 }
 
@@ -1001,24 +1003,17 @@ do_copy_primary_bootstrap ()
     test -d $bootstrap/lib/kernel/ebin || mkdir -p  $bootstrap/lib/kernel/ebin
     test -d $bootstrap/lib/kernel/include || mkdir -p  $bootstrap/lib/kernel/include
     cp -f $lib_src/kernel/ebin/*.beam $bootstrap/lib/kernel/ebin
-    cp -f $lib_src/kernel/ebin/*.app* $bootstrap/lib/kernel/ebin
     cp -f $lib_src/kernel/include/*.hrl $bootstrap/lib/kernel/include
 
     # stdlib
     test -d $bootstrap/lib/stdlib/ebin || mkdir -p  $bootstrap/lib/stdlib/ebin
     test -d $bootstrap/lib/stdlib/include || mkdir -p  $bootstrap/lib/stdlib/include
     cp -f $lib_src/stdlib/ebin/*.beam $bootstrap/lib/stdlib/ebin
-    cp -f $lib_src/stdlib/ebin/*.app* $bootstrap/lib/stdlib/ebin
     cp -f $lib_src/stdlib/include/*.hrl $bootstrap/lib/stdlib/include
 
     # compiler
     test -d $bootstrap/lib/compiler/ebin || mkdir -p  $bootstrap/lib/compiler/ebin
     cp -f $lib_src/compiler/ebin/*.beam $bootstrap/lib/compiler/ebin
-    cp -f $lib_src/compiler/ebin/*.app* $bootstrap/lib/compiler/ebin
-
-    # orber include
-    test -d $bootstrap/lib/orber/include || mkdir -p  $bootstrap/lib/orber/include
-    cp -f $lib_src/orber/include/* $bootstrap/lib/orber/include
 
     # bootstrap bin
     if [ $bootstrap_src_top != $ERL_TOP ]; then