| Message ID | 20201007195934.297-1-luoyonggang@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v10] scripts: Convert qemu-version.sh to qemu-version.py | expand |
You won't hear no for an answer, right?... Paolo Il mer 7 ott 2020, 22:00 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/ > > Using v\\* on Windows and v* on other platform for matching version. > Tested under Ubuntu/msys2/mingw. > > 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 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..063b3720f7 > --- /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, os.path > +import platform > + > +def main(_program, dir, pkgversion, version, *unused): > + os.chdir(dir) > + if not pkgversion and os.path.exists('.git'): > + match_expression = 'v\\*' if platform.system() == 'Windows' else > 'v*' > + pc = subprocess.run(['git', 'describe', '--match', > match_expression, > + '--dirty', '--always'], > + 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 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 > > <div dir="auto"><div>You won't hear no for an answer, right?...<div dir="auto"><br></div><div dir="auto">Paolo</div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il mer 7 ott 2020, 22:00 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> Using v\\* on Windows and v* on other platform for matching version.<br> Tested under Ubuntu/msys2/mingw.<br> <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 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..063b3720f7<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, os.path<br> +import platform<br> +<br> +def main(_program, dir, pkgversion, version, *unused):<br> + os.chdir(dir)<br> + if not pkgversion and os.path.exists('.git'):<br> + match_expression = 'v\\*' if platform.system() == 'Windows' else 'v*'<br> + pc = subprocess.run(['git', 'describe', '--match', match_expression,<br> + '--dirty', '--always'],<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 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> </blockquote></div></div></div>
On Thu, Oct 8, 2020 at 4:31 AM Paolo Bonzini <pbonzini@redhat.com> wrote: > > You won't hear no for an answer, right?... I am trying to figure out the real issue, it's the issue of git, https://github.com/msys2/MSYS2-packages/issues/2176 The windows wildcard can be disabled and git disabled it, didn't know what's happened to the msys's git, but git-for-windows are works fine. > > Paolo > > > Il mer 7 ott 2020, 22:00 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/ >> >> Using v\\* on Windows and v* on other platform for matching version. >> Tested under Ubuntu/msys2/mingw. >> >> 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 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..063b3720f7 >> --- /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, os.path >> +import platform >> + >> +def main(_program, dir, pkgversion, version, *unused): >> + os.chdir(dir) >> + if not pkgversion and os.path.exists('.git'): >> + match_expression = 'v\\*' if platform.system() == 'Windows' else 'v*' >> + pc = subprocess.run(['git', 'describe', '--match', match_expression, >> + '--dirty', '--always'], >> + 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 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"><br>On Thu, Oct 8, 2020 at 4:31 AM Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>> wrote:<br>><br>> You won't hear no for an answer, right?...<div>I am trying to figure out the real issue, it's the issue of git,</div><div><a href="https://github.com/msys2/MSYS2-packages/issues/2176">https://github.com/msys2/MSYS2-packages/issues/2176</a></div><div><br></div><div>The windows wildcard can be disabled and git disabled it, didn't know what's happened to</div><div>the msys's git, but git-for-windows are works fine.<br><br></div><div>><br>> Paolo<br>><br>><br>> Il mer 7 ott 2020, 22:00 Yonggang Luo <<a href="mailto:luoyonggang@gmail.com">luoyonggang@gmail.com</a>> ha scritto:<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>>> Using v\\* on Windows and v* on other platform for matching version.<br>>> Tested under Ubuntu/msys2/mingw.<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 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..063b3720f7<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, os.path<br>>> +import platform<br>>> +<br>>> +def main(_program, dir, pkgversion, version, *unused):<br>>> + os.chdir(dir)<br>>> + if not pkgversion and os.path.exists('.git'):<br>>> + match_expression = 'v\\*' if platform.system() == 'Windows' else 'v*'<br>>> + pc = subprocess.run(['git', 'describe', '--match', match_expression,<br>>> + '--dirty', '--always'],<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 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>
On 07/10/2020 23.51, 罗勇刚(Yonggang Luo) wrote: > > On Thu, Oct 8, 2020 at 4:31 AM Paolo Bonzini <pbonzini@redhat.com > <mailto:pbonzini@redhat.com>> wrote: >> >> You won't hear no for an answer, right?... > I am trying to figure out the real issue, it's the issue of git, > https://github.com/msys2/MSYS2-packages/issues/2176 Can you at least please stop crap-flooding the QEMU mailing list with multiple versions of your patches each day? We are all busy, so nobody is going to review 5 or more iterations of your patches each day. Work on your patches first, make sure that they are working, and only if you think that they are really, really good, then send them to the list. Thanks. Thomas
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..063b3720f7 --- /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, os.path +import platform + +def main(_program, dir, pkgversion, version, *unused): + os.chdir(dir) + if not pkgversion and os.path.exists('.git'): + match_expression = 'v\\*' if platform.system() == 'Windows' else 'v*' + pc = subprocess.run(['git', 'describe', '--match', match_expression, + '--dirty', '--always'], + 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 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