| Message ID | 20201007162138.425-1-luoyonggang@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6] scripts: Convert qemu-version.sh to qemu-version.py | expand |
Hi Paolo, the qemu-version script you queued are mis removed the quote of "'v*'", that's would cause the building of qemu failed. please queue this instead. I also revised the commit message On Thu, Oct 8, 2020 at 12:21 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/ > > The quote of v* should preserve, otherwise git command would fail > > 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 | 34 ++++++++++++++++++++++++++++++++++ > scripts/qemu-version.sh | 25 ------------------------- > 3 files changed, 35 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..019911b270 > --- /dev/null > +++ b/scripts/qemu-version.py > @@ -0,0 +1,34 @@ > +#!/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 > + > +def main(_program, dir, pkgversion, version, *unused): > + os.chdir(dir) > + if not pkgversion and os.path.exists('.git'): > + # The quote of v* should preserve, otherwise git command would fail > + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'], > + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, encoding='utf8') > + 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 > -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr">Hi Paolo, the qemu-version script you queued are mis removed the quote of "'v*'", that's<div>would cause the building of qemu failed.</div><div>please queue this instead.</div><div>I also revised the commit message<br><div><br>On Thu, Oct 8, 2020 at 12:21 AM Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> wrote:<br>><br>> The sh script are harder to maintain for compatible different<br>> xsh environment so convert it to python script<br>> Also incorporate the fixes in<br>> <a href="https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/">https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/</a><br>><br>> The quote of v* should preserve, otherwise git command would fail<br>><br>> Signed-off-by: Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>><br>> Message-Id: <<a href="mailto:20201006112139.700-1-luoyonggang@gmail.com">20201006112139.700-1-luoyonggang@gmail.com</a>><br>> Signed-off-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>><br>> ---<br>> meson.build | 2 +-<br>> scripts/qemu-version.py | 34 ++++++++++++++++++++++++++++++++++<br>> scripts/qemu-version.sh | 25 -------------------------<br>> 3 files changed, 35 insertions(+), 26 deletions(-)<br>> create mode 100644 scripts/qemu-version.py<br>> delete mode 100755 scripts/qemu-version.sh<br>><br>> diff --git a/meson.build b/meson.build<br>> index 26230614ba..1d3bb25bc6 100644<br>> --- a/meson.build<br>> +++ b/meson.build<br>> @@ -1132,7 +1132,7 @@ tracetool = [<br>> '--backend=' + config_host['TRACE_BACKENDS']<br>> ]<br>><br>> -qemu_version_cmd = [find_program('scripts/qemu-version.sh'),<br>> +qemu_version_cmd = [find_program('scripts/qemu-version.py'),<br>> meson.current_source_dir(),<br>> config_host['PKGVERSION'], meson.project_version()]<br>> qemu_version = custom_target('qemu-version.h',<br>> diff --git a/scripts/qemu-version.py b/scripts/qemu-version.py<br>> new file mode 100644<br>> index 0000000000..019911b270<br>> --- /dev/null<br>> +++ b/scripts/qemu-version.py<br>> @@ -0,0 +1,34 @@<br>> +#!/usr/bin/env python3<br>> +<br>> +#<br>> +# Script for retrieve qemu git version information<br>> +#<br>> +# Authors:<br>> +# Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>><br>> +#<br>> +# This work is licensed under the terms of the GNU GPL, version 2<br>> +# or, at your option, any later version. See the COPYING file in<br>> +# the top-level directory.<br>> +<br>> +import sys<br>> +import subprocess<br>> +import os, os.path<br>> +<br>> +def main(_program, dir, pkgversion, version, *unused):<br>> + os.chdir(dir)<br>> + if not pkgversion and os.path.exists('.git'):<br>> + # The quote of v* should preserve, otherwise git command would fail<br>> + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],<br>> + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, encoding='utf8')<br>> + if pc.returncode == 0:<br>> + pkgversion = pc.stdout.strip()<br>> +<br>> + fullversion = version<br>> + if pkgversion:<br>> + fullversion = "{} ({})".format(version, pkgversion)<br>> +<br>> + print('#define QEMU_PKGVERSION "%s"' % pkgversion)<br>> + print('#define QEMU_FULL_VERSION "%s"' % fullversion)<br>> +<br>> +if __name__ == "__main__":<br>> + main(*sys.argv)<br>> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh<br>> deleted file mode 100755<br>> index 03128c56a2..0000000000<br>> --- a/scripts/qemu-version.sh<br>> +++ /dev/null<br>> @@ -1,25 +0,0 @@<br>> -#!/bin/sh<br>> -<br>> -set -eu<br>> -<br>> -dir="$1"<br>> -pkgversion="$2"<br>> -version="$3"<br>> -<br>> -if [ -z "$pkgversion" ]; then<br>> - cd "$dir"<br>> - if [ -e .git ]; then<br>> - pkgversion=$(git describe --match 'v*' --dirty | echo "")<br>> - fi<br>> -fi<br>> -<br>> -if [ -n "$pkgversion" ]; then<br>> - fullversion="$version ($pkgversion)"<br>> -else<br>> - fullversion="$version"<br>> -fi<br>> -<br>> -cat <<EOF<br>> -#define QEMU_PKGVERSION "$pkgversion"<br>> -#define QEMU_FULL_VERSION "$fullversion"<br>> -EOF<br>> --<br>> 2.28.0.windows.1<br>><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div></div>
On 07/10/20 18:23, 罗勇刚(Yonggang Luo) wrote: >> + if not pkgversion and os.path.exists('.git'): >> + # The quote of v* should preserve, otherwise git command > would fail >> + pc = subprocess.run(['git', 'describe', '--match', "'v*'", > '--dirty', '--always'], >> + stdout=subprocess.PIPE, > stderr=subprocess.DEVNULL, encoding='utf8') It's a total mess. On Linux, if you use 'v*' git is invoked with an argument that looks like 'v*', that is as if you used \'v\*\' on bash. On Windows, wildcard expansion is done by the program so you need to pass a quoted value to stop the wildcard expansion. I have no idea how to fix it. Probably it can be made to work using a string argument and "shell=True", but at this point it makes more sense to keep the shell script version. Paolo
Patchew URL: https://patchew.org/QEMU/20201007162138.425-1-luoyonggang@gmail.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20201007162138.425-1-luoyonggang@gmail.com Subject: [PATCH v6] 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/20201007162138.425-1-luoyonggang@gmail.com -> patchew/20201007162138.425-1-luoyonggang@gmail.com Switched to a new branch 'test' c1c6c9c scripts: Convert qemu-version.sh to qemu-version.py === OUTPUT BEGIN === WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #33: new file mode 100644 WARNING: line over 80 characters #58: FILE: scripts/qemu-version.py:21: + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'], ERROR: line over 90 characters #59: FILE: scripts/qemu-version.py:22: + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, encoding='utf8') total: 1 errors, 2 warnings, 42 lines checked Commit c1c6c9c04349 (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/20201007162138.425-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
On Thu, Oct 8, 2020 at 12:43 AM Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 07/10/20 18:23, 罗勇刚(Yonggang Luo) wrote: > >> + if not pkgversion and os.path.exists('.git'): > >> + # The quote of v* should preserve, otherwise git command > > would fail > >> + pc = subprocess.run(['git', 'describe', '--match', "'v*'", > > '--dirty', '--always'], > >> + stdout=subprocess.PIPE, > > stderr=subprocess.DEVNULL, encoding='utf8') > > It's a total mess. > > On Linux, if you use 'v*' git is invoked with an argument that looks > like 'v*', that is as if you used \'v\*\' on bash. > > On Windows, wildcard expansion is done by the program so you need to > pass a quoted value to stop the wildcard expansion. > > I have no idea how to fix it. Probably it can be made to work using a > string argument and "shell=True", but at this point it makes more sense > to keep the shell script version. Even though the shell script version are work, but it's not working in good shape, when I running the shell script, it's executed very slow, and so with python shell=True, I guess it's because the v* character cause the program doing a lot IO operation. So i still think '--match=v*' is a better solution, filename with --match=v123 are rare, even sart with -- are rare. so this is acceptable, and also I've creating a pull request on python to resolve this issue completely https://github.com/python/cpython/pull/22590 > > Paolo > -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr"><br><br>On Thu, Oct 8, 2020 at 12:43 AM Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>> wrote:<br>><br>> On 07/10/20 18:23, 罗勇刚(Yonggang Luo) wrote:<br>> >> + if not pkgversion and os.path.exists('.git'):<br>> >> + # The quote of v* should preserve, otherwise git command<br>> > would fail<br>> >> + pc = subprocess.run(['git', 'describe', '--match', "'v*'",<br>> > '--dirty', '--always'],<br>> >> + stdout=subprocess.PIPE,<br>> > stderr=subprocess.DEVNULL, encoding='utf8')<br>><br>> It's a total mess.<br>><br>> On Linux, if you use 'v*' git is invoked with an argument that looks<br>> like 'v*', that is as if you used \'v\*\' on bash.<br>><br>> On Windows, wildcard expansion is done by the program so you need to<br>> pass a quoted value to stop the wildcard expansion.<br>><br>> I have no idea how to fix it. Probably it can be made to work using a<br>> string argument and "shell=True", but at this point it makes more sense<br>> to keep the shell script version.<div>Even though the shell script version are work, but it's not working in good shape, when I running</div><div>the shell script, it's executed very slow, and so with python shell=True, I guess it's because</div><div>the v* character cause the program doing a lot IO operation. So i still think </div><div>'--match=v*' is a better solution, filename with --match=v123 are rare, even sart with -- are rare.</div><div>so this is acceptable, and also I've creating a pull request on python to resolve this issue completely</div><div><a href="https://github.com/python/cpython/pull/22590">https://github.com/python/cpython/pull/22590</a><br>><br>> Paolo<br>><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div>
On Wed, 7 Oct 2020 at 17:43, Paolo Bonzini <pbonzini@redhat.com> wrote: > I have no idea how to fix it. Probably it can be made to work using a > string argument and "shell=True", but at this point it makes more sense > to keep the shell script version. If you're keeping the shell script version could you queue the bugfix patch to it? https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/ thanks -- PMM
Il mer 7 ott 2020, 21:18 Peter Maydell <peter.maydell@linaro.org> ha scritto: > > I have no idea how to fix it. Probably it can be made to work using a > > string argument and "shell=True", but at this point it makes more sense > > to keep the shell script version. > > If you're keeping the shell script version could you queue > the bugfix patch to it? > Yes, I did. Thanks, Paolo > > https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/ > > thanks > -- PMM > > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il mer 7 ott 2020, 21:18 Peter Maydell <<a href="mailto:peter.maydell@linaro.org">peter.maydell@linaro.org</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">> I have no idea how to fix it. Probably it can be made to work using a<br> > string argument and "shell=True", but at this point it makes more sense<br> > to keep the shell script version.<br> <br> If you're keeping the shell script version could you queue<br> the bugfix patch to it?<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Yes, I did.</div><div dir="auto"><br></div><div dir="auto">Thanks,</div><div dir="auto"><br></div><div dir="auto">Paolo</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> <a href="https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/" rel="noreferrer noreferrer" target="_blank">https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/</a><br> <br> thanks<br> -- PMM<br> <br> </blockquote></div></div></div>
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..019911b270 --- /dev/null +++ b/scripts/qemu-version.py @@ -0,0 +1,34 @@ +#!/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 + +def main(_program, dir, pkgversion, version, *unused): + os.chdir(dir) + if not pkgversion and os.path.exists('.git'): + # The quote of v* should preserve, otherwise git command would fail + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, encoding='utf8') + 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