GNOME.org
 

[gnome-media] build: use git-version-gen from autoconf.git

commit 5b0d421f148216a3dd4403ec2c0ce4a5d2a78445
Author: Marc-André Lureau <marc-andre lureau nokia com>
Date:   Thu Apr 23 18:28:59 2009 +0300

    build: use git-version-gen from autoconf.git
    
    Also move aux scripts to build-aux directory.
---
 Makefile.am                           |   13 +++-
 build-aux/git-version-gen             |  152 +++++++++++++++++++++++++++++++++
 configure.ac                          |    4 +-
 gnome-cd/doc/Makefile.am              |    2 +-
 grecord/doc/Makefile.am               |    2 +-
 gst-mixer/doc/Makefile.am             |    2 +-
 gstreamer-properties/help/Makefile.am |    2 +-
 7 files changed, 170 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e8d3085..705c482 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,7 @@ DIST_SUBDIRS = \
 	$(NULL)
 
 EXTRA_DIST = \
+	.version		\
 	autogen.sh		\
 	configure		\
 	COPYING			\
@@ -75,22 +76,30 @@ EXTRA_DIST = \
 	COPYING.profiles	\
 	COPYING.vu-meter	\
 	MAINTAINERS		\
+        build-aux/git-version-gen \
+	build-aux/gnome-doc-utils.make	\
 	m4/as-compiler-flag.m4	\
 	m4/as-version.m4	\
 	m4/esd.m4		\
-	gnome-doc-utils.make	\
 	ChangeLog.pre-2-26	\
 	$(INTLTOOL_BUILT:=.in)	\
 	$(NULL)
 
 DISTCLEANFILES = \
+	build-aux/gnome-doc-utils.make	\
 	po/.intltool-merge-cache	\
-	gnome-doc-utils.make		\
 	$(INTLTOOL_BUILT)		\
 	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
 
+# see build-aux/git-version-get for details
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+	echo $(VERSION) > $ -t && mv $ -t $@
+dist-hook:
+	echo $(VERSION) > $(distdir)/.tarball-version
+
 update-shave:
 	for i in shave.in shave.m4 shave-libtool.in; do \
 		wget -O $$i http://git.lespiau.name/cgit/shave/blob/\?path=shave/$$i ; \
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
new file mode 100755
index 0000000..710870c
--- /dev/null
+++ b/build-aux/git-version-gen
@@ -0,0 +1,152 @@
+#!/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 922800e..d90c24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,11 @@
 AC_PREREQ(2.60)
 
 AC_INIT([gnome-media],
-        [2.27.1],
+        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media])
 
+AC_CONFIG_AUX_DIR([build-aux])
+
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall -Wno-portability tar-pax foreign])
 
 AS_VERSION
diff --git a/gnome-cd/doc/Makefile.am b/gnome-cd/doc/Makefile.am
index 74af180..bdb0207 100644
--- a/gnome-cd/doc/Makefile.am
+++ b/gnome-cd/doc/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = gnome-cd
 DOC_ENTITIES = legal.xml
diff --git a/grecord/doc/Makefile.am b/grecord/doc/Makefile.am
index 9524668..8ca1cae 100644
--- a/grecord/doc/Makefile.am
+++ b/grecord/doc/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = gnome-sound-recorder
 DOC_ENTITIES = legal.xml
diff --git a/gst-mixer/doc/Makefile.am b/gst-mixer/doc/Makefile.am
index ea33b32..149dbc7 100644
--- a/gst-mixer/doc/Makefile.am
+++ b/gst-mixer/doc/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = gnome-volume-control
 DOC_ENTITIES = legal.xml
diff --git a/gstreamer-properties/help/Makefile.am b/gstreamer-properties/help/Makefile.am
index 84dd0cb..e4f2052 100644
--- a/gstreamer-properties/help/Makefile.am
+++ b/gstreamer-properties/help/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/build-aux/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 DOC_MODULE = gstreamer-properties
 DOC_ENTITIES = legal.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]