diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-03-04 04:35:37 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-03-04 04:35:37 -0400 |
| commit | 1a1f11a6833141e67f35dc6131cab2f699aa9500 (patch) | |
| tree | 725e4735da04f819ca09c2b48439b6912e563d91 /tools/pre-commit | |
| parent | 55b2fef58c764bc1755e2465811ade05f0babc9a (diff) | |
| download | fork-ledger-1a1f11a6833141e67f35dc6131cab2f699aa9500.tar.gz fork-ledger-1a1f11a6833141e67f35dc6131cab2f699aa9500.tar.bz2 fork-ledger-1a1f11a6833141e67f35dc6131cab2f699aa9500.zip | |
In the pre-commit hook, run acprep, not myacprep
Diffstat (limited to 'tools/pre-commit')
| -rwxr-xr-x | tools/pre-commit | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tools/pre-commit b/tools/pre-commit index 0b526c0d..57ba0854 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -14,9 +14,10 @@ git checkout-index --prefix=$MIRROR/ -af git diff-index --cached --name-only --diff-filter=D -z HEAD | \ (cd $MIRROR && xargs -0 rm -f --) -# Copy only _changed files_ from MIRROR to TMPDIR, without copying timestamps. -# This includes copying over new files, and deleting removed ones. This way, -# "make check" will only rebuild what is necessary to validate the commit. +# Copy only _changed files_ from MIRROR to TMPDIR, without copying +# timestamps. This includes copying over new files, and deleting +# removed ones. This way, "make check" will only rebuild what is +# necessary to validate the commit. rsync -rlpgoDOc --delete --exclude-from=tools/excludes $MIRROR/ $TMPDIR/ # Everything else happens in the temporary build tree @@ -25,20 +26,17 @@ if [ ! -f $TMPDIR/lib/utfcpp/source/utf8.h ]; then fi cd $TMPDIR -# Make sure there is a current Makefile. Regeneration of Makefile happens -# automatically, but if myacprep or acprep changes, we want to regenerate -# everything manually. If the user doesn't have acprep or myacprep, look for -# other common autoconf-related script files. +# Make sure there is a current Makefile. Regeneration of Makefile +# happens automatically, but if myacprep or acprep changes, we want to +# regenerate everything manually. If the user doesn't have acprep, look +# for other common autoconf-related script files. if [ ! -f Makefile -o \ Makefile.am -nt Makefile -o \ configure.ac -nt Makefile -o \ - \( -f acprep -a acprep -nt Makefile \) -o \ - \( -f tools/myacprep -a tools/myacprep -nt Makefile \) ] + \( -f acprep -a acprep -nt Makefile \) ] then - if [ -f tools/myacprep ]; then - tools/myacprep --local - elif [ -f acprep ]; then - ./acprep --local + if [ -f acprep ]; then + ./acprep --local --warn --pch elif [ -f autogen.sh ]; then sh autogen.sh && ./configure else @@ -46,7 +44,8 @@ then fi fi -# Finally, (re)build this proposed source tree and see if it passes muster. +# Finally, (re)build this proposed source tree and see if it passes +# muster. nice -n 20 make -j3 check exit 0 |