Use git-version-gen and libtool to support base package and API versioning.

Notes: The distribution-specific versioning (debian, fedora, meego) remains
the same ATM.

4 files changed, 193 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 9e1b83f..94f48a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,16 @@
-SUBDIRS = src client examples tests
+EXTRA_DIST = autogen.sh build-aux/git-version-gen
+SUBDIRS    = src client examples tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libresource0.pc libresource0-glib.pc
 
 DISTCLEANFILES = libresource0.pc libresource0-glib.pc *~ 
 
+# see build-aux/git-version-gen
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $@-t && mv $@-t $@
+
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
new file mode 100755
index 0000000..ae3988e
--- /dev/null
+++ b/build-aux/git-version-gen
@@ -0,0 +1,153 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2008-04-08.07
+
+# Copyright (C) 2007-2008 Free Software Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
+# It may be run two ways:
+# - from a git repository in which the "git describe" command below
+#   produces useful output (thus requiring at least one signed tag)
+# - from a non-git-repo directory containing a .tarball-version file, which
+#   presumes this script is invoked like "./git-version-gen .tarball-version".
+
+# In order to use intra-version strings in your project, you will need two
+# separate generated version string files:
+#
+# .tarball-version - present only in a distribution tarball, and not in
+#   a checked-out repository.  Created with contents that were learned at
+#   the last time autoconf was run, and used by git-version-gen.  Must not
+#   be present in either $(srcdir) or $(builddir) for git-version-gen to
+#   give accurate answers during normal development with a checked out tree,
+#   but must be present in a tarball when there is no version control system.
+#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
+#   hooks to force a reconfigure at distribution time to get the value
+#   correct, without penalizing normal development with extra reconfigures.
+#
+# .version - present in a checked-out repository and in a distribution
+#   tarball.  Usable in dependencies, particularly for files that don't
+#   want to depend on config.h but do want to track version changes.
+#   Delete this file prior to any autoconf run where you want to rebuild
+#   files to pick up a version string change; and leave it stale to
+#   minimize rebuild time after unrelated changes to configure sources.
+#
+# It is probably wise to add these two files to .gitignore, so that you
+# don't accidentally commit either generated file.
+#
+# Use the following line in your configure.ac, so that $(VERSION) will
+# automatically be up-to-date each time configure is run (and note that
+# since configure.ac no longer includes a version string, Makefile rules
+# should not depend on configure.ac for version updates).
+#
+# AC_INIT([GNU project],
+#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+#         [bug-project@example])
+#
+# Then use the following lines in your Makefile.am, so that .version
+# will be present for dependencies, and so that .tarball-version will
+# exist in distribution tarballs.
+#
+# BUILT_SOURCES = $(top_srcdir)/.version
+# $(top_srcdir)/.version:
+#	echo $(VERSION) > $@-t && mv $@-t $@
+# dist-hook:
+#	echo $(VERSION) > $(distdir)/.tarball-version
+
+case $# in
+    1) ;;
+    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
+esac
+
+tarball_version_file=$1
+nl='
+'
+
+# First see if there is a tarball-only version file.
+# then try "git describe", then default.
+if test -f $tarball_version_file
+then
+    v=`cat $tarball_version_file` || exit 1
+    case $v in
+	*$nl*) v= ;; # reject multi-line output
+	[0-9]*) ;;
+	*) v= ;;
+    esac
+    test -z "$v" \
+	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+fi
+
+if test -n "$v"
+then
+    : # use $v
+elif test -d .git \
+    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+	  || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && case $v in
+	 v[0-9]*) ;;
+	 *) (exit 1) ;;
+       esac
+then
+    # Is this a new git that lists number of commits since the last
+    # tag or the previous older version that did not?
+    #   Newer: v6.10-77-g0f8faeb
+    #   Older: v6.10-g0f8faeb
+#    case $v in
+#	*-*-*) : git describe is okay three part flavor ;;
+#	*-*)
+#	    : git describe is older two part flavor
+#	    # Recreate the number of commits and rewrite such that the
+#	    # result is the same as if we were using the newer version
+#	    # of git describe.
+#	    vtag=`echo "$v" | sed 's/-.*//'`
+#	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+#	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+#	    ;;
+#    esac
+
+    # Change the first '-' to a '.', so version-comparing tools work properly.
+    # Remove the "g" in git describe's output string, to save a byte.
+#    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    :
+else
+    v=UNKNOWN
+fi
+
+v=`echo "$v" |sed 's/^v//'`
+
+# Don't declare a version "dirty" merely because a time stamp has changed.
+git status > /dev/null 2>&1
+
+dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+case "$dirty" in
+    '') ;;
+    *) # Append the suffix only if there isn't one already.
+	case $v in
+	  *-dirty) ;;
+	  *) v="$v-dirty" ;;
+	esac ;;
+esac
+
+# Omit the trailing newline, so that m4_esyscmd can use the result directly.
+echo "$v" | tr -d '\012'
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/configure.ac b/configure.ac
index 9483498..87f1638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,15 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
 
+AC_INIT([libresource],
+	m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+	[multimedia at ok.research.nokia.com])
 
-m4_define(TDIR, esyscmd(/bin/bash -c pwd | tr \\n /))
-m4_define(PKGNAM, [libresource])
-m4_define(PKGSRC, esyscmd(grep -m 1 -o "PKGNAM (.*)" TDIR/debian/changelog | tr -d \\n))
-m4_define(PKGVER, regexp(PKGSRC, PKGNAM[ ([1234]*:*\([0123456789.]+\).*)], [\1]))
-
-
-AC_INIT(PKGNAM, PKGVER, [multimedia@ok.research.nokia.com])
 AC_CONFIG_SRCDIR([src])
+
 #AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
@@ -19,21 +16,23 @@ AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_GNU_SOURCE
 
-
 AC_HEADER_STDC
 AC_INCLUDES_DEFAULT
 
-# libtool
-LT_CURRENT=0
-LT_REVISION=1
-LT_AGE=0
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
+m4_define(version_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
+m4_define(version_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+m4_define(version_patch, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
 
+AC_SUBST(VERSION)
+AC_SUBST(VERSION_MAJOR, version_major)
+AC_SUBST(VERSION_MINOR, version_minor)
+AC_SUBST(VERSION_PATCH, version_patch)
+AC_SUBST(VERSION_FULL, version_major.version_minor.version_patch)
 
+# libtool API versioning
+AC_PROG_LIBTOOL
+LIBRESOURCE_VERSION_INFO="0:18:0"
+AC_SUBST(LIBRESOURCE_VERSION_INFO)
 
 # check pkgconfig
 AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
@@ -56,19 +55,21 @@ esac],[debug=false])
 AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
 
 
-AC_OUTPUT([
-	libresource0.pc
-	libresource0-glib.pc
-	Makefile
-	src/Makefile
-	client/Makefile
-	examples/Makefile
-	tests/Makefile
+AC_CONFIG_FILES([libresource0.pc
+		libresource0-glib.pc
+		Makefile
+		src/Makefile
+		client/Makefile
+		examples/Makefile
+		tests/Makefile
 ])
 
-echo "
- == $PACKAGE_NAME $VERSION ==
+AC_OUTPUT
 
+echo "
+ == $PACKAGE_NAME ==
+    Version:                $VERSION
+        API:                ${LIBRESOURCE_VERSION_INFO//:/.}
     Compiler:               ${CC}
     CFLAGS:                 ${CFLAGS}
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 86e6d91..93d72cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ libresource_la_CFLAGS = @DBUS_CFLAGS@ -I$(top_srcdir) -fvisibility=hidden
 if DEBUG
 libresource_la_CFLAGS += -D__DEBUG__
 endif
-libresource_la_LDFLAGS = /usr/lib -version-info $(subst .,:,$(VERSION))
+libresource_la_LDFLAGS = /usr/lib -version-info @LIBRESOURCE_VERSION_INFO@
 libresource_la_LIBADD = @DBUS_LIBS@
 
 libresource_glib_la_SOURCES = resource.c resource-glib-glue.c
@@ -17,7 +17,7 @@ libresource_glib_la_CFLAGS = @DBUS_CFLAGS@ -I$(top_srcdir)/src \
 if DEBUG
 libresource_glib_la_CFLAGS += -D__DEBUG__
 endif
-libresource_glib_la_LDFLAGS = /usr/lib -version-info $(subst .,:,$(VERSION))
+libresource_glib_la_LDFLAGS = /usr/lib -version-info @LIBRESOURCE_VERSION_INFO@
 libresource_glib_la_LIBADD = $(top_builddir)/src/libresource.la @DBUS_LIBS@