From dbd81bbb89ae91334fb2e608e6860ed0055d1915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 17 Mar 2020 16:35:17 +0100 Subject: Teach slirp_version_string() to return vcs version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson build will use a vcs-generate version, while Makefile will always use -git version, since it is only intended for submodule usage. Eventually can be improved if needed. Fixes: https://gitlab.freedesktop.org/slirp/libslirp/issues/17 Signed-off-by: Marc-André Lureau --- .gitlab-ci.yml | 3 +- Makefile | 4 +- build-aux/git-version-gen | 158 ++++++++++++++++++++++++++++++++++++++++++++++ build-aux/meson-dist | 16 +++++ meson.build | 5 +- src/libslirp-version.h.in | 1 + src/version.c | 5 +- 7 files changed, 185 insertions(+), 7 deletions(-) create mode 100755 build-aux/git-version-gen create mode 100755 build-aux/meson-dist diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8ef14b..a15ae3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,11 @@ variables: DEPS: meson ninja-build make gcc pkg-config glib2-devel mingw64-gcc mingw64-pkg-config mingw64-glib2 - clang-analyzer + clang-analyzer git-core before_script: - dnf install -y $DEPS + - git describe build: script: diff --git a/Makefile b/Makefile index 3de9713..b49bedb 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ LIBSLIRP = $(BUILD_DIR)/libslirp.a SLIRP_MAJOR_VERSION = 4 SLIRP_MINOR_VERSION = 2 SLIRP_MICRO_VERSION = 0 +SLIRP_VERSION_STRING = "$(SLIRP_MAJOR_VERSION).$(SLIRP_MINOR_VERSION).$(SLIRP_MICRO_VERSION)-git" all: $(LIBSLIRP) @@ -27,7 +28,8 @@ $(BUILD_DIR)/src/libslirp-version.h: $(call quiet-command,cat $(ROOT_DIR)/src/libslirp-version.h.in | \ sed 's/@SLIRP_MAJOR_VERSION@/$(SLIRP_MAJOR_VERSION)/' | \ sed 's/@SLIRP_MINOR_VERSION@/$(SLIRP_MINOR_VERSION)/' | \ - sed 's/@SLIRP_MICRO_VERSION@/$(SLIRP_MICRO_VERSION)/' \ + sed 's/@SLIRP_MICRO_VERSION@/$(SLIRP_MICRO_VERSION)/' | \ + sed 's/@SLIRP_VERSION_STRING@/$(SLIRP_VERSION_STRING)/' \ > $@,"GEN","$@") $(OBJS): $(BUILD_DIR)/src/libslirp-version.h diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen new file mode 100755 index 0000000..5617eb8 --- /dev/null +++ b/build-aux/git-version-gen @@ -0,0 +1,158 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-06-14.19; # UTC + +# Copyright (C) 2007-2010 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. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# 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 .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1|2) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version" \ + '[TAG-NORMALIZATION-SED-SCRIPT]' + exit 1;; +esac + +tarball_version_file=$1 +tag_sed_script="${2:-s/x/x/}" +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= + +# 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` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif test -d .git \ + && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + v[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/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + 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-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git update-index --refresh > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d "$nl" + +# 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/build-aux/meson-dist b/build-aux/meson-dist new file mode 100755 index 0000000..80d534f --- /dev/null +++ b/build-aux/meson-dist @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e +set -o pipefail + +if test "$1" = ""; then + echo "Version not provided" >&2 + exit 1 +fi +if ! test -d "$2"; then + echo "Source directory not provided" >&2 + exit 1 +fi + +# generate tarball version +echo "$1" > "$MESON_DIST_ROOT/.tarball-version" diff --git a/meson.build b/meson.build index df0d26f..098bb6f 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,11 @@ project('libslirp', 'c', - version : '4.2.0', + version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(), license : 'BSD-3-Clause', default_options : ['warning_level=1', 'c_std=gnu99'] ) +meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root()) + version = meson.project_version() varr = version.split('.') major_version = varr[0] @@ -14,6 +16,7 @@ conf = configuration_data() conf.set('SLIRP_MAJOR_VERSION', major_version) conf.set('SLIRP_MINOR_VERSION', minor_version) conf.set('SLIRP_MICRO_VERSION', micro_version) +conf.set_quoted('SLIRP_VERSION_STRING', version) # libtool versioning - this applies to libslirp # diff --git a/src/libslirp-version.h.in b/src/libslirp-version.h.in index 59f7a46..faa6c85 100644 --- a/src/libslirp-version.h.in +++ b/src/libslirp-version.h.in @@ -9,6 +9,7 @@ extern "C" { #define SLIRP_MAJOR_VERSION @SLIRP_MAJOR_VERSION@ #define SLIRP_MINOR_VERSION @SLIRP_MINOR_VERSION@ #define SLIRP_MICRO_VERSION @SLIRP_MICRO_VERSION@ +#define SLIRP_VERSION_STRING @SLIRP_VERSION_STRING@ #define SLIRP_CHECK_VERSION(major,minor,micro) \ (SLIRP_MAJOR_VERSION > (major) || \ diff --git a/src/version.c b/src/version.c index a837323..93e0be9 100644 --- a/src/version.c +++ b/src/version.c @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause */ #include "libslirp.h" -#include "util.h" const char * slirp_version_string(void) { - return stringify(SLIRP_MAJOR_VERSION) "." - stringify(SLIRP_MINOR_VERSION) "." - stringify(SLIRP_MICRO_VERSION); + return SLIRP_VERSION_STRING; } -- cgit v1.1