use package version information from git

diff --git a/Makefile.am b/Makefile.am
index 5723381..9a028f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,12 @@ CLEANFILES += ,* files/*
 
 #### maintainer targets
 
+EXTRA_DIST += VERSION
+
+VERSION: dist
+       test "$(shell cat $(top_srcdir)/VERSION)" = "$(shell git describe)" || \
+       echo "$(shell git describe)" > $(top_srcdir)/VERSION
+
 meta.TODO:
        w3m -no-cookie -dump 'http://www.pipapo.org/pipawiki/RegexPolicyDaemon/ToDo?action=print' |\
        (read; read; cat) > $(top_srcdir)/TODO
@@ -76,7 +82,7 @@ meta.ChangeLog:
        git log --pretty='format:HEADER:%ai %an <%ae>%n%n%s%n' |\
        sed -e 's/\(.*\)/    \1/;s/    HEADER:\([-0-9]*\) [0-9:]* [0-9+]* \(.*\)/\1 \2/' > $(top_srcdir)/ChangeLog
 
-meta: meta.TODO meta.README meta.AUTHORS meta.NEWS meta.ChangeLog
+meta: VERSION meta.TODO meta.README meta.AUTHORS meta.NEWS meta.ChangeLog
 
 release: meta dist
        list='$(DIST_ARCHIVES)'; for i in $$list; do \

diff --git a/configure.ac b/configure.ac
index facb3e2..2918257 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(rxpd, 0.2pre1, 'ct@pipapo.org')
+AC_INIT(rxpd, esyscmd(printf "%s" "$(git describe)"), 'ct@pipapo.org')
 AC_CONFIG_SRCDIR(src/rxpd_base.c)
 AM_INIT_AUTOMAKE
 AC_PREREQ(2.59)

diff --git a/tests/20simplecommands.tests b/tests/20simplecommands.tests
index adb0cd3..9e8347a 100644 (file)
--- a/tests/20simplecommands.tests
+++ b/tests/20simplecommands.tests
@@ -13,11 +13,11 @@ function rxpd_client()
 
 TESTING "basic protcol tests" rxpd_client
 
+version=$(cat $srcdir/../VERSION)
 
-# this test has to be updated with each new version
 TEST "version information" <<END
 in: VERSION:
-out: rxpd 0.2pre1
+out: rxpd $version
 out: #
 out: # Copyright (C)
 out: #   2007,               Christian Thaeter <ct@pipapo.org>
@@ -47,7 +47,7 @@ out: # SYNC atimes from other lists.
 out: # EXPIRE aged rules from a list.
 out: # DUMP rules in a list.
 out: # LIST all existing lists.
-out: # VERSION of this rxpd is 0.2pre1.
+out: # VERSION of this rxpd is $version.
 out: # HELP is what you see right now.
 out: # SHUTDOWN the daemon.
 out: #