build: Use git-version-gen intead of version.sh

* version.sh: Remove.
* autogen.sh: Import git-version-gen from Gnulib.
* Makefile.am (EXTRA_DIST): Add $(top_srcdir)/.version.
(BUILT_SOURCES): Likewise.
($(top_srcdir)/.version): New rule.
(dist-hook): New rule.
* configure.ac: Use git-version-gen in AC_INIT.
* gettext-runtime/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* gettext-tools/examples/configure.ac: Likewise.
* gettext-runtime/man/Makefile.am: Refer to .version instead of
version.sh.
* gettext-tools/doc/Makefile.am: Likewise.
* gettext-tools/man/Makefile.am: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f672090cbaa6585eaa8759b6d4d1950f6a84a441..70b6040cb59ca9c3b0421d55905297be1e874b5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * version.sh: Remove.
+       * autogen.sh: Import git-version-gen from Gnulib.
+       * Makefile.am (EXTRA_DIST): Remove version.sh and add
+       $(top_srcdir)/.version.
+       (BUILT_SOURCES): Add $(top_srcdir)/.version.
+       ($(top_srcdir)/.version): New rule.
+       (dist-hook): New rule.
+       * configure.ac: Use git-version-gen in AC_INIT.
+
 2014-04-21  Daiki Ueno  <ueno@gnu.org>
 
        autogen.sh: Split the regeneration of data files into update.sh

diff --git a/Makefile.am b/Makefile.am
index 1a3f7978b151c96b8c411e674961e839254e57e9..8b094a7218922b407d3012d6db895a01f665243b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = gnulib-local gettext-runtime gettext-tools
 
 EXTRA_DIST = \
-  version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
-  update-po.sh \
+  DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh update-po.sh \
   build-aux/ac-help.sed build-aux/moopp \
   m4/fixautomake.m4 m4/woe32-dll.m4 \
   m4/libtool.m4
@@ -119,3 +118,12 @@ EXTRA_DIST += os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk
 # Woe32 support.
 
 EXTRA_DIST += README.woe32 windows/windres-options windows/gettext.rc
+
+# Versioning based on Git release tags.
+
+EXTRA_DIST += $(top_srcdir)/.version
+BUILT_SOURCES = $(top_srcdir)/.version
+$(top_srcdir)/.version:
+       echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+       echo $(VERSION) > $(distdir)/.tarball-version

diff --git a/autogen.sh b/autogen.sh
index 4f758b0ebb90ef06cb2c040e408e798a22d57e9b..9ba27524d772436c2c70cfe5af0125d5f48eb72d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -370,7 +370,9 @@ if ! $skip_gnulib; then
     '
     $GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
       --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $?
+    # Import build tools.  We use --copy-file to avoid directory creation.
     $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $?
+    $GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $?
   fi
 fi
 

diff --git a/configure.ac b/configure.ac
index fcff9e70d077d9eef854a50b559ec9fccfb13bd0..6627a4e0f0e47ef49ba261508483166de7586ad5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,11 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT
+AC_INIT([gettext],
+       m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+       [bug-gnu-gettext@gnu.org])
 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
 AC_CONFIG_AUX_DIR([build-aux])
-. $srcdir/version.sh
-gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 
 dnl Override automake's tar command used for creating distributions.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index d7a69a1c0b27e4a03a8710b60fe6b79d36d13160..a50af2f089356a5a787069428b473e9f27783073 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * configure.ac: Use git-version-gen in AC_INIT.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
        * NEWS: Mention setlocale() change on Mac OS X.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index dcfd27a666e03b9afc3466036605610139f32f34..ce4c6b1247b1856f665b2cd74fe43cbaa0147da2 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -17,11 +17,11 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT
+AC_INIT([gettext-runtime],
+       m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
+       [bug-gnu-gettext@gnu.org])
 AC_CONFIG_SRCDIR([intl/dcigettext.c])
 AC_CONFIG_AUX_DIR([../build-aux])
-. $srcdir/../version.sh
-gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
 

diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index 0339a984eef7918750f434824c6ccbb2efd9dbd3..5f3e8362b969abd9251ec827b15e8c4370d1555e 100644 (file)
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * Makefile.am: Refer to .version instead of version.sh.
+
 2013-06-10  Daiki Ueno  <ueno@gnu.org>
 
        * Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).

diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index 4c6200752bc7aea37d9af9beb29784bae3a4df1b..46e0199c156764716dfd615a88612b02f23ff8a6 100644 (file)
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -92,11 +92,10 @@ ngettext.1.in: ngettext.x
 envsubst.1: envsubst.x
        $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1
 
-# Depend on version.sh to get version number changes.
-$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh
+$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
 
 # Update them also during "make dist", in order to propagate added command
-# line options that were added, even if version.sh didn't change.
+# line options that were added, even if .version didn't change.
 UPDATEMODE =
 update-man1:
        $(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update
@@ -104,19 +103,19 @@ update-man1:
 # Hidden from automake, but really activated. Works around an automake-1.5 bug.
 #distdir: update-man1
 
-gettext.3: gettext.3.in $(top_srcdir)/../version.sh
+gettext.3: gettext.3.in $(top_srcdir)/../.version
        sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
        mv t-$@ $@
-ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
+ngettext.3: ngettext.3.in $(top_srcdir)/../.version
        sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
        mv t-$@ $@
-textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
+textdomain.3: textdomain.3.in $(top_srcdir)/../.version
        sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
        mv t-$@ $@
-bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
+bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../.version
        sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
        mv t-$@ $@
-bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
+bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../.version
        sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
        mv t-$@ $@
 

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 9866892fb1dd1dc3656c603de4baa1c18ab654a6..d1a878307e554370ce23567a69513269af49fe46 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * configure.ac: Use git-version-gen in AC_INIT.
+
 2014-03-11  Daiki Ueno  <ueno@gnu.org>
 
        * configure.ac: Remove unnecessary make-variable expansion,

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index b13bcfd389daea40dfc0224143f293c89c1ea87c..232b3d05c83f09ea55aa15fa325a8f2317b57224 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -17,11 +17,11 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT
+AC_INIT([gettext-tools],
+       m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
+       [bug-gnu-gettext@gnu.org])
 AC_CONFIG_SRCDIR([src/msgfmt.c])
 AC_CONFIG_AUX_DIR([../build-aux])
-. $srcdir/../version.sh
-gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 AC_CONFIG_HEADERS([config.h])
 
@@ -499,12 +499,6 @@ AC_SUBST([TESTLIBASPRINTF])
 dnl Generate the version information file in the intl/ directory.
 test -d intl || mkdir intl
 echo "GNU gettext library from gettext-$VERSION" > intl/VERSION
-cat > intl/ChangeLog.inst <<EOF
-$RELEASE_DATE  GNU  <bug-gnu-gettext@gnu.org>
-
-       * Version $VERSION released.
-
-EOF
 
 AC_CONFIG_SUBDIRS([examples])
 

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 923c93d6e2a40a31a33a95643eae22a9e5e2c50d..f12e3dcd9b1ac485c25a9b9ffc0f17a705b12fff 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * Makefile.am: Refer to .version instead of version.sh.
+
 2014-04-15  Daiki Ueno  <ueno@gnu.org>
 
        * msgfilter.texi: Document 'quot' and 'boldquot' built-in filters.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index dbe617c3d2831f37058619e989fc5e1cf3588650..708b1cceeb7279f3826691eb0d6bfb900b2b2f32 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -71,7 +71,7 @@ iso-3166.texi: ISO_3166 iso-3166.sed
 # The dependencies of stamp-vti generated by automake are incomplete.
 # So we have to duplicate the entire rule which would otherwise be generated
 # by automake.
-$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
+$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.version
        (dir=.; test -f ./gettext.texi || dir=$(srcdir); \
        set `$(SHELL) $(top_srcdir)/../build-aux/mdate-sh $$dir/gettext.texi`; \
        echo "@set UPDATED $$1 $$2 $$3"; \

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 60314e246a85e22c19222b621d9c35bc75e10286..22d200886fba1e5877a19e43f44514977f9cad18 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       build: Use git-version-gen intead of version.sh
+       * configure.ac: Use git-version-gen in AC_INIT.
+
 2014-04-21  Daiki Ueno  <ueno@gnu.org>
 
        examples: Quote shell variables in hello-java*/configure

diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 75cd086bb342b4e9d0086614a5a595e0785a443d..9fefde87e2b09309be1d2c363078dd9d99e4d55e 100644 (file)
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -17,11 +17,11 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.57])
-AC_INIT
+AC_INIT([gettext-examples],
+       m4_esyscmd([../../build-aux/git-version-gen ../../.tarball-version]),
+       [bug-gnu-gettext@gnu.org])
 AC_CONFIG_SRCDIR([installpaths.in])
 AC_CONFIG_AUX_DIR([../../build-aux])
-. $srcdir/../../version.sh
-gl_INIT_PACKAGE([gettext-examples], [$VERSION_NUMBER])
 AM_INIT_AUTOMAKE([silent-rules])
 
 dnl Installation directories.

diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index 846181738e14e425734e4a042fa4a70560b89b85..b0c5b0601b8f864bfc19501e07996c303fc8a52b 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-22  Daiki Ueno  <ueno@gnu.org>
+
+       * Makefile.am: Refer to .version instead of version.sh.
+
 2013-06-10  Daiki Ueno  <ueno@gnu.org>
 
        * Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).

diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index acd1eca1f10e983a54f0d247f9019708e75550c3..2b420ef334ed2ca5ebf9f25a0422bdf28b740093 100644 (file)
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -114,11 +114,10 @@ gettextize.1: gettextize.x
 autopoint.1: autopoint.x
        $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
 
-# Depend on version.sh to get version number changes.
-$(man_MAN1): help2man $(top_srcdir)/../version.sh
+$(man_MAN1): help2man $(top_srcdir)/../.version
 
 # Update them also during "make dist", in order to propagate added command
-# line options that were added, even if version.sh didn't change.
+# line options that were added, even if .version didn't change.
 UPDATEMODE =
 update-man1:
        $(MAKE) $(man_MAN1) UPDATEMODE=--update

diff --git a/version.sh b/version.sh
deleted file mode 100644 (file)
index 63ca629..0000000
--- a/version.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version number and release date.
-VERSION_NUMBER=0.18.3
-RELEASE_DATE=2013-07-07      # in "date +%Y-%m-%d" format