コミット: 2fad644e37de093aae1f3f10c2027a2b7228eb04 - sandbox (git)

test

コミットメタ情報

• リビジョン: 2fad644e37de093aae1f3f10c2027a2b7228eb04 (tree)
• 日時: 2010-03-22 20:12:01
• 作者: TATEISHI Katsuyuki <kt@whee...>
• コミッター: TATEISHI Katsuyuki

ログメッセージ

Merge branch 'autogenversion'

変更サマリ

• modified: .gitignore
• modified: Makefile.am
• modified: configure.ac
• add: genvers.sh

差分

--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ Makefile.in
 *.la
 *.so
 *~
+*.gz
+/VERSION
 /aclocal.m4
 /autom4te.cache
 /autoscan-*log
@@ -25,3 +27,4 @@ Makefile.in
 /config.sub
 /libtool
 /ltmain.sh
+/ktsandbox.spec

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,20 @@
 SUBDIRS = lib src
 
 EXTRA_DIST = \
+	VERSION \
 	ktsandbox.spec \
-	ktsandbox.spec.in
+	ktsandbox.spec.in \
+	genvers.sh
+
+VERSION:
+	(cd $(top_srcdir) ;\
+		echo `./genvers.sh` $< > $@.new ;\
+		mv -f $@.new $@ ;)
+
+release:
+	(rm -f $(top_srcdir)/VERSION ;\
+		autoreconf -ifv $(top_srcdir) ;\
+		$(MAKE) distcheck ;)
 
 rpm: distcheck
 	rpmbuild -ta $(DIST_ARCHIVES)

--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
+define([ktsandbox_ver], esyscmd([./genvers.sh]))
+
 AC_PREREQ(2.59)
-AC_INIT(ktsandbox, 0.0.3, [e-mail])
+AC_INIT([ktsandbox], ktsandbox_ver, [[e-mail]])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])

--- /dev/null
+++ b/genvers.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 TATEISHI Katsuyuki <[e-mail]>
+# All rights reserved.
+#
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+#
+#
+# NAME
+# 	genvers.sh
+#
+# SYNOPSIS
+#	genvers.sh [_file_]
+#
+# DESCRIPTION
+#	genvers.sh is a script to generate a version number from the result of
+#	"git describe" and output to stdout and the _file_.  If _file_ is not
+#	given, 'VERSION' is used instead.
+#
+#	This script requires git command and the project managed with git.  It
+#	also requires that the project already have at least one annotation tag
+#	to run this script properly.  If the 'VERSION' file is already existed,
+#	it works even in non-git managed environment(ex. released tarball
+#	user's environment).
+#
+# EXAMPLES
+#	To generate version number automatically when autoreconf -if, put the
+#	following code into your configure.ac:
+#	----------------------------------------------------------------
+#	define([foobar_ver], esyscmd([./genvers.sh]))
+#
+#	AC_PREREQ([2.xx])
+#	AC_INIT([foobar], foobar_ver, [[e-mail]])
+#	----------------------------------------------------------------
+#
+#	And to use generated version number for "make distcheck", put the
+#	following code into your Makefile.am on $(top_srcdir):
+#	----------------------------------------------------------------
+#	EXTRA_DIST = VERSION genvers.sh
+#
+#	VERSION:
+#		(cd $(top_srcdir) ;\
+#			echo `./genvers.sh` $< > $@.new ;\
+#			mv -f $@.new $@ ;)
+#
+#	release:
+#		(rm -f $(top_srcdir)/VERSION ;\
+#			autoreconf -ifv $(top_srcdir) ;\
+#			$(MAKE) distcheck ;)
+#	----------------------------------------------------------------
+#	Be sure to do "autoreconf -if" before "make distcheck".
+#
+#	You can make a new release archive with the new version number:
+#
+#	% git tag -a 1.0.0 -m "Release 1.0.0"
+#	% autoreconf -if
+#	% make distcheck
+#
+#	Then, you'll see the new release file as "foobar-1.0.0.tar.gz".
+#	(Of course you must make 'make distcheck' worked before this step.)
+#
+
+if test -n "$1"; then
+	VERSION_FILE=$1
+else
+	VERSION_FILE=VERSION
+fi
+
+if test -f $VERSION_FILE; then
+	VERSION=`cat $VERSION_FILE`
+fi
+
+DESC=`git describe 2>/dev/null | grep '^v[0-9]*' | sed -e 's/^v//; s/-/./g;'`
+if test -z "$DESC"; then
+	# You must be an user
+	if test -n "$VERSION"; then
+		echo -n $VERSION
+	else
+		echo -n noversionfound
+		echo " Maybe $VERSION_FILE is missing" >&2
+	fi
+	exit 0
+fi
+
+# dirty check
+DIRTY=`git status |grep -E '^# Change(s to be committed|d but not updated):'`
+if test -n "$DIRTY"; then
+	DIRTY=".dirty"
+fi
+
+VERSION_NEW=$DESC$DIRTY
+if test "x$VERSION" != "x$VERSION_NEW"; then
+	VERSION=$VERSION_NEW
+	echo $VERSION > $VERSION_FILE.new
+	mv $VERSION_FILE.new $VERSION_FILE
+fi
+
+echo -n $VERSION