| Message ID | 20201006112139.700-1-luoyonggang@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v5] scripts: Convert qemu-version.sh to qemu-version.py | expand |
On 06/10/20 13:21, 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 | 31 +++++++++++++++++++++++++++++++ > scripts/qemu-version.sh | 25 ------------------------- > 3 files changed, 32 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..e6eb548220 > --- /dev/null > +++ b/scripts/qemu-version.py > @@ -0,0 +1,31 @@ > +#!/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 > + > +def main(_program, dir, pkgversion, version, *unused): > + 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 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 > Queued, thanks. Paolo
On 06/10/20 13:21, 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 | 31 +++++++++++++++++++++++++++++++ > scripts/qemu-version.sh | 25 ------------------------- > 3 files changed, 32 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..e6eb548220 > --- /dev/null > +++ b/scripts/qemu-version.py > @@ -0,0 +1,31 @@ > +#!/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 > + > +def main(_program, dir, pkgversion, version, *unused): > + 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 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 > Hmm it still doesn't check for a ".git" directory. I'll fix it up, but please pay more attention to the reviews. Paolo
On Tue, Oct 6, 2020 at 7:34 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 06/10/20 13:21, 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 | 31 +++++++++++++++++++++++++++++++ > > scripts/qemu-version.sh | 25 ------------------------- > > 3 files changed, 32 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..e6eb548220 > > --- /dev/null > > +++ b/scripts/qemu-version.py > > @@ -0,0 +1,31 @@ > > +#!/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 > > + > > +def main(_program, dir, pkgversion, version, *unused): > > + 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 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 > > > > Hmm it still doesn't check for a ".git" directory. I'll fix it up, but > please pay more attention to the reviews. Oh sorry for that I didn't explain that, I am using stderr=subprocess.DEVNULL to supress git error, so if git failed then it does nothing But after deep though, with .git check are more safe > > Paolo > -- 此致 礼 罗勇刚 Yours sincerely, Yonggang Luo <div dir="ltr"><br><br>On Tue, Oct 6, 2020 at 7:34 PM Paolo Bonzini <<a href="mailto:pbonzini@redhat.com" target="_blank">pbonzini@redhat.com</a>> wrote:<br>><br>> On 06/10/20 13:21, Yonggang Luo wrote:<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/" target="_blank">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>> > Signed-off-by: Yonggang Luo <<a href="mailto:luoyonggang@gmail.com" target="_blank">luoyonggang@gmail.com</a>><br>> > ---<br>> > meson.build | 2 +-<br>> > scripts/qemu-version.py | 31 +++++++++++++++++++++++++++++++<br>> > scripts/qemu-version.sh | 25 -------------------------<br>> > 3 files changed, 32 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 95a532bd29..20f653b6eb 100644<br>> > --- a/meson.build<br>> > +++ b/meson.build<br>> > @@ -1072,7 +1072,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..e6eb548220<br>> > --- /dev/null<br>> > +++ b/scripts/qemu-version.py<br>> > @@ -0,0 +1,31 @@<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">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>> > +<br>> > +def main(_program, dir, pkgversion, version, *unused):<br>> > + if len(pkgversion) == 0:<br>> > + pc = subprocess.run(['git', 'describe', '--match', "'v*'", '--dirty', '--always'],<br>> > + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, cwd=dir)<br>> > + if pc.returncode == 0:<br>> > + pkgversion = pc.stdout.decode('utf8').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>><br>> Hmm it still doesn't check for a ".git" directory. I'll fix it up, but<br>> please pay more attention to the reviews.<div>Oh sorry for that I didn't explain that, I am using stderr=subprocess.DEVNULL to supress git error, so if git failed then it does nothing</div><div><br></div><div>But after deep though, with .git check are more safe<br>><br>> Paolo<br>><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo</div></div>
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..e6eb548220 --- /dev/null +++ b/scripts/qemu-version.py @@ -0,0 +1,31 @@ +#!/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 + +def main(_program, dir, pkgversion, version, *unused): + 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 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
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 | 31 +++++++++++++++++++++++++++++++ scripts/qemu-version.sh | 25 ------------------------- 3 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 scripts/qemu-version.py delete mode 100755 scripts/qemu-version.sh