From: Sami Kerola Date: Tue, 16 Aug 2016 09:34:01 +0000 (+0100) Subject: build-sys: use build version script from gnulib X-Git-Tag: v0.88~38^2^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8beabc5da74d3af28d5a3bc02cd6d586f2254d;p=thirdparty%2Fmtr.git build-sys: use build version script from gnulib This makes distribution tar-balls from snapshot to indicate they are snapshot versions. Additionally the version markup ends up in config.h correct way, so earlier code that was specific to this project can be removed. Reference: http://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/git-version-gen --- diff --git a/.gitignore b/.gitignore index c62af3f..41c3817 100644 --- a/.gitignore +++ b/.gitignore @@ -10,19 +10,17 @@ configure confinc confmf conftest.* -depcomp -install-sh -missing stamp-h1* +/build-aux/compile +/build-aux/depcomp +/build-aux/install-sh +/build-aux/missing + /autom4te.cache/ /.deps/ /ChangeLog /INSTALL /mtr -/version.h -/version.h.tmp - -compile /mtr-*.tar.gz diff --git a/Makefile.am b/Makefile.am index f58c133..d15a6d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,6 @@ if IPINFO mtr_SOURCES += asn.c asn.h endif -nodist_mtr_SOURCES = version.h EXTRA_mtr_SOURCES = curses.c \ gtk.c @@ -31,15 +30,3 @@ mtr_INCLUDES = $(GLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir) mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ) mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) mtr_LDADD = $(GLIB_LIBS) $(RESOLV_LIBS) - -CLEANFILES = version.h -BUILT_SOURCES = version.h - -version.h: version.h.tmp Makefile $(mtr_SOURCES) - @cat version.h.tmp > $@; \ - if [ -d .git ] && [ -n "$$(which git)" ]; then \ - xver="+git:$$(git rev-list -n1 --abbrev=8 --abbrev-commit HEAD)"; \ - sed \ - -e "/#define *MTR_VERSION */{s/\"\([^\"]*\)\"/\"\1$$xver\"/;}" \ - version.h.tmp > $@; \ - fi; diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen new file mode 100755 index 0000000..bd2c4b6 --- /dev/null +++ b/build-aux/git-version-gen @@ -0,0 +1,226 @@ +#!/bin/sh +# Print a version string. +scriptversion=2016-05-08.18; # UTC + +# Copyright (C) 2007-2016 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 . + +# 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. +# +# As with any generated file in a VC'd directory, you should add +# /.version to .gitignore, so that you don't accidentally commit it. +# .tarball-version is never generated in a VC'd directory, so needn't +# be listed there. +# +# 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 .version and +# .tarball-version will exist in distribution tarballs. +# +# 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 + + +me=$0 + +version="git-version-gen $scriptversion + +Copyright 2011 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING." + +usage="\ +Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +Print a version string. + +Options: + + --prefix PREFIX prefix of git tags (default 'v') + --fallback VERSION + fallback version to use if \"git --version\" fails + + --help display this help and exit + --version output version information and exit + +Running without arguments will suffice in most cases." + +prefix=v +fallback= + +while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; + --version) echo "$version"; exit 0;; + --prefix) shift; prefix=${1?};; + --fallback) shift; fallback=${1?};; + -*) + echo "$0: Unknown option '$1'." >&2 + echo "$0: Try '--help' for more information." >&2 + exit 1;; + *) + if test "x$tarball_version_file" = x; then + tarball_version_file="$1" + elif test "x$tag_sed_script" = x; then + tag_sed_script="$1" + else + echo "$0: extra non-option argument '$1'." >&2 + exit 1 + fi;; + esac + shift +done + +if test "x$tarball_version_file" = x; then + echo "$usage" + exit 1 +fi + +tag_sed_script="${tag_sed_script:-s/x/x/}" + +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= +v_from_git= + +# 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` || v= + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test "x$v" = x \ + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 +fi + +if test "x$v" != x +then + : # use $v +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ + && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + $prefix[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/-.*//'` + commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ + || { commit_list=failed; + echo "$0: WARNING: git rev-list failed" 1>&2; } + numcommits=`echo "$commit_list" | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + test "$commit_list" = failed && v=UNKNOWN + ;; + 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-/'`; + v_from_git=1 +elif test "x$fallback" = x || git --version >/dev/null 2>&1; then + v=UNKNOWN +else + v=$fallback +fi + +v=`echo "$v" |sed "s/^$prefix//"` + +# Test whether to append the "-dirty" suffix only if the version +# string we're using came from git. I.e., skip the test if it's "UNKNOWN" +# or if it came from .tarball-version. +if test "x$v_from_git" != x; then + # Don't declare a version "dirty" merely because a time stamp has changed. + git update-index --refresh > /dev/null 2>&1 + + dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= + case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; + esac +fi + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +printf %s "$v" + +# 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: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure.ac b/configure.ac index c058239..9518321 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,15 @@ -AC_INIT([mtr], [0.87]) +AC_PREREQ([2.59]) +AC_INIT([mtr], + [m4_esyscmd([build-aux/git-version-gen .tarball-version])], + [R.E.Wolff@BitWizard.nl], [], + [http://www.BitWizard.nl/mtr/]) AC_CONFIG_SRCDIR([mtr.c]) +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) -AC_CONFIG_FILES([version.h.tmp:version.h.in]) - AC_SUBST(GTK_OBJ) AC_SUBST(CURSES_OBJ) diff --git a/curses.c b/curses.c index c662db8..541a2b4 100644 --- a/curses.c +++ b/curses.c @@ -66,7 +66,6 @@ #include "asn.h" #include "display.h" -#include "version.h" #endif #include @@ -646,7 +645,7 @@ void mtr_curses_redraw(void) move(0, 0); attron(A_BOLD); - pwcenter("My traceroute [v" MTR_VERSION "]"); + pwcenter("My traceroute [v" PACKAGE_VERSION "]"); attroff(A_BOLD); mvprintw(1, 0, "%s (%s)", LocalHostname, net_localaddr()); diff --git a/gtk.c b/gtk.c index 3e83d63..a785fd4 100644 --- a/gtk.c +++ b/gtk.c @@ -35,7 +35,6 @@ #include "dns.h" #include "asn.h" #include "mtr-gtk.h" -#include "version.h" #include "img/mtr_icon.xpm" #endif @@ -172,7 +171,7 @@ gint About_clicked(UNUSED GtkWidget *Button, UNUSED gpointer data) }; gtk_show_about_dialog(GTK_WINDOW(main_window) - , "version", MTR_VERSION + , "version", PACKAGE_VERSION , "copyright", "Copyright \xc2\xa9 1997,1998 Matt Kimball" , "website", "http://www.bitwizard.nl/mtr/" , "authors", authors diff --git a/mtr.c b/mtr.c index 4085236..72c9c2f 100644 --- a/mtr.c +++ b/mtr.c @@ -44,7 +44,6 @@ #include "report.h" #include "net.h" #include "asn.h" -#include "version.h" #ifdef ENABLE_IPV6 @@ -691,7 +690,7 @@ int main(int argc, char **argv) } if (PrintVersion) { - printf ("mtr " MTR_VERSION "\n"); + printf ("mtr " PACKAGE_VERSION "\n"); exit(0); } diff --git a/report.c b/report.c index cbea49b..2f03019 100644 --- a/report.c +++ b/report.c @@ -28,7 +28,6 @@ #include #include "mtr.h" -#include "version.h" #include "report.h" #include "net.h" #include "dns.h" @@ -459,11 +458,11 @@ void csv_close(time_t now) if(!ipinfo_no) { char* fmtinfo = fmt_ipinfo(addr); fmtinfo = trim(fmtinfo); - printf("MTR.%s,%lld,%s,%s,%d,%s,%s", MTR_VERSION, (long long)now, "OK", Hostname, + printf("MTR.%s,%lld,%s,%s,%d,%s,%s", PACKAGE_VERSION, (long long)now, "OK", Hostname, at+1, name, fmtinfo); } else #endif - printf("MTR.%s,%lld,%s,%s,%d,%s", MTR_VERSION, (long long)now, "OK", Hostname, + printf("MTR.%s,%lld,%s,%s,%d,%s", PACKAGE_VERSION, (long long)now, "OK", Hostname, at+1, name); for( i=0; i