global: Rename version text file

This prevents compilation issues when using C++.

diff --git a/.gitignore b/.gitignore
index f26549426f5b0374274aba448a46e759797bf5b3..637203a1d934271281f330b8b820803d2f1a754d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,7 @@ auth-token-secret.dat
 /dovecot.service
 /README
 /INSTALL
-/version
+/version.txt
 /.cache
 /.dir-locals.el
 /.ropeproject

diff --git a/Makefile.am b/Makefile.am
index f4fff09cca09a96bbee0fbf66791caeef124df08..3f1f510fcc44e2eb23ef1c01fec39e33e55067c4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
        run-test-valgrind.supp \
        dovecot.service.in \
        dovecot.socket \
-       version \
+       version.txt \
        build-aux/git-abi-version-gen \
        build-aux/git-version-gen \
        build-aux/config.rpath \
@@ -32,7 +32,7 @@ nodist_pkginclude_HEADERS = config.h
 
 distuninstallcheck_listfiles = find . -type f \! -name '*.conf' -print
 
-version:
+version.txt:
        $(AM_V_GEN)env VERSION=$(PACKAGE_VERSION) $(top_srcdir)/build-aux/git-version-gen > $@
 
 aclocal_DATA = m4/dovecot.m4

diff --git a/build-aux/git-abi-version-gen b/build-aux/git-abi-version-gen
index 5b30b1d782794f8497585a29b4ab208bf9eec96d..7c1476cb794fdaaf19ca8244bdde629c03d57963 100755 (executable)
--- a/build-aux/git-abi-version-gen
+++ b/build-aux/git-abi-version-gen
@@ -2,7 +2,7 @@
 
 set -eu
 
-# serial 2
+# serial 3
 
 # Converts version to ABI version (discards extra information)
 
@@ -27,8 +27,8 @@ mangle_version()
 
 if test "${VERSION:-}" != ""; then
   :
-elif test -f version; then
-  VERSION="`cat version`"
+elif test -f version.txt; then
+  VERSION="`cat version.txt`"
 elif test -e .git; then
   VERSION="0.0.0"
 else

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index e86abccdd67bea399d9587524ca7dccca17b5ef0..247c14a34833c36b42a31cc40cbd3f552a84ee7f 100755 (executable)
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# serial 2
+# serial 3
 
 if test "${VERSION}" != ""; then
   VN="${VERSION}"
-elif test -s version; then
-  VN=`cat version`
+elif test -s version.txt; then
+  VN=`cat version.txt`
 elif test -e .git; then
  VN="0.0.0-`git rev-list --count HEAD`+`git describe --always`"
  git update-index -q --refresh >/dev/null 2>&1