From 1c3815a194ce95f2d1fdabf58cbc7718a7d0a191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 14 Sep 2011 10:19:38 +0200 Subject: otp_build update_primary: Don't commit generated source files Don't commit generated source files to the primary bootstrap. --- otp_build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'otp_build') diff --git a/otp_build b/otp_build index ed4609435f..cb9bc0822f 100755 --- a/otp_build +++ b/otp_build @@ -880,6 +880,9 @@ do_primary_git () 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,20 +1004,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 -- cgit v1.2.3