diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-14 10:19:38 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-14 17:06:15 +0200 |
| commit | 1c3815a194ce95f2d1fdabf58cbc7718a7d0a191 (patch) | |
| tree | 10d6f03a8cf22f585d5106c87454cd5d1823cc89 | |
| parent | b66b7c6d46699ca3837e40f999bb058674868902 (diff) | |
| download | otp-1c3815a194ce95f2d1fdabf58cbc7718a7d0a191.tar.gz otp-1c3815a194ce95f2d1fdabf58cbc7718a7d0a191.tar.bz2 otp-1c3815a194ce95f2d1fdabf58cbc7718a7d0a191.zip | |
otp_build update_primary: Don't commit generated source files
Don't commit generated source files to the primary bootstrap.
| -rw-r--r-- | .gitignore | 7 | ||||
| -rwxr-xr-x | otp_build | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 592ac6668b..88f153ee48 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,12 @@ autom4te.cache !/erts/preloaded/ebin/*.beam !/lib/*/test/*_SUITE_data/*.beam +# +# Generated source code files. +# +/bootstrap/lib/compiler/egen +/bootstrap/lib/stdlib/egen + # Compiler derivatives # # Do not use too creative wildcards. @@ -98,7 +104,6 @@ make/win32/ /bootstrap/bin/* /bootstrap/target -!/bootstrap/bin/*.script !/bootstrap/bin/*.boot /bootstrap/lib/asn1 @@ -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 |