aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
Diffstat (limited to 'otp_build')
-rwxr-xr-xotp_build11
1 files changed, 3 insertions, 8 deletions
diff --git a/otp_build b/otp_build
index de27fbc288..44bbab22b5 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