| Message ID | 20201005195129.1507-1-luoyonggang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] scripts: Convert qemu-version.sh to qemu-version.py | expand |
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 > > >
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 >
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
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 <div dir="ltr"><br><br>On Tue, Oct 6, 2020 at 6:33 PM Peter Maydell <<a href="mailto:peter.maydell@linaro.org">peter.maydell@linaro.org</a>> wrote:<br>><br>> On Mon, 5 Oct 2020 at 20:51, 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>> > Testing args length and if not enough, setting pkgversion and version to ''<br>> ><br>> > +#<br>> > +# Script for retrieve qemu git version information<br>> > +#<br>> > +# Author: 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. See<br>> > +# the COPYING file in the top-level directory.<br>><br>> Does this have to be GPL-v2-only ? We strongly prefer<br>> v2-or-later...<div>Directly copy from other python script, do you have a template for this?<br>><br>> thanks<br>> -- PMM<br><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div>
罗勇刚(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.
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
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