* [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-05 19:51 ` Yonggang Luo
0 siblings, 0 replies; 12+ messages in thread
From: Yonggang Luo @ 2020-10-05 19:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Philippe Mathieu-Daudé, QEMU Trivial,
Paolo Bonzini, Thomas Huth, 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/
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 | 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 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..fc1531ef2b
--- /dev/null
+++ b/scripts/qemu-version.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+#
+# Script for retrieve qemu git version information
+#
+# Author: Yonggang Luo <luoyonggang@gmail.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2. See
+# the COPYING file in the top-level directory.
+#
+
+import sys
+import subprocess
+
+def main(args):
+ pkgversion = ''
+ version = ''
+ if len(args) > 3:
+ dir = args[1]
+ pkgversion = args[2]
+ version = args[3]
+ 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 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] 12+ messages in thread
* [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-05 19:51 ` Yonggang Luo
0 siblings, 0 replies; 12+ messages in thread
From: Yonggang Luo @ 2020-10-05 19:51 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 | 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 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..fc1531ef2b
--- /dev/null
+++ b/scripts/qemu-version.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+
+#
+# Script for retrieve qemu git version information
+#
+# Author: Yonggang Luo <luoyonggang@gmail.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2. See
+# the COPYING file in the top-level directory.
+#
+
+import sys
+import subprocess
+
+def main(args):
+ pkgversion = ''
+ version = ''
+ if len(args) > 3:
+ dir = args[1]
+ pkgversion = args[2]
+ version = args[3]
+ 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 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] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-05 19:51 ` Yonggang Luo
@ 2020-10-05 20:00 ` Marc-André Lureau
-1 siblings, 0 replies; 12+ messages in thread
From: Marc-André Lureau @ 2020-10-05 20:00 UTC (permalink / raw)
To: Yonggang Luo
Cc: QEMU, Peter Maydell, Thomas Huth, QEMU Trivial,
Philippe Mathieu-Daudé, Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 3581 bytes --]
On Mon, Oct 5, 2020 at 11:52 PM 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
>
lgtm
Reviewed-by: Marc-André Lureau <marcandre.lureau@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 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..fc1531ef2b
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/usr/bin/env python3
> +
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
> +#
> +
> +import sys
> +import subprocess
> +
> +def main(args):
> + pkgversion = ''
> + version = ''
> + if len(args) > 3:
> + dir = args[1]
> + pkgversion = args[2]
> + version = args[3]
> + 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 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
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 5117 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-05 20:00 ` Marc-André Lureau
0 siblings, 0 replies; 12+ messages in thread
From: Marc-André Lureau @ 2020-10-05 20:00 UTC (permalink / raw)
To: Yonggang Luo
Cc: Peter Maydell, Thomas Huth, QEMU Trivial, QEMU,
Philippe Mathieu-Daudé, Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 3581 bytes --]
On Mon, Oct 5, 2020 at 11:52 PM 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
>
lgtm
Reviewed-by: Marc-André Lureau <marcandre.lureau@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 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..fc1531ef2b
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/usr/bin/env python3
> +
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
> +#
> +
> +import sys
> +import subprocess
> +
> +def main(args):
> + pkgversion = ''
> + version = ''
> + if len(args) > 3:
> + dir = args[1]
> + pkgversion = args[2]
> + version = args[3]
> + 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 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
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 5117 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-05 19:51 ` Yonggang Luo
@ 2020-10-06 7:43 ` Paolo Bonzini
-1 siblings, 0 replies; 12+ messages in thread
From: Paolo Bonzini @ 2020-10-06 7:43 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: Peter Maydell, Philippe Mathieu-Daudé, QEMU Trivial,
Thomas Huth
On 05/10/20 21:51, 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 | 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 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..fc1531ef2b
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/usr/bin/env python3
> +
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
> +#
> +
> +import sys
> +import subprocess
> +
> +def main(args):
> + pkgversion = ''
> + version = ''
> + if len(args) > 3:
> + dir = args[1]
> + pkgversion = args[2]
> + version = args[3]
> + 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 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)
Can you apply the changes I suggested in v2?
Paolo
> 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
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-06 7:43 ` Paolo Bonzini
0 siblings, 0 replies; 12+ messages in thread
From: Paolo Bonzini @ 2020-10-06 7:43 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: QEMU Trivial, Peter Maydell, Thomas Huth,
Philippe Mathieu-Daudé
On 05/10/20 21:51, 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 | 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 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..fc1531ef2b
> --- /dev/null
> +++ b/scripts/qemu-version.py
> @@ -0,0 +1,37 @@
> +#!/usr/bin/env python3
> +
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
> +#
> +
> +import sys
> +import subprocess
> +
> +def main(args):
> + pkgversion = ''
> + version = ''
> + if len(args) > 3:
> + dir = args[1]
> + pkgversion = args[2]
> + version = args[3]
> + 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 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)
Can you apply the changes I suggested in v2?
Paolo
> 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
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-05 19:51 ` Yonggang Luo
@ 2020-10-06 10:33 ` Peter Maydell
-1 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2020-10-06 10:33 UTC (permalink / raw)
To: Yonggang Luo
Cc: QEMU Developers, Philippe Mathieu-Daudé, QEMU Trivial,
Paolo Bonzini, Thomas Huth
On Mon, 5 Oct 2020 at 20:51, 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
Does this have to be GPL-v2-only ? We strongly prefer
v2-or-later...
thanks
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-06 10:33 ` Peter Maydell
0 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2020-10-06 10:33 UTC (permalink / raw)
To: Yonggang Luo
Cc: QEMU Trivial, Paolo Bonzini, Thomas Huth, QEMU Developers,
Philippe Mathieu-Daudé
On Mon, 5 Oct 2020 at 20:51, 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/
>
> Testing args length and if not enough, setting pkgversion and version to ''
>
> +#
> +# Script for retrieve qemu git version information
> +#
> +# Author: Yonggang Luo <luoyonggang@gmail.com>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2. See
> +# the COPYING file in the top-level directory.
Does this have to be GPL-v2-only ? We strongly prefer
v2-or-later...
thanks
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-06 10:33 ` Peter Maydell
@ 2020-10-06 11:04 ` 罗勇刚(Yonggang Luo)
-1 siblings, 0 replies; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-10-06 11:04 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Developers, Philippe Mathieu-Daudé, QEMU Trivial,
Paolo Bonzini, Thomas Huth
[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]
On Tue, Oct 6, 2020 at 6:33 PM Peter Maydell <peter.maydell@linaro.org>
wrote:
>
> On Mon, 5 Oct 2020 at 20:51, 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/
> >
> > Testing args length and if not enough, setting pkgversion and version
to ''
> >
> > +#
> > +# Script for retrieve qemu git version information
> > +#
> > +# Author: Yonggang Luo <luoyonggang@gmail.com>
> > +#
> > +# This work is licensed under the terms of the GNU GPL, version 2. See
> > +# the COPYING file in the top-level directory.
>
> Does this have to be GPL-v2-only ? We strongly prefer
> v2-or-later...
Directly copy from other python script, do you have a template for this?
>
> thanks
> -- PMM
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-06 11:04 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-10-06 11:04 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Trivial, Paolo Bonzini, Thomas Huth, QEMU Developers,
Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]
On Tue, Oct 6, 2020 at 6:33 PM Peter Maydell <peter.maydell@linaro.org>
wrote:
>
> On Mon, 5 Oct 2020 at 20:51, 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/
> >
> > Testing args length and if not enough, setting pkgversion and version
to ''
> >
> > +#
> > +# Script for retrieve qemu git version information
> > +#
> > +# Author: Yonggang Luo <luoyonggang@gmail.com>
> > +#
> > +# This work is licensed under the terms of the GNU GPL, version 2. See
> > +# the COPYING file in the top-level directory.
>
> Does this have to be GPL-v2-only ? We strongly prefer
> v2-or-later...
Directly copy from other python script, do you have a template for this?
>
> thanks
> -- PMM
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
2020-10-06 11:04 ` 罗勇刚(Yonggang Luo)
@ 2020-10-06 11:57 ` Markus Armbruster
-1 siblings, 0 replies; 12+ messages in thread
From: Markus Armbruster @ 2020-10-06 11:57 UTC (permalink / raw)
To: luoyonggang
Cc: Peter Maydell, QEMU Trivial, Paolo Bonzini, Thomas Huth,
QEMU Developers, Philippe Mathieu-Daudé
罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> writes:
> On Tue, Oct 6, 2020 at 6:33 PM Peter Maydell <peter.maydell@linaro.org>
> wrote:
>>
>> On Mon, 5 Oct 2020 at 20:51, 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/
>> >
>> > Testing args length and if not enough, setting pkgversion and version
> to ''
>> >
>> > +#
>> > +# Script for retrieve qemu git version information
>> > +#
>> > +# Author: Yonggang Luo <luoyonggang@gmail.com>
>> > +#
>> > +# This work is licensed under the terms of the GNU GPL, version 2. See
>> > +# the COPYING file in the top-level directory.
>>
>> Does this have to be GPL-v2-only ? We strongly prefer
>> v2-or-later...
> Directly copy from other python script, do you have a template for this?
Copy from scripts/qapi-gen.py:
# This work is licensed under the terms of the GNU GPL, version 2 or later.
# See the COPYING file in the top-level directory.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py
@ 2020-10-06 11:57 ` Markus Armbruster
0 siblings, 0 replies; 12+ messages in thread
From: Markus Armbruster @ 2020-10-06 11:57 UTC (permalink / raw)
To: luoyonggang
Cc: Peter Maydell, Thomas Huth, QEMU Trivial,
Philippe Mathieu-Daudé, QEMU Developers, Paolo Bonzini
罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> writes:
> On Tue, Oct 6, 2020 at 6:33 PM Peter Maydell <peter.maydell@linaro.org>
> wrote:
>>
>> On Mon, 5 Oct 2020 at 20:51, 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/
>> >
>> > Testing args length and if not enough, setting pkgversion and version
> to ''
>> >
>> > +#
>> > +# Script for retrieve qemu git version information
>> > +#
>> > +# Author: Yonggang Luo <luoyonggang@gmail.com>
>> > +#
>> > +# This work is licensed under the terms of the GNU GPL, version 2. See
>> > +# the COPYING file in the top-level directory.
>>
>> Does this have to be GPL-v2-only ? We strongly prefer
>> v2-or-later...
> Directly copy from other python script, do you have a template for this?
Copy from scripts/qapi-gen.py:
# This work is licensed under the terms of the GNU GPL, version 2 or later.
# See the COPYING file in the top-level directory.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-10-06 11:58 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-05 19:51 [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py Yonggang Luo
2020-10-05 19:51 ` Yonggang Luo
2020-10-05 20:00 ` Marc-André Lureau
2020-10-05 20:00 ` Marc-André Lureau
2020-10-06 7:43 ` Paolo Bonzini
2020-10-06 7:43 ` Paolo Bonzini
2020-10-06 10:33 ` Peter Maydell
2020-10-06 10:33 ` Peter Maydell
2020-10-06 11:04 ` 罗勇刚(Yonggang Luo)
2020-10-06 11:04 ` 罗勇刚(Yonggang Luo)
2020-10-06 11:57 ` Markus Armbruster
2020-10-06 11:57 ` Markus Armbruster
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.