build: use the same way as libbsd for version and changelog

See:
 http://cgit.freedesktop.org/libbsd/tree/

diff --git a/Makefile.am b/Makefile.am
index 71711f58459bb736787eca0e7313f16e1c5e2284..c7a2721ac8e478c9d9666d3b84d653d505975d46 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,16 +3,14 @@ include doxygen.am
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS      = src/compat src src/daemon src/lib src/client tests
-EXTRA_DIST   = $(DX_CONFIG) include
+EXTRA_DIST   = $(DX_CONFIG) include get-version
 DIST_SUBDIRS = $(SUBDIRS) libevent
+DISTCLEANFILES = ChangeLog
 
-dist_doc_DATA = README.md NEWS ChangeLog VERSION
+dist_doc_DATA = README.md NEWS
 
-dist-hook: $(distdir)/ChangeLog $(distdir)/VERSION
-
-# Build changelog from git history
 __force-changelog-generation:
-$(distdir)/ChangeLog: __force-changelog-generation
+ChangeLog: __force-changelog-generation
        $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \
                prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \
                for tag in $$(git tag | grep -E '^[0-9]+(\.[0-9]+){1,}$$' | sort -rn); do \
@@ -27,18 +25,8 @@ $(distdir)/ChangeLog: __force-changelog-generation
        else \
                touch $@ ; \
        fi
-ChangeLog:
-       touch $@
 
-# Keep current version in a file in case we need to regenerate outside of git
-__force-VERSION-generation:
-$(distdir)/VERSION: __force-VERSION-generation
-       $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \
-               git describe --tags --always --match '[0-9]*' 2> /dev/null > $@ ; \
-       else \
-               touch $@ ; \
-       fi
-VERSION:
-       touch VERSION
+dist-hook:
+       echo $(VERSION) > $(distdir)/.dist-version
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)

diff --git a/configure.ac b/configure.ac
index ea24d2def02092763dcfa065635bb4a061cf453c..2e467afb39323a81437cade913fe65ab1434112d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl Use something like this if you need to patch autoconf files and
 dnl regenerate configure outside upstream git tree:
 dnl AC_INIT([lldpd], [0.5.7], [bernat@luffy.cx])
 AC_INIT([lldpd],
-        [m4_esyscmd_s([git describe --tags --always --match [0-9]* 2> /dev/null || cat VERSION 2> /dev/null || date +%F])],
+        [m4_esyscmd_s([./get-version])],
         [bernat@luffy.cx])
 
 AC_CONFIG_SRCDIR([src/log.c])

diff --git a/get-version b/get-version
new file mode 100755 (executable)
index 0000000..b7019be
--- /dev/null
+++ b/get-version
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# get-version
+#
+# Copyright © 2009 Guillem Jover <guillem@hadrons.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+# THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if [ -f .dist-version ]; then
+  # Get the version from the file distributed in the tarball.
+  version=$(cat .dist-version)
+elif [ -d .git ]; then
+  # Ger the version from the git repository.
+  version=$(git describe --tags --always --match [0-9]* 2> /dev/null)
+
+  # Check if we are on a dirty checkout.
+  git update-index --refresh -q >/dev/null
+  dirty=$(git diff-index --name-only HEAD 2>/dev/null)
+  if [ -n "$dirty" ]; then
+    version="$version-dirty"
+  fi
+else
+  date +%F
+fi
+
+# Use printf to avoid the trailing new line that m4_esyscmd would not handle.
+printf "$version"