dovecot-2.2-pigeonhole: Implmented reporting full Pigeonhole ver...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Wed Oct 29 02:05:54 UTC 2014
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/a1e57385b267
changeset: 1945:a1e57385b267
user: Stephan Bosch <stephan at rename-it.nl>
date: Wed Oct 29 03:05:43 2014 +0100
description:
Implmented reporting full Pigeonhole version with hg tag so that builds between releases can be distinguished.
Copied from Dovecot for the most part.
diffstat:
Makefile.am | 11 ++++++++++-
src/lib-sieve/sieve-config.h | 3 ++-
src/lib-sieve/sieve.c | 2 +-
src/lib-sieve/storage/ldap/sieve-ldap-storage.c | 2 +-
src/plugins/sieve-extprograms/sieve-extprograms-plugin.c | 2 +-
5 files changed, 15 insertions(+), 5 deletions(-)
diffs (84 lines):
diff -r 6afd6d927f40 -r a1e57385b267 Makefile.am
--- a/Makefile.am Tue Oct 28 22:34:48 2014 +0100
+++ b/Makefile.am Wed Oct 29 03:05:43 2014 +0100
@@ -4,13 +4,17 @@
SUBDIRS = src $(DOCS)
+dist_pkginclude_HEADERS = \
+ pigeonhole-version.h
+
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
tests \
examples \
COPYING.LGPL \
- ChangeLog
+ ChangeLog \
+ update-version.sh
dist-hook:
rm -rf `find $(distdir)/tests -type f -name '*.svbin'`
@@ -23,6 +27,11 @@
hg log --style=changelog > ChangeLog
endif
+pigeonhole-version.h: noop
+ $(SHELL) $(top_srcdir)/update-version.sh $(top_srcdir) $(top_builddir)
+
+noop:
+
# Testsuite tests (FIXME: ugly)
TESTSUITE_BIN = $(top_builddir)/src/testsuite/testsuite $(TESTSUITE_OPTIONS)
diff -r 6afd6d927f40 -r a1e57385b267 src/lib-sieve/sieve-config.h
--- a/src/lib-sieve/sieve-config.h Tue Oct 28 22:34:48 2014 +0100
+++ b/src/lib-sieve/sieve-config.h Wed Oct 29 03:05:43 2014 +0100
@@ -5,8 +5,9 @@
#define __SIEVE_CONFIG_H
#include "pigeonhole-config.h"
+#include "pigeonhole-version.h"
-#define SIEVE_IMPLEMENTATION PIGEONHOLE_NAME " Sieve " PIGEONHOLE_VERSION
+#define SIEVE_IMPLEMENTATION PIGEONHOLE_NAME " Sieve " PIGEONHOLE_VERSION_FULL
#define SIEVE_SCRIPT_FILEEXT "sieve"
#define SIEVE_BINARY_FILEEXT "svbin"
diff -r 6afd6d927f40 -r a1e57385b267 src/lib-sieve/sieve.c
--- a/src/lib-sieve/sieve.c Tue Oct 28 22:34:48 2014 +0100
+++ b/src/lib-sieve/sieve.c Wed Oct 29 03:05:43 2014 +0100
@@ -92,7 +92,7 @@
if ( debug ) {
sieve_sys_debug(svinst, "%s version %s initializing",
- PIGEONHOLE_NAME, PIGEONHOLE_VERSION);
+ PIGEONHOLE_NAME, PIGEONHOLE_VERSION_FULL);
}
/* Read configuration */
diff -r 6afd6d927f40 -r a1e57385b267 src/lib-sieve/storage/ldap/sieve-ldap-storage.c
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c Tue Oct 28 22:34:48 2014 +0100
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c Wed Oct 29 03:05:43 2014 +0100
@@ -196,7 +196,7 @@
if ( svinst->debug ) {
sieve_sys_debug(svinst,
"Sieve LDAP storage plugin for %s version %s loaded",
- PIGEONHOLE_NAME, PIGEONHOLE_VERSION);
+ PIGEONHOLE_NAME, PIGEONHOLE_VERSION_FULL);
}
}
diff -r 6afd6d927f40 -r a1e57385b267 src/plugins/sieve-extprograms/sieve-extprograms-plugin.c
--- a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c Tue Oct 28 22:34:48 2014 +0100
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c Wed Oct 29 03:05:43 2014 +0100
@@ -32,7 +32,7 @@
if ( svinst->debug ) {
sieve_sys_debug(svinst, "Sieve Extprograms plugin for %s version %s loaded",
- PIGEONHOLE_NAME, PIGEONHOLE_VERSION);
+ PIGEONHOLE_NAME, PIGEONHOLE_VERSION_FULL);
}
*context = (void *)pctx;
More information about the dovecot-cvs
mailing list