From f4122c50949f5bd5a9867a6074d39b56d29c660f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 13 May 2012 16:46:15 +0200 Subject: [PATCH] Use git-version-gen instead of bzr-version-gen. --- ChangeLog | 9 +++++++ Makefile.am | 2 +- bootstrap.conf | 1 + build-aux/bzr-version-gen | 57 --------------------------------------- configure.ac | 2 +- 5 files changed, 12 insertions(+), 59 deletions(-) delete mode 100755 build-aux/bzr-version-gen diff --git a/ChangeLog b/ChangeLog index 51632aa2..aa249b06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-05-13 Giuseppe Scrivano + + * bootstrap.conf (gnulib_modules): Add `git-version-gen'. + * build-aux/bzr-version-gen: Remove file. + * configure.ac: Invoke `build-aux/git-version-gen' to get the dist + version. + * Makefile.am (EXTRA_DIST): Distribute build-aux/git-version-gen instead + of build-aux/bzr-version-gen. + 2012-04-11 Gijs van Tulder * bootstrap.conf (gnulib_modules): Include module `regex'. diff --git a/Makefile.am b/Makefile.am index 24d95e07..7a500ba0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ SUBDIRS = lib src doc po tests util EXTRA_DIST = ChangeLog.README MAILING-LIST \ msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ msdos/Makefile.WC ABOUT-NLS \ - build-aux/build_info.pl build-aux/bzr-version-gen .version + build-aux/build_info.pl build-aux/git-version-gen .version CLEANFILES = *~ *.bak $(DISTNAME).tar.gz diff --git a/bootstrap.conf b/bootstrap.conf index 56b7b278..a784a906 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -43,6 +43,7 @@ getopt-gnu getpass-gnu getpeername getsockname +git-version-gen gnupload ioctl iconv diff --git a/build-aux/bzr-version-gen b/build-aux/bzr-version-gen deleted file mode 100755 index f22d14fd..00000000 --- a/build-aux/bzr-version-gen +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -scriptversion=2011-08-11.08; # UTC - -# Copyright (C) 2010, 2011 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 . - -# Additional permission under GNU GPL version 3 section 7 - - -# Written by Giuseppe Scrivano. - -if test -f .tarball-version -then - cat .tarball-version | tr -d '\n' - exit 0 -fi - -DIRTY="" - -test -n "`bzr diff | tr -d '\n'`" && DIRTY="-dirty" - -REVNO=`bzr revno` - -TAG=`bzr tags -r $REVNO | cut -d' ' -f1` -if test -z "$TAG" -then - TAG=`bzr tags --sort=time -r ..$REVNO | tail -n1 | cut -d' ' -f1` - - # No tags yet - test -z "$TAG" && TAG="unknown" - - TAG=$TAG-$REVNO -fi - - -printf "%s%s" "$TAG" "$DIRTY" - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/configure.ac b/configure.ac index 45cebcab..873c3c92 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl Process this file with autoconf to produce a configure script. dnl AC_INIT([wget], - [m4_esyscmd([build-aux/bzr-version-gen])], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-wget@gnu.org]) AC_PREREQ(2.61) -- 2.39.2