From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9F6EC4363D for ; Tue, 6 Oct 2020 11:36:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 458172078E for ; Tue, 6 Oct 2020 11:36:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RUbUeWR3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 458172078E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPlGp-0003Ed-0L for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 07:36:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPlEZ-0001QZ-W7 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:34:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPlEX-00084A-OH for qemu-devel@nongnu.org; Tue, 06 Oct 2020 07:34:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601984057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gJyvbLDNu+d+c/zI7H5aK0+b2ctGwhtVvqaTeLeClss=; b=RUbUeWR3kM59EYwBW8a6ePij4fSOpWQxhHCft682hA4jA3stV6cbIIClDhqbIqwiQLZk8Y l3P4GG2g6pEKTRDK5I/pHJTt0TNxZo1remNYbCodnZIrNbG1kZTk4EYw1AfRpKMlkfBas4 EKtAzkcZPpEHEcYvRgTTHGMRN2F25zA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-o4fHGxA8Pxq2MwPsNYnmCg-1; Tue, 06 Oct 2020 07:34:15 -0400 X-MC-Unique: o4fHGxA8Pxq2MwPsNYnmCg-1 Received: by mail-wr1-f72.google.com with SMTP id v12so5244262wrm.9 for ; Tue, 06 Oct 2020 04:34:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=gJyvbLDNu+d+c/zI7H5aK0+b2ctGwhtVvqaTeLeClss=; b=n5t1qg8PUYn3qwT8JVzFZNrUZKfLFHHVqtPakTrJnBVKier635FOmFJlS2+zB6LfSb PHSgiotDjgml66K+zBxGI2Z/Qivk000en271+8wdKrw+gLHMYEbqJEZaj3Xf9jrV1N+z GLxUwJYfBjSI9HNhgN9ncLjeIQX0mdPXZmiuz7zAGGGk8mQkmj326eCfO+z3qq/KqvUL w/3QHajIMq7R2PVNlaDEZH6FX0giM8OFVsie4ttfwBv4zqAES2TkQ2o/NFjNE5rP5yq6 Se3LKNeEpg+HQnj5HQdwC7OZP/sUxPmHEz7epGbF/O9+VcwR147ftQTPmGWVMpdDWX7K LgZw== X-Gm-Message-State: AOAM531b7WESbOx+CfJHml97ouQqLcm2Ge5UETtXmrc9pRrGgLyaP+uo UEjEtLnlBR2aTDwtPeXxDX7bReOnws3Gh7/elpp/JZeM26WmErPct9Sg3nHtPVJ3/tl2QYqGavT EqTCUFTBYQCc9LWI= X-Received: by 2002:a5d:67c2:: with SMTP id n2mr4222784wrw.4.1601984053985; Tue, 06 Oct 2020 04:34:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEztE/PGa9UvgUzIic3I0JUq3bond3JPbdpgcGqyLnNMX+drrRHuqk24hi1m1REZKjI/IpFA== X-Received: by 2002:a5d:67c2:: with SMTP id n2mr4222770wrw.4.1601984053759; Tue, 06 Oct 2020 04:34:13 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:5aca:cd0b:c4a1:9c2e? ([2001:b07:6468:f312:5aca:cd0b:c4a1:9c2e]) by smtp.gmail.com with ESMTPSA id z191sm3691594wme.40.2020.10.06.04.34.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Oct 2020 04:34:13 -0700 (PDT) Subject: Re: [PATCH v5] scripts: Convert qemu-version.sh to qemu-version.py To: Yonggang Luo , qemu-devel@nongnu.org References: <20201006112139.700-1-luoyonggang@gmail.com> From: Paolo Bonzini Message-ID: Date: Tue, 6 Oct 2020 13:34:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201006112139.700-1-luoyonggang@gmail.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 01:55:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , Peter Maydell , Thomas Huth , =?UTF-8?Q?Philippe_Mathieu-Daud=e8=8c=85?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > --- > 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 > +# > +# 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 < -#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