* [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-06 11:21 Yonggang Luo
2020-10-06 11:31 ` Paolo Bonzini
2020-10-06 11:34 ` Paolo Bonzini
0 siblings, 2 replies; 4+ messages in thread
From: Yonggang Luo @ 2020-10-06 11:21 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, QEMU Trivial,
Philippe Mathieu-Daud茅,
Yonggang Luo, Paolo Bonzini
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/
Testing args length and if not enough, setting pkgversion and version to ''
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
meson.build | 2 +-
scripts/qemu-version.py | 31 +++++++++++++++++++++++++++++++
scripts/qemu-version.sh | 25 -------------------------
3 files changed, 32 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..e6eb548220
--- /dev/null
+++ b/scripts/qemu-version.py
@@ -0,0 +1,31 @@
+#!/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
+
+def main(_program, dir, pkgversion, version, *unused):
+ if len(pkgversion) == 0:
+ pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],
+ stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, cwd=dir)
+ if pc.returncode == 0:
+ pkgversion = pc.stdout.decode('utf8').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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-06 11:21 [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
@ 2020-10-06 11:31 ` Paolo Bonzini
2020-10-06 11:34 ` Paolo Bonzini
1 sibling, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2020-10-06 11:31 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: QEMU Trivial, Peter Maydell, Thomas Huth, Philippe Mathieu-Daud茅
On 06/10/20 13:21, Yonggang Luo 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
> meson.build | 2 +-
> scripts/qemu-version.py | 31 +++++++++++++++++++++++++++++++
> scripts/qemu-version.sh | 25 -------------------------
> 3 files changed, 32 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..e6eb548220
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,31 @@
> +#!/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
> +
> +def main(_program, dir, pkgversion, version, *unused):
> + if len(pkgversion) == 0:
> + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],
> + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, cwd=dir)
> + if pc.returncode == 0:
> + pkgversion = pc.stdout.decode('utf8').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
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-06 11:21 [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
2020-10-06 11:31 ` Paolo Bonzini
@ 2020-10-06 11:34 ` Paolo Bonzini
2020-10-06 11:58 ` 罗勇刚(Yonggang Luo)
1 sibling, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2020-10-06 11:34 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: QEMU Trivial, Peter Maydell, Thomas Huth, Philippe Mathieu-Daud茅
On 06/10/20 13:21, Yonggang Luo 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
> meson.build | 2 +-
> scripts/qemu-version.py | 31 +++++++++++++++++++++++++++++++
> scripts/qemu-version.sh | 25 -------------------------
> 3 files changed, 32 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..e6eb548220
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,31 @@
> +#!/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
> +
> +def main(_program, dir, pkgversion, version, *unused):
> + if len(pkgversion) == 0:
> + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],
> + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, cwd=dir)
> + if pc.returncode == 0:
> + pkgversion = pc.stdout.decode('utf8').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
>
Hmm it still doesn't check for a ".git" directory. I'll fix it up, but
please pay more attention to the reviews.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-06 11:34 ` Paolo Bonzini
@ 2020-10-06 11:58 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 4+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-10-06 11:58 UTC (permalink / raw)
To: Paolo Bonzini
Cc: QEMU Trivial, Peter Maydell, Thomas Huth, qemu-level,
Philippe Mathieu-Daud茅
[-- Attachment #1: Type: text/plain, Size: 3916 bytes --]
On Tue, Oct 6, 2020 at 7:34 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 06/10/20 13:21, Yonggang Luo 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/
> >
> > Testing args length and if not enough, setting pkgversion and version
to ''
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> > meson.build | 2 +-
> > scripts/qemu-version.py | 31 +++++++++++++++++++++++++++++++
> > scripts/qemu-version.sh | 25 -------------------------
> > 3 files changed, 32 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..e6eb548220
> > --- /dev/null
> > +++ b/scripts/qemu-version.py
> > @@ -0,0 +1,31 @@
> > +#!/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
> > +
> > +def main(_program, dir, pkgversion, version, *unused):
> > + if len(pkgversion) == 0:
> > + pc = subprocess.run(['git', 'describe', '--match', "'v*'",
'--dirty', '--always'],
> > + stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL, cwd=dir)
> > + if pc.returncode == 0:
> > + pkgversion = pc.stdout.decode('utf8').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
> >
>
> Hmm it still doesn't check for a ".git" directory. I'll fix it up, but
> please pay more attention to the reviews.
Oh sorry for that I didn't explain that, I am using
stderr=subprocess.DEVNULL to supress git error, so if git failed then it
does nothing
But after deep though, with .git check are more safe
>
> Paolo
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 5551 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-06 11:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 11:21 [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
2020-10-06 11:31 ` Paolo Bonzini
2020-10-06 11:34 ` Paolo Bonzini
2020-10-06 11:58 ` 罗勇刚(Yonggang Luo)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.