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
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/20200929143654.518157-1-marcandre.lureau@redhat.com/
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.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201006112139.700-1-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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..c633cb1e54
--- /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 <luoyonggang@gmail.com>
+#
+# 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, '--dirty', '--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
Patchew URL: https://patchew.org/QEMU/20201007195035.2006-1-luoyonggang@gmail.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20201007195035.2006-1-luoyonggang@gmail.com Subject: [PATCH v9] scripts: Convert qemu-version.sh to qemu-version.py === TEST SCRIPT BEGIN === #!/bin/bash git rev-parse base > /dev/null || exit 0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu * [new tag] patchew/20201007195035.2006-1-luoyonggang@gmail.com -> patchew/20201007195035.2006-1-luoyonggang@gmail.com Switched to a new branch 'test' ce86646 scripts: Convert qemu-version.sh to qemu-version.py === OUTPUT BEGIN === WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #34: new file mode 100644 ERROR: line over 90 characters #59: FILE: scripts/qemu-version.py:21: + match_expression = '--match=v\\*' if platform.system() == 'Windows' else '--match=v*' WARNING: line over 80 characters #60: FILE: scripts/qemu-version.py:22: + pc = subprocess.run(['git', 'describe', match_expression, '--dirty', '--always'], ERROR: line over 90 characters #61: FILE: scripts/qemu-version.py:23: + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, encoding='utf8', shell=False) total: 2 errors, 2 warnings, 43 lines checked Commit ce86646d2203 (scripts: Convert qemu-version.sh to qemu-version.py) has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20201007195035.2006-1-luoyonggang@gmail.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
© 2016 - 2024 Red Hat, Inc.