Il mer 7 ott 2020, 21:46 Yonggang Luo <[email protected]> ha scritto:
> The sh script are harder to maintain for compatible different > xsh environment so convert it to python script > Also incorporate the fixes in > > https://patchew.org/QEMU/[email protected]/ > Using --match=v* instead of --match 'v*' for speed up the git version > And using --match=v\\* to resolve wildcard problem on windows. > Tested under Ubuntu/msys2/mingw. > Sorry but no, this is hideous. We need to keep in mind the maintainability and this is the opposite of a maintainable solution. It seems that subprocess (with shell=false, which I agree would be the right setting for this task) is not always an appropriate implementation when cross platform compatibility is required. Paolo > Signed-off-by: Yonggang Luo <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Paolo Bonzini <[email protected]> > --- > meson.build | 2 +- > scripts/qemu-version.py | 35 +++++++++++++++++++++++++++++++++++ > scripts/qemu-version.sh | 25 ------------------------- > 3 files changed, 36 insertions(+), 26 deletions(-) > create mode 100644 scripts/qemu-version.py > delete mode 100755 scripts/qemu-version.sh > > diff --git a/meson.build b/meson.build > index 26230614ba..1d3bb25bc6 100644 > --- a/meson.build > +++ b/meson.build > @@ -1132,7 +1132,7 @@ tracetool = [ > '--backend=' + config_host['TRACE_BACKENDS'] > ] > > -qemu_version_cmd = [find_program('scripts/qemu-version.sh'), > +qemu_version_cmd = [find_program('scripts/qemu-version.py'), > meson.current_source_dir(), > config_host['PKGVERSION'], meson.project_version()] > qemu_version = custom_target('qemu-version.h', > diff --git a/scripts/qemu-version.py b/scripts/qemu-version.py > new file mode 100644 > index 0000000000..3f24c44e8a > --- /dev/null > +++ b/scripts/qemu-version.py > @@ -0,0 +1,35 @@ > +#!/usr/bin/env python3 > + > +# > +# Script for retrieve qemu git version information > +# > +# Authors: > +# Yonggang Luo <[email protected]> > +# > +# This work is licensed under the terms of the GNU GPL, version 2 > +# or, at your option, any later version. See the COPYING file in > +# the top-level directory. > + > +import sys > +import subprocess > +import os, os.path > +import platform > + > +def main(_program, dir, pkgversion, version, *unused): > + os.chdir(dir) > + if not pkgversion and os.path.exists('.git'): > + match_expression = '--match=v\\*' if platform.system() == > 'Windows' else '--match=v*' > + pc = subprocess.run(['git', 'describe', match_expression, > '--always'], > + stdout=subprocess.PIPE, > stderr=subprocess.DEVNULL, encoding='utf8', shell=False) > + if pc.returncode == 0: > + pkgversion = pc.stdout.strip() > + > + fullversion = version > + if pkgversion: > + fullversion = "{} ({})".format(version, pkgversion) > + > + print('#define QEMU_PKGVERSION "%s"' % pkgversion) > + print('#define QEMU_FULL_VERSION "%s"' % fullversion) > + > +if __name__ == "__main__": > + main(*sys.argv) > diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh > deleted file mode 100755 > index 03128c56a2..0000000000 > --- a/scripts/qemu-version.sh > +++ /dev/null > @@ -1,25 +0,0 @@ > -#!/bin/sh > - > -set -eu > - > -dir="$1" > -pkgversion="$2" > -version="$3" > - > -if [ -z "$pkgversion" ]; then > - cd "$dir" > - if [ -e .git ]; then > - pkgversion=$(git describe --match 'v*' --dirty | echo "") > - fi > -fi > - > -if [ -n "$pkgversion" ]; then > - fullversion="$version ($pkgversion)" > -else > - fullversion="$version" > -fi > - > -cat <<EOF > -#define QEMU_PKGVERSION "$pkgversion" > -#define QEMU_FULL_VERSION "$fullversion" > -EOF > -- > 2.28.0.windows.1 > >
