* [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-17 16:43 Yonggang Luo
2020-10-17 16:46 ` 罗勇刚(Yonggang Luo)
2020-10-17 16:53 ` Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Yonggang Luo @ 2020-10-17 16:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Yonggang Luo
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/
According to https://github.com/msys2/MSYS2-packages/issues/2176
We need use CYGWIN=noglob and MSYS=noglob in the environment variable
for disable wildcard expanding in msys or cygwin git, and setting the shell=False
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 | 37 +++++++++++++++++++++++++++++++++++++
scripts/qemu-version.sh | 25 -------------------------
3 files changed, 38 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 05fb59a00b..b100b6d7be 100644
--- a/meson.build
+++ b/meson.build
@@ -1240,7 +1240,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..cf97b2bbb5
--- /dev/null
+++ b/scripts/qemu-version.py
@@ -0,0 +1,37 @@
+#!/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
+import os.path
+
+def main(_program, dir, pkgversion, version, *unused):
+ os.chdir(dir)
+ if not pkgversion and os.path.exists('.git'):
+ pc = subprocess.run(
+ ['git', 'describe', '--match', 'v*', '--dirty', '--always'],
+ env=dict(os.environ, CYGWIN="noglob", MSYS='noglob'),
+ 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 3f6e7e6d41..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) || :
- 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] 3+ messages in thread
* Re: [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-17 16:43 [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
@ 2020-10-17 16:46 ` 罗勇刚(Yonggang Luo)
2020-10-17 16:53 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-10-17 16:46 UTC (permalink / raw)
To: qemu-level; +Cc: Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 4000 bytes --]
On Sun, Oct 18, 2020 at 12:43 AM Yonggang Luo <luoyonggang@gmail.com> wrote:
>
> 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/
>
> According to https://github.com/msys2/MSYS2-packages/issues/2176
> We need use CYGWIN=noglob and MSYS=noglob in the environment variable
> for disable wildcard expanding in msys or cygwin git, and setting the
shell=False
>
> 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 | 37 +++++++++++++++++++++++++++++++++++++
> scripts/qemu-version.sh | 25 -------------------------
> 3 files changed, 38 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 05fb59a00b..b100b6d7be 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1240,7 +1240,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..cf97b2bbb5
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/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
> +import os.path
> +
> +def main(_program, dir, pkgversion, version, *unused):
> + os.chdir(dir)
> + if not pkgversion and os.path.exists('.git'):
> + pc = subprocess.run(
> + ['git', 'describe', '--match', 'v*', '--dirty', '--always'],
> + env=dict(os.environ, CYGWIN="noglob", MSYS='noglob'),
Sorry for disturb, under msys2, use env=dict(os.environ,
CYGWIN="noglob", MSYS='noglob') we make sure
'v*‘ are passed into git without wildcard. So I send this patch again for
fixes this issue
> + 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 3f6e7e6d41..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) || :
> - 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
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 5484 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-17 16:43 [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
2020-10-17 16:46 ` 罗勇刚(Yonggang Luo)
@ 2020-10-17 16:53 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2020-10-17 16:53 UTC (permalink / raw)
To: Yonggang Luo; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 4067 bytes --]
Il sab 17 ott 2020, 18:43 Yonggang Luo <luoyonggang@gmail.com> 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/20200929143654.518157-1-marcandre.lureau@redhat.com/
>
> According to https://github.com/msys2/MSYS2-packages/issues/2176
> We need use CYGWIN=noglob and MSYS=noglob in the environment variable
> for disable wildcard expanding in msys or cygwin git, and setting the
> shell=False
>
Honestly, I don't see the point in doing this change. Python is the wrong
tool for this job, and it's not like the configure script is disappearing
any time soon---so getting rid of shell scripts at this point is of limited
utility, especially for something like qemu-version.sh.
IMO the msys build is already much more robust in 5.2 than in 5.1 once the
pending pull request for ninja is in). Any other change has to provide a
clear improvement.
Paolo
> 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 | 37 +++++++++++++++++++++++++++++++++++++
> scripts/qemu-version.sh | 25 -------------------------
> 3 files changed, 38 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 05fb59a00b..b100b6d7be 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1240,7 +1240,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..cf97b2bbb5
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/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
> +import os.path
> +
> +def main(_program, dir, pkgversion, version, *unused):
> + os.chdir(dir)
> + if not pkgversion and os.path.exists('.git'):
> + pc = subprocess.run(
> + ['git', 'describe', '--match', 'v*', '--dirty', '--always'],
> + env=dict(os.environ, CYGWIN="noglob", MSYS='noglob'),
> + 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 3f6e7e6d41..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) || :
> - 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
>
>
[-- Attachment #2: Type: text/html, Size: 6020 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-17 16:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-17 16:43 [PATCH v11] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
2020-10-17 16:46 ` 罗勇刚(Yonggang Luo)
2020-10-17 16:53 ` Paolo Bonzini
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).