diff options
| author | Alexander Barton <alex@barton.de> | 2010-10-21 00:20:08 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2010-10-24 21:51:38 +0200 |
| commit | 8288878122468e47df8cc77dfafd5c558508bbec (patch) | |
| tree | aa70166aa053ae3e1af09b12aa82e95508923d54 | |
| parent | 596bc096b02ef94efe3d73bb747c6ab0368f63bf (diff) | |
| download | ngircd-8288878122468e47df8cc77dfafd5c558508bbec.tar.gz ngircd-8288878122468e47df8cc77dfafd5c558508bbec.zip | |
Generate ngIRCd version number from GIT tag
Now the ngIRCd release/version number is deduced from the "current" annotated GIT tag; see "git describe --help" for details. This is the same scheme the Linux kernel uses and gives much more details version numbers for interim releases and inofficial source archives generated using "make dist". Please note: the version number is only updated it the autogen.sh script is run; so after pulling in and pushing out new commits, you should run ./autogen.sh!
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh index bd438cd5..c87085ac 100755 --- a/autogen.sh +++ b/autogen.sh @@ -150,20 +150,23 @@ echo "Generating files ..." $ACLOCAL && \ $AUTOHEADER && \ $AUTOMAKE --add-missing && \ - $AUTOCONF + $AUTOCONF --force if [ $? -eq 0 -a -x ./configure ]; then # Success: if we got some parameters we call ./configure and pass # all of them to it. + NAME=`grep PACKAGE_STRING= configure | cut -d"'" -f2` if [ "$GO" = "1" ]; then [ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p="" [ -n "$*" ] && a=" $*" || a="" c="./configure${p}${a}" + echo "Okay, autogen.sh for $NAME done." echo "Calling \"$c\" ..." $c exit $? else - echo "Okay, autogen.sh done; now run the \"configure\" script." + echo "Okay, autogen.sh for $NAME done." + echo "Now run the \"./configure\" script." exit 0 fi else diff --git a/configure.in b/configure.in index 965258aa..1d66a227 100644 --- a/configure.in +++ b/configure.in @@ -9,10 +9,12 @@ # Please read the file COPYING, README and AUTHORS for more information. # +define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n)) + # -- Initialisation -- AC_PREREQ(2.50) -AC_INIT(ngircd, 17~rc1) +AC_INIT(ngircd, VERSION_ID) AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) |