| Message ID | 20201017164329.1634-1-luoyonggang@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v11] scripts: Convert qemu-version.sh to qemu-version.py | expand |
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 <div dir="ltr"><br><br>On Sun, Oct 18, 2020 at 12:43 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>> According to <a href="https://github.com/msys2/MSYS2-packages/issues/2176">https://github.com/msys2/MSYS2-packages/issues/2176</a><br>> We need use CYGWIN=noglob and MSYS=noglob in the environment variable<br>> for disable wildcard expanding in msys or cygwin git, and setting the shell=False<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 | 37 +++++++++++++++++++++++++++++++++++++<br>> scripts/qemu-version.sh | 25 -------------------------<br>> 3 files changed, 38 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 05fb59a00b..b100b6d7be 100644<br>> --- a/meson.build<br>> +++ b/meson.build<br>> @@ -1240,7 +1240,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..cf97b2bbb5<br>> --- /dev/null<br>> +++ b/scripts/qemu-version.py<br>> @@ -0,0 +1,37 @@<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<br>> +import 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>> + pc = subprocess.run(<br>> + ['git', 'describe', '--match', 'v*', '--dirty', '--always'],<br>> + env=dict(os.environ, CYGWIN="noglob", MSYS='noglob'),<div>Sorry for disturb, under msys2, use env=dict(os.environ, CYGWIN="noglob", MSYS='noglob') we make sure</div><div>'v*‘ are passed into git without wildcard. So I send this patch again for fixes this issue<br>> + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,<br>> + encoding='utf8', shell=False)<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 3f6e7e6d41..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) || :<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>
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 > > <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il sab 17 ott 2020, 18:43 Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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/" rel="noreferrer noreferrer" target="_blank">https://patchew.org/QEMU/20200929143654.518157-1-marcandre.lureau@redhat.com/</a><br> <br> According to <a href="https://github.com/msys2/MSYS2-packages/issues/2176" rel="noreferrer noreferrer" target="_blank">https://github.com/msys2/MSYS2-packages/issues/2176</a><br> We need use CYGWIN=noglob and MSYS=noglob in the environment variable<br> for disable wildcard expanding in msys or cygwin git, and setting the shell=False<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">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.</div><div dir="auto"><br></div><div dir="auto">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.</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> Signed-off-by: Yonggang Luo <<a href="mailto:luoyonggang@gmail.com" target="_blank" rel="noreferrer">luoyonggang@gmail.com</a>><br> Message-Id: <<a href="mailto:20201006112139.700-1-luoyonggang@gmail.com" target="_blank" rel="noreferrer">20201006112139.700-1-luoyonggang@gmail.com</a>><br> Signed-off-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com" target="_blank" rel="noreferrer">pbonzini@redhat.com</a>><br> ---<br> meson.build | 2 +-<br> scripts/qemu-version.py | 37 +++++++++++++++++++++++++++++++++++++<br> scripts/qemu-version.sh | 25 -------------------------<br> 3 files changed, 38 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 05fb59a00b..b100b6d7be 100644<br> --- a/meson.build<br> +++ b/meson.build<br> @@ -1240,7 +1240,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..cf97b2bbb5<br> --- /dev/null<br> +++ b/scripts/qemu-version.py<br> @@ -0,0 +1,37 @@<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" target="_blank" rel="noreferrer">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<br> +import 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> + pc = subprocess.run(<br> + ['git', 'describe', '--match', 'v*', '--dirty', '--always'],<br> + env=dict(os.environ, CYGWIN="noglob", MSYS='noglob'),<br> + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,<br> + encoding='utf8', shell=False)<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 3f6e7e6d41..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) || :<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> </blockquote></div></div></div>
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