diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-05 16:15:09 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-05 16:15:09 -0400 |
| commit | 290cac7b84b60305e185c140645c9bac2ca9fb0e (patch) | |
| tree | c389da2eed81612ffb3868f61c31fa2534855fe1 /tools | |
| parent | f8bfbf8c250fa24bc9e26b9bf1eb64815a5a29ee (diff) | |
| parent | 1417b40fdf0a92a85ab01f233c0ae076079901a2 (diff) | |
| download | fork-ledger-290cac7b84b60305e185c140645c9bac2ca9fb0e.tar.gz fork-ledger-290cac7b84b60305e185c140645c9bac2ca9fb0e.tar.bz2 fork-ledger-290cac7b84b60305e185c140645c9bac2ca9fb0e.zip | |
Merge branch 'next'
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/pre-commit | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/pre-commit b/tools/pre-commit index c049b8f0..50a32dbd 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -5,7 +5,7 @@ set -e # Exit if it's not a branch we're interested in being thorough about if echo $(git rev-parse --symbolic-full-name HEAD) | \ - egrep -q '^refs/heads/(next|t/)'; then + egrep -q '^refs/heads/(t/)'; then exit 0 fi @@ -41,12 +41,12 @@ cd $TMPDIR if [ ! -f Makefile -o \ Makefile.in -nt Makefile -o \ configure -nt Makefile -o \ - Makefile.am -nt Makefile.in -o \ - configure.ac -nt configure -o \ + tools/Makefile.am -nt Makefile.in -o \ + tools/configure.ac -nt configure -o \ \( -f acprep -a acprep -nt Makefile \) ] then if [ -f acprep ]; then - ./acprep default --local + echo Will run acprep in a moment elif [ -f autogen.sh ]; then sh autogen.sh && ./configure else @@ -56,6 +56,10 @@ fi # Finally, (re)build this proposed source tree and see if it passes # muster. -nice -n 20 make check +if [ -f acprep ]; then + nice -n 20 ./acprep default --warn make check +else + nice -n 20 make check +fi exit 0 |