r4006 - in trunk/varnish-cache: include lib/libvarnish

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-30 11:42:44 +0200 (Mon, 30 Mar 2009)
New Revision: 4006

Modified:
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/Makefile.am
   trunk/varnish-cache/lib/libvarnish/version.c
Log:
Include SVN revision in version string


Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2009-03-27 13:11:39 UTC (rev 4005)
+++ trunk/varnish-cache/include/libvarnish.h	2009-03-30 09:42:44 UTC (rev 4006)
@@ -128,3 +128,4 @@
 } while (0)
 
 int inxorcise(int nochdir, int noclose);
+const char* svn_version(void);

Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-03-27 13:11:39 UTC (rev 4005)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am	2009-03-30 09:42:44 UTC (rev 4006)
@@ -16,6 +16,7 @@
 	flopen.c \
 	inxorcise.c \
 	num.c \
+	svn_version.c \
 	time.c \
 	tcp.c \
 	vct.c \
@@ -30,6 +31,13 @@
 
 libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM}
 
+svn_version.c: FORCE
+	echo '#include <libvarnish.h>' > svn_version.c
+	echo 'const char* svn_version(void)' >> svn_version.c
+	echo -n '{ const char* SVN_Version = "' >> svn_version.c
+	svnversion -n $(top_srcdir)          >> svn_version.c
+	echo '"; return SVN_Version; }'      >> svn_version.c
+FORCE:
 
 if ENABLE_TESTS
 TESTS = num_c_test

Modified: trunk/varnish-cache/lib/libvarnish/version.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/version.c	2009-03-27 13:11:39 UTC (rev 4005)
+++ trunk/varnish-cache/lib/libvarnish/version.c	2009-03-30 09:42:44 UTC (rev 4006)
@@ -40,8 +40,8 @@
 void
 varnish_version(const char *progname)
 {
-	fprintf(stderr, "%s (%s-%s)\n", progname,
-	    PACKAGE_TARNAME, PACKAGE_VERSION);
+	fprintf(stderr, "%s (%s-%s SVN %s)\n", progname,
+		PACKAGE_TARNAME, PACKAGE_VERSION, svn_version());
 	fprintf(stderr,
 	    "Copyright (c) 2006-2009 Linpro AS / Verdens Gang AS\n");
 }