* [PATCH] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-05 17:18 Yonggang Luo
0 siblings, 0 replies; only message in thread
From: Yonggang Luo @ 2020-10-05 17:18 UTC (permalink / raw)
To: qemu-devel
Cc: QEMU Trivial, Paolo Bonzini, Thomas Huth,
Philippe Mathieu-Daudé,
Yonggang Luo
The sh script are harder to maintain for compatible different
xsh environment
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
meson.build | 2 +-
scripts/qemu-version.py | 29 +++++++++++++++++++++++++++++
scripts/qemu-version.sh | 25 -------------------------
3 files changed, 30 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 95a532bd29..20f653b6eb 100644
--- a/meson.build
+++ b/meson.build
@@ -1072,7 +1072,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..12e8c0164a
--- /dev/null
+++ b/scripts/qemu-version.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+# Script for retrieve qemu git version information
+# and output to stdout as QEMU_PKGVERSION and QEMU_FULL_VERSION header
+# Author: Yonggang Luo <luoyonggang@gmail.com>
+
+import sys
+import subprocess
+
+def main(args):
+ if len(args) <= 3:
+ sys.exit(0)
+
+ dir = args[1]
+ pkgversion = args[2]
+ version = args[3]
+ pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'], stdout=subprocess.PIPE, cwd=dir)
+ if pc.returncode == 0:
+ pkgversion = pc.stdout.decode('utf8').strip()
+ fullversion = version
+ if len(pkgversion) > 0:
+ fullversion = "{} ({})".format(version, pkgversion)
+
+ version_header = '''#define QEMU_PKGVERSION "{}"
+#define QEMU_FULL_VERSION "{}"'''.format(pkgversion, fullversion)
+ sys.stdout.buffer.write(version_header.encode('utf8'))
+
+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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-05 17:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-05 17:18 [PATCH] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).