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 4C815C41604 for ; Tue, 6 Oct 2020 07:48:47 +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 9754320760 for ; Tue, 6 Oct 2020 07:48:46 +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="Aw9uXZSy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9754320760 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]:39822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPhiF-0002eX-SB for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 03:48:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPhd7-0005Jw-Tt for qemu-devel@nongnu.org; Tue, 06 Oct 2020 03:43:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPhd5-0003Cf-3u for qemu-devel@nongnu.org; Tue, 06 Oct 2020 03:43:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601970201; 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=42beawBw5KhBW4GEpH6o392CQfSZGLffzjgdNgIBlcU=; b=Aw9uXZSyiOkVUNsiwQKH+2O7M7jKt7KXA4QAfCiQtlNhWkxsIF0OmPxFolIUn0umHDYjTH unaZPUlWzAN+G26jHq/RYwBeJ1mjXjHTdHoqH8N2CCihXdNsng0C8V71EvE8AJLxMQkXgi /Kn1VcxF/NQeYUq1Kkn9ts5Qt9awhvg= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-401-z7IqRVPmNtOgWK5fAHsfqw-1; Tue, 06 Oct 2020 03:43:18 -0400 X-MC-Unique: z7IqRVPmNtOgWK5fAHsfqw-1 Received: by mail-wm1-f70.google.com with SMTP id f2so394631wml.6 for ; Tue, 06 Oct 2020 00:43:18 -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=42beawBw5KhBW4GEpH6o392CQfSZGLffzjgdNgIBlcU=; b=LP6/HYlQUJ94BgHn6HxXf/ON3YSASGy4l+BsctUhDmXfXlyHiN8sT4xjNCIYIfwita 2yl/mL2Ctlg1TrO0U8m+gcDVEShhhFthxcbI61O6q8QYA7ImHaO/PS5n+GAQlxTFINWv t1VtDw+rz+woa+LjrGUq/C4LqMkG5unS82FN6zFTcJQ3FZLFft0Di+G4WIeLA4hboJBg c1HsI0UmsnM5stm95AuMhpQpKKvxAqX2+FkeWAUgEOANVphF3qYIRY42of6DL6avO73/ PDzJAVheuVLv8WshWccim1/Aj2E4gRX7Yz70uzojsmn9nINn+bdA50YDocuVVQaH2tFi ZmXA== X-Gm-Message-State: AOAM533obVeWRVPJoWCMuah49sa5Wcbrrdlg0V00Xi/wgLwYLYgo4fj5 IS8kVWdRTVkefdXbrZ07OGnxg0w2NBJQAefvl71jJbqWjoq9KUpvmDs8PpBaZZ1/jWKDEW1ZQGM sCji50yu6Ejyz5/Y= X-Received: by 2002:a1c:4e0e:: with SMTP id g14mr459790wmh.69.1601970197393; Tue, 06 Oct 2020 00:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbKa4t9GLjeBaB4C5E7NJdow4bS4hu1RHicA4HEOY1LpgAZm3qfuZP79sP8OwZZkeWyySXWQ== X-Received: by 2002:a1c:4e0e:: with SMTP id g14mr459770wmh.69.1601970197162; Tue, 06 Oct 2020 00:43:17 -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 w7sm2583449wmc.43.2020.10.06.00.43.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Oct 2020 00:43:16 -0700 (PDT) Subject: Re: [PATCH v3] scripts: Convert qemu-version.sh to qemu-version.py To: Yonggang Luo , qemu-devel@nongnu.org References: <20201005195129.1507-1-luoyonggang@gmail.com> From: Paolo Bonzini Message-ID: Date: Tue, 6 Oct 2020 09:43:18 +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: <20201005195129.1507-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=216.205.24.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 00:55:20 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_H4=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=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > --- > 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 > +# > +# 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 < -#define QEMU_PKGVERSION "$pkgversion" > -#define QEMU_FULL_VERSION "$fullversion" > -EOF >