moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Use git-version-gen instead of bzr-version-gen.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2012-05-13 16:46:15 +02:00
parent 0b4c04b583
commit f4122c5094
5 changed files with 12 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-05-13 Giuseppe Scrivano <gscrivano@gnu.org>
* 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 <gvtulder@gmail.com> 2012-04-11 Gijs van Tulder <gvtulder@gmail.com>
* bootstrap.conf (gnulib_modules): Include module `regex'. * bootstrap.conf (gnulib_modules): Include module `regex'.

2
Makefile.am
View File

@ -46,7 +46,7 @@ SUBDIRS = lib src doc po tests util
EXTRA_DIST = ChangeLog.README MAILING-LIST \ EXTRA_DIST = ChangeLog.README MAILING-LIST \
msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
msdos/Makefile.WC ABOUT-NLS \ 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 CLEANFILES = *~ *.bak $(DISTNAME).tar.gz

1
bootstrap.conf
View File

@ -43,6 +43,7 @@ getopt-gnu
getpass-gnu getpass-gnu
getpeername getpeername
getsockname getsockname
git-version-gen
gnupload gnupload
ioctl ioctl
iconv iconv

57
build-aux/bzr-version-gen
View File

@ -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 <http://www.gnu.org/licenses/>.
# 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:

2
configure.ac
View File

@ -31,7 +31,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl dnl
AC_INIT([wget], AC_INIT([wget],
[m4_esyscmd([build-aux/bzr-version-gen])], m4_esyscmd([build-aux/git-version-gen .tarball-version]),
[bug-wget@gnu.org]) [bug-wget@gnu.org])
AC_PREREQ(2.61) AC_PREREQ(2.61)