GNOME.org
 

[vala] build: Use git-version-gen

commit 96e69a7a555c76a8915171444e69516571fdd22d
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jan 28 01:30:58 2010 +0100

    build: Use git-version-gen
    
    Add git-version-gen script from gnulib.
    
    Based on patch by Marc-André Lureau.

 .gitignore                 |    2 +
 Makefile.am                |   20 ++++++
 build-aux/git-version-gen  |  150 ++++++++++++++++++++++++++++++++++++++++++++
 compiler/Makefile.am       |    1 -
 compiler/valacompiler.vala |    2 +-
 configure.ac               |    2 +-
 vala/Makefile.am           |    1 -
 vapi/config.vapi           |    3 +-
 vapigen/valavapigen.vala   |    2 +-
 9 files changed, 177 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94ed5cc..70c1cc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ ylwrap
 compile
 stamp-h1
 *.pc
+.tarball-version
+.version
 
 *.gcda
 *.gcno
diff --git a/Makefile.am b/Makefile.am
index 2f10aa9..c2613ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,24 @@ coverage-report: coverage
 	genhtml --title "@PACKAGE_STRING@" --output-directory $(top_builddir)/coverage $(top_builddir)/lcov.info
 #endif
 
+all: version.h
+
+version.h: $(top_srcdir)/.version
+	echo '#define BUILD_VERSION "'`cat $(top_srcdir)/.version`'"' > $ -t && mv $ -t $@
+
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version: gen-version
+	@true
+.PHONY: gen-version
+gen-version:
+	@V=`$(top_srcdir)/build-aux/git-version-gen $(top_srcdir)/.tarball-version` &&			\
+	if [ -e $(top_srcdir)/.version ] && [ "x`cat $(top_srcdir)/.version`" = "x$$V" ]; then		\
+	  true;												\
+	else												\
+	  echo "$$V" > $(top_srcdir)/.version;								\
+	fi
 dist-hook: gen-ChangeLog
+	echo $(VERSION) > $(distdir)/.tarball-version
 
 gen_start_date = 2009-02-25
 .PHONY: gen-ChangeLog
@@ -77,6 +94,9 @@ EXTRA_DIST = \
 	ChangeLog.pre-0-5-7 \
 	MAINTAINERS \
 	vala-1.0.pc.in \
+	.version \
+	build-aux/git-version-gen \
 	build-aux/gitlog-to-changelog \
 	$(NULL)
 
+DISTCLEANFILES = version.h
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
new file mode 100755
index 0000000..0fa6faa
--- /dev/null
+++ b/build-aux/git-version-gen
@@ -0,0 +1,150 @@
+#!/bin/sh
+# Print a version string.
+scriptversion=2010-01-28.01
+
+# Copyright (C) 2007-2010 Free Software Foundation, Inc.
+#
+# 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 of the License, 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, see <http://www.gnu.org/licenses/>.
+
+# 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
+	 [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/compiler/Makefile.am b/compiler/Makefile.am
index 45e4fd7..a8efb00 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/vala \
 	-I$(top_srcdir)/codegen \
 	$(GLIB_CFLAGS) \
-	-include config.h \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
 	$(NULL)
 
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 78429d1..d654709 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -567,7 +567,7 @@ class Vala.Compiler {
 		}
 		
 		if (version) {
-			stdout.printf ("Vala %s\n", Config.PACKAGE_VERSION);
+			stdout.printf ("Vala %s\n", Config.BUILD_VERSION);
 			return 0;
 		}
 		
diff --git a/configure.ac b/configure.ac
index 4001e04..b24997c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([vala], [0.7.11], [j bitron ch], [vala])
+AC_INIT([vala], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [j bitron ch], [vala])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS(config.h)
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 57d5b24..28a85ae 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gee \
 	-I$(top_srcdir)/ccode \
 	$(GLIB_CFLAGS) \
-	-include config.h \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
 	$(NULL)
 
diff --git a/vapi/config.vapi b/vapi/config.vapi
index deb5759..8e14bf0 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -22,6 +22,7 @@
 
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
-	public const string PACKAGE_VERSION;
+	[CCode (cheader_filename = "version.h")]
+	public const string BUILD_VERSION;
 	public const string PACKAGE_DATADIR;
 }
diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index f3118cb..3bcc4d6 100644
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -264,7 +264,7 @@ class Vala.VAPIGen : Object {
 		}
 
 		if (version) {
-			stdout.printf ("Vala API Generator %s\n", Config.PACKAGE_VERSION);
+			stdout.printf ("Vala API Generator %s\n", Config.BUILD_VERSION);
 			return 0;
 		}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]