From nobody Wed Apr 24 00:32:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602792769; cv=none; d=zohomail.com; s=zohoarc; b=QNjzqFvy2pjI1VpOHCpnLjYJSVzB9v1BohhSdNX3vBDzGKVHOI4Amou7Z93nI0JPjv8B4Vc8nHsga3+NA3RTOAzFHXF9XgGLCvCz5f1wbYsQRS7kLSjYoqztreHnbfxM4MPF+MlJQHbSv+Wwx46vpn87P04vQ1EYYjdv81FmcrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602792769; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L6PNQoyNWpTKNJhBfsEjGJ+daBNStQN7zXzdYI1k/ZU=; b=cuL/dk2ZQhfOFr+xDpiPHSSPo6HItHUG03VA8fPrLlLbBxHngMNj6EV10t6AHUDvnr2Q4m+KkfwKwRFgJRuSw39I6+zERlxtgxSb2WgfmW8bELqSpmIrCj5/yjlEgAdR0QzypGngSv4nQ/7/4ZP9+QU25TuHvJmBcAgLF54cSMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602792769366740.4509301095233; Thu, 15 Oct 2020 13:12:49 -0700 (PDT) Received: from localhost ([::1]:50078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT9cF-0000Y7-13 for importer@patchew.org; Thu, 15 Oct 2020 16:12:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT9aU-0007H1-R1 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:10:58 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:37506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT9aR-0001jQ-N4 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:10:57 -0400 Received: by mail-pj1-x1032.google.com with SMTP id hk7so61238pjb.2 for ; Thu, 15 Oct 2020 13:10:55 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id x18sm104734pfj.90.2020.10.15.13.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 13:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L6PNQoyNWpTKNJhBfsEjGJ+daBNStQN7zXzdYI1k/ZU=; b=SlvgBTydOnBSFbPQrzidMaR+klmOAHFzPSs6enfkDj9qBPhxC2On+ahU/VV4VqeNQ4 uWvg9hA/bg4qkBl9mCqbASDU23G7v4zuqRPsPVkn+7bRFlYHRtz9xMbDTAOvgeRLThro vsvvj1LSevKQleqfmkZUOl2HCgN03yTkdMV60hGRPkT0vvTbgtfU3Y81vQS0237HLJ6t Y/hMLZUm323HubZTpVC9rQ/if3pcHBaRigkwgc9T7DgQUQ2qxbKaunHTc5fO8KyE2rrP W0XeFIhaOPgbnUBE/Y4IZlHJPcdnMAUFOiWncE9KoUUqcKcNJDAxuaCO+pTMbPK87K4k T8kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L6PNQoyNWpTKNJhBfsEjGJ+daBNStQN7zXzdYI1k/ZU=; b=b6JYkfarzXW5lsRIEmg9+RsWnOBKS2KAsCxbeYiSsQfnh7oL0wbioJUKWvWP/ZZYyJ +TrHuFA/Tsj4WKfroFF9R3U40xrki57EzXXyb6OT+iUQoUVvVeahVrR9gWiFMfHx6uqc n4vCQvRdiY3/2PGMIHcHXq+4ImEWBxBHJQaJK2Uhgv1wfssdZDEBm1isRzDF/6c6kuUL fVrnBY4LcAqsksYo4uroslDX85TlTs5xtvEzFO7Aemt/zXjIUMv2bbBUrnva5Pxx6D7M juKqTIdCvbTXohHVhkZFjXDhseqtLR3EuzZhkbFRtrh+u9rARdM246b1ieKnbTrmc93z ebkQ== X-Gm-Message-State: AOAM531ZzhUt78jbYH4e/Fo7bqSWvXgwgUbZrBxeQXwdChHWyaiJbzoO 6VJieFTtFH6YMc+YvruX/5c4ncKYHhhoGwx5 X-Google-Smtp-Source: ABdhPJwD7IjUOOwhm8Hz6let7tIKP7WmUDjf81V7PBYTmXjEdUvwVu1D5U4MeVQ9KYRW56931hN6wQ== X-Received: by 2002:a17:902:b945:b029:d2:8046:f089 with SMTP id h5-20020a170902b945b02900d28046f089mr212204pls.67.1602792653515; Thu, 15 Oct 2020 13:10:53 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] docs: Fixes build docs on msys2/mingw Date: Fri, 16 Oct 2020 04:10:32 +0800 Message-Id: <20201015201035.1964-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015201035.1964-1-luoyonggang@gmail.com> References: <20201015201035.1964-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1032.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Yonggang Luo --- docs/conf.py | 2 +- docs/sphinx/kerneldoc.py | 2 +- scripts/rst-sanitize.py | 21 +++++++++++++++++++++ tests/qapi-schema/meson.build | 5 +++-- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 scripts/rst-sanitize.py diff --git a/docs/conf.py b/docs/conf.py index 00e1b750e2..e584f68393 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -241,7 +241,7 @@ texinfo_documents =3D [ # We use paths starting from qemu_docdir here so that you can run # sphinx-build from anywhere and the kerneldoc extension can still # find everything. -kerneldoc_bin =3D os.path.join(qemu_docdir, '../scripts/kernel-doc') +kerneldoc_bin =3D ['perl', os.path.join(qemu_docdir, '../scripts/kernel-do= c')] kerneldoc_srctree =3D os.path.join(qemu_docdir, '..') hxtool_srctree =3D os.path.join(qemu_docdir, '..') qapidoc_srctree =3D os.path.join(qemu_docdir, '..') diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py index 3e87940206..3ac277d162 100644 --- a/docs/sphinx/kerneldoc.py +++ b/docs/sphinx/kerneldoc.py @@ -67,7 +67,7 @@ class KernelDocDirective(Directive): =20 def run(self): env =3D self.state.document.settings.env - cmd =3D [env.config.kerneldoc_bin, '-rst', '-enable-lineno'] + cmd =3D env.config.kerneldoc_bin + ['-rst', '-enable-lineno'] =20 filename =3D env.config.kerneldoc_srctree + '/' + self.arguments[0] export_file_patterns =3D [] diff --git a/scripts/rst-sanitize.py b/scripts/rst-sanitize.py new file mode 100644 index 0000000000..26060f1208 --- /dev/null +++ b/scripts/rst-sanitize.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 + +# +# Script for remove cr line ending in file +# +# 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 + +def main(_program, file, *unused): + with open(file, 'rb') as content_file: + content =3D content_file.read() + sys.stdout.buffer.write(content.replace(b'\r', b'')) + +if __name__ =3D=3D "__main__": + main(*sys.argv) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 1f222a7a13..20a7641af8 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -251,18 +251,19 @@ qapi_doc_out =3D custom_target('QAPI rST doc', # using an explicit '\' character in the command arguments to # a custom_target(), as Meson will unhelpfully replace it with a '/' # (https://github.com/mesonbuild/meson/issues/1564) +rst_sanitize_cmd =3D [find_program('../../scripts/rst-sanitize.py'), '@INP= UT@'] qapi_doc_out_nocr =3D custom_target('QAPI rST doc newline-sanitized', output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: build_docs, - command: ['perl', '-pe', '$x =3D chr 13;= s/$x$//', '@INPUT@'], + command: rst_sanitize_cmd, capture: true) =20 qapi_doc_ref_nocr =3D custom_target('QAPI rST doc reference newline-saniti= zed', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: build_docs, - command: ['perl', '-pe', '$x =3D chr 13;= s/$x$//', '@INPUT@'], + command: rst_sanitize_cmd, capture: true) =20 if build_docs --=20 2.28.0.windows.1 From nobody Wed Apr 24 00:32:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602792762; cv=none; d=zohomail.com; s=zohoarc; b=U79i+MtpIG5t8AE+BevmiudD6hfMjJL6uAAIRvNGiPnI1plKYn+SOLjj+27HdPWCSpE63ExTQ6OeUzUSjk5gZQKcCOJya3KZUv2FVry6jZ3N3zJmfQtCpUjIBbnwRyNaNEZcYVB+i7YmDLzqbtnRNhUkClkp9U2fMqPNnQeMxds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602792762; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IkJ+z3wbykhjoUQ4XRK2kASFvDBSvBM63031zcipiFE=; b=KdZJvJVpmO7cogSNW/eVoHZtlZM5jUtllsOI8obvWAy9UAlR/qlSgaNbRAaY/xvTsPWtR0rXn8ZCdailhhF+U85Djh2XNabzzPEogoJeQjY3baYNLeAbgb0YL09ptVURKmorY9tC6+uLLV91IM7loEv+C1R5D2QsJCkPkItVuJw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602792762332560.0660843229682; Thu, 15 Oct 2020 13:12:42 -0700 (PDT) Received: from localhost ([::1]:50050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT9c9-0000XT-1c for importer@patchew.org; Thu, 15 Oct 2020 16:12:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT9aW-0007Hs-4L for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:11:00 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:34888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT9aU-0001jg-HD for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:10:59 -0400 Received: by mail-pl1-x632.google.com with SMTP id 1so2227108ple.2 for ; Thu, 15 Oct 2020 13:10:57 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id x18sm104734pfj.90.2020.10.15.13.10.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 13:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IkJ+z3wbykhjoUQ4XRK2kASFvDBSvBM63031zcipiFE=; b=HL5X5qLCI4zBxi4j5zjUtjwj7ccrDQ8XU/iNOgc/55oL51z8wTX17//PqETkt/5OGu ptILUxLX1oL4wgyMxlL3/J45uMgQfC//TJvYmH7mfwI3DPm77FXK1EdNgE94V0sL3+rL YSKU5v3irM7Ul6lT6uDUh2RSdhrF0GgL7nZzYbhzSjQE/OWsJcVOex+9QkF+P8BxCujP tUpCPmC7yUFsKXXPdxqeWgi71D9HX2B1kmOeQShCFOobWD/pQUZXuarngdM9r3awGg9l USh+a40G19BzwI2S5Qxh6F7LxXEguRfEOuk/e/7mmKsX4aEgvTqeK/LJpzE3NTTuQrKh opqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IkJ+z3wbykhjoUQ4XRK2kASFvDBSvBM63031zcipiFE=; b=pa47bHtrI9fXYMxMzdQV+2pJINR70GZUKNMrea5JaJBAOiWrarDbNjsC+KjsbVFxQ1 2hfAVIq24tqW2N79i//L6AzbKzzQxY4En0KSr+fUIuDq4J5CzJbMezfvzf71bvmvFCO6 M8TC3NJ2ED2XS936adtTce3xom6/xQklN2D5kiWkecQT4TnOXKobf5SAOqJdtI+T8Yar Vy3lOVzp8B/8pPmlyvS2XYvcmjxJvuOpFcFNBXAzBpGELtR6zwQiDGQ8qH5aNHhkf5yt iY6K6ISj9yqUGA48V19M/oWk2R4GsCuKCaPJ/3vQgIhA5O8+aAoMXtvTQGjeAeW+qOCM A1+w== X-Gm-Message-State: AOAM532HgzYLs0EaGGB9Op/EaumA2IMT9Sk0KXsTtzlT+Oq3GI+n4ASL SWTao8vv80+QN61yhxDDjvCfZxWsgU6MfKvz X-Google-Smtp-Source: ABdhPJx77u6YsDtHIS1ogzeA9zHMk/y5fBRXGsR8CUC81EOfHGVGzWe7c//uoP5wbzVSz6ILn3YzcA== X-Received: by 2002:a17:902:6ac1:b029:d3:b4c9:e92f with SMTP id i1-20020a1709026ac1b02900d3b4c9e92fmr398905plt.38.1602792655796; Thu, 15 Oct 2020 13:10:55 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] configure: the docdir option should passed to meson as is. Date: Fri, 16 Oct 2020 04:10:33 +0800 Message-Id: <20201015201035.1964-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015201035.1964-1-luoyonggang@gmail.com> References: <20201015201035.1964-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x632.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Yonggang Luo --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index f839c2a557..1ce31f97b4 100755 --- a/configure +++ b/configure @@ -971,7 +971,7 @@ for opt do ;; --with-suffix=3D*) qemu_suffix=3D"$optarg" ;; - --docdir=3D*) qemu_docdir=3D"$optarg" + --docdir=3D*) docdir=3D"$optarg" ;; --sysconfdir=3D*) sysconfdir=3D"$optarg" ;; @@ -5770,7 +5770,6 @@ fi qemu_confdir=3D"$sysconfdir/$qemu_suffix" qemu_moddir=3D"$libdir/$qemu_suffix" qemu_datadir=3D"$datadir/$qemu_suffix" -qemu_docdir=3D"$docdir/$qemu_suffix" qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.28.0.windows.1 From nobody Wed Apr 24 00:32:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602792913; cv=none; d=zohomail.com; s=zohoarc; b=Bzy7yXAMQfs2Qvfk/jhOZHkHNOfM1/i+PMSGXc7wb9tiddyelHF6W48R1FoX8hOSnEhgn01TzSTtmTf6dABLDMw8hyi/ifEKYn+pITU5ZQ+smpVnnn0KZvugH4FNs/KaPD3M/xWmgFpDADxpfZd6pnMW8eWt0hWf+pqQM7hBU1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602792913; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CzNs/YN8L1Kjuoo27oaR8flYu8s2Nc26UZiNRlhmaFI=; b=YaLrNng58O5JsP6oCpD6ooklar8748BMLtFlKkkC+O2IehbWfg8tK/2/uBccQCkiQZ0aiOXn8r5oMw53hXN90M3v+nuaTFqi5G+vNiJadGCwC930NoMy2I0ywzwF1hdKQWgSpOemfHFwo8AefUYe/b/KcVcXP4MPqMQpc9tKTB0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602792913089656.6351454530692; Thu, 15 Oct 2020 13:15:13 -0700 (PDT) Received: from localhost ([::1]:56958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT9eZ-0003US-Oo for importer@patchew.org; Thu, 15 Oct 2020 16:15:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT9ab-0007In-Cr for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:11:05 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:43881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT9aW-0001jp-S7 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:11:04 -0400 Received: by mail-pf1-x42a.google.com with SMTP id a200so73063pfa.10 for ; Thu, 15 Oct 2020 13:10:59 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id x18sm104734pfj.90.2020.10.15.13.10.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 13:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CzNs/YN8L1Kjuoo27oaR8flYu8s2Nc26UZiNRlhmaFI=; b=dqjEtqi4PcJj4ouWzODnoQHEHPChrkB3rMPvwiNnedX4DTkH9vWb/pVOkPaTdli6SQ MM1J43GnSqr7RnvWjx4Xj3I9e/yEIlrJr6RMcZCaEprX2NjxTWa1StWEK1YCOHNt2c2L vk3sR7JMiHO/X9Vyv9R+0PqujH7sOyLv5fbjTuscF6jH2iU6t5DsnBh1hZFQgqM0sNDT 73uCBgcxIr93pEmDj2t9KvwYA7XxH2KVemsa89R8qsDC9C0qDutjPJNeaTZ/XSZiVtjr DXMoKpi7d8BcbGsgttA8oD8fnoyGaeY/tbPAMkdEuxuUVpNoibKksOWiElSY8wYGmXsQ Tg7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CzNs/YN8L1Kjuoo27oaR8flYu8s2Nc26UZiNRlhmaFI=; b=DecJywO8Rxo3yEE2vtXDOMPDD9gl9d61qD0cctaqAJkD73lQEkD6S2ReOmzE4jE6Yo u2QPSBsfLm9P/TH81iloNRnxG7bt0/eCR+E6jx3JAoptf1CtpmUI/qKEkjgQLqtAa0Ji rOUsTHydrTNqta0ZsBU39WmbhUsUtxKREJaEvA7Ciwv72FcKZfPYV0iUUxCZUJ7HQ7y/ vINsk6wp0AoNifs0vOVG0hCWCbK25H9trAVVclNM153uWhAY91D/mfdLC2Ekp6aN16+V R0BLih0RZzOvfWPMobD4+E6hRquY1xhHKopuvWB0ZaFyXsXxLAVVQkqpR8VW9mEEEBnP VrrA== X-Gm-Message-State: AOAM532mHgk9TVGjng48DFeAgwoZ9j0ds87PsBaB1/wtx9XEcq7LL3nv jdiDQaHx8a1KqpwUe8mYMExy6L8NO6ZYxgij X-Google-Smtp-Source: ABdhPJySkK+LJwzSdgf9tMkCdmfZkvlgis4pdptt0oCt2QScoBMBOOrsxL9YVE71hNCue428LZRqjg== X-Received: by 2002:a65:53cc:: with SMTP id z12mr200041pgr.333.1602792658147; Thu, 15 Oct 2020 13:10:58 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] meson: Move the detection logic for sphinx to meson Date: Fri, 16 Oct 2020 04:10:34 +0800 Message-Id: <20201015201035.1964-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015201035.1964-1-luoyonggang@gmail.com> References: <20201015201035.1964-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Yonggang Luo --- configure | 59 +++-------------------------------- docs/meson.build | 4 +-- meson.build | 59 ++++++++++++++++++++++++++++++----- meson_options.txt | 5 ++- tests/qapi-schema/meson.build | 2 +- 5 files changed, 63 insertions(+), 66 deletions(-) diff --git a/configure b/configure index 1ce31f97b4..ff593a8542 100755 --- a/configure +++ b/configure @@ -297,7 +297,7 @@ brlapi=3D"" curl=3D"" iconv=3D"auto" curses=3D"auto" -docs=3D"" +docs=3D"auto" fdt=3D"auto" netmap=3D"no" sdl=3D"auto" @@ -822,15 +822,6 @@ do fi done =20 -sphinx_build=3D -for binary in sphinx-build-3 sphinx-build -do - if has "$binary" - then - sphinx_build=3D$(command -v "$binary") - break - fi -done =20 # Check for ancillary tools used in testing genisoimage=3D @@ -1226,9 +1217,9 @@ for opt do ;; --disable-crypto-afalg) crypto_afalg=3D"no" ;; - --disable-docs) docs=3D"no" + --disable-docs) docs=3D"disabled" ;; - --enable-docs) docs=3D"yes" + --enable-docs) docs=3D"enabled" ;; --disable-vhost-net) vhost_net=3D"no" ;; @@ -4413,45 +4404,6 @@ if check_include linux/btrfs.h ; then btrfs=3Dyes fi =20 -# If we're making warnings fatal, apply this to Sphinx runs as well -sphinx_werror=3D"" -if test "$werror" =3D "yes"; then - sphinx_werror=3D"-W" -fi - -# Check we have a new enough version of sphinx-build -has_sphinx_build() { - # This is a bit awkward but works: create a trivial document and - # try to run it with our configuration file (which enforces a - # version requirement). This will fail if either - # sphinx-build doesn't exist at all or if it is too old. - mkdir -p "$TMPDIR1/sphinx" - touch "$TMPDIR1/sphinx/index.rst" - "$sphinx_build" $sphinx_werror -c "$source_path/docs" \ - -b html "$TMPDIR1/sphinx" \ - "$TMPDIR1/sphinx/out" >> config.log 2>&1 -} - -# Check if tools are available to build documentation. -if test "$docs" !=3D "no" ; then - if has_sphinx_build; then - sphinx_ok=3Dyes - else - sphinx_ok=3Dno - fi - if test "$sphinx_ok" =3D "yes"; then - docs=3Dyes - else - if test "$docs" =3D "yes" ; then - if has $sphinx_build && test "$sphinx_ok" !=3D "yes"; then - echo "Warning: $sphinx_build exists but it is either too old or us= es too old a Python version" >&2 - fi - feature_not_found "docs" "Install a Python 3 version of python-sphin= x" - fi - docs=3Dno - fi -fi - # Search for bswap_32 function byteswap_h=3Dno cat > $TMPC << EOF @@ -6087,9 +6039,6 @@ qemu_version=3D$(head $source_path/VERSION) echo "PKGVERSION=3D$pkgversion" >>$config_host_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak -if [ "$docs" =3D "yes" ] ; then - echo "BUILD_DOCS=3Dyes" >> $config_host_mak -fi if test "$modules" =3D "yes"; then # $shacmd can generate a hash started with digit, which the compiler doe= sn't # like as an symbol. So prefix it with an underscore @@ -6794,7 +6743,6 @@ fi echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak -echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak @@ -7076,6 +7024,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f \ -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt \ -Diconv=3D$iconv -Dcurses=3D$curses \ + -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/docs/meson.build b/docs/meson.build index 0340d489ac..f566809a6a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -37,7 +37,7 @@ if build_docs input: [files('conf.py'), files(manual / 'conf.py')], depfile: manual + '.d', depend_files: sphinx_extn_depends, - command: [SPHINX_ARGS, '-Ddepfile=3D@DEPFILE@', + command: SPHINX_ARGS + ['-Ddepfile=3D@DEPFILE@', '-Ddepfile_stamp=3D@OUTPUT0@', '-b', 'html', '-d', private_dir, input_dir, output_dir]) @@ -59,7 +59,7 @@ if build_docs input: this_manual, install: build_docs, install_dir: install_dirs, - command: [SPHINX_ARGS, '-b', 'man', '-d', private= _dir, + command: SPHINX_ARGS + ['-b', 'man', '-d', privat= e_dir, input_dir, meson.current_build_dir()]) endif endforeach diff --git a/meson.build b/meson.build index 8156df8b71..3cf54d82f6 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,13 @@ cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host -build_docs =3D 'BUILD_DOCS' in config_host + +# Temporary directory used for files created while +# configure runs. Since it is in the build directory +# we can safely blow away any previous version of it +# (and we need not jump through hoops to try to delete +# it when configure exits.) +tmpdir =3D meson.current_build_dir() / 'config-temp' =20 if get_option('qemu_suffix').startswith('/') error('qemu_suffix cannot start with a /') @@ -1235,14 +1241,53 @@ foreach d : hx_headers endforeach genh +=3D hxdep =20 -SPHINX_ARGS =3D [config_host['SPHINX_BUILD'], - '-Dversion=3D' + meson.project_version(), - '-Drelease=3D' + config_host['PKGVERSION']] +sphinx_build =3D not_found +sphinx_build_option =3D get_option('sphinx_build') +if sphinx_build_option =3D=3D '' + sphinx_build =3D find_program('sphinx-build', required: false) +else + sphinx_build =3D find_program(sphinx_build_option, required: false) +endif =20 +SPHINX_TEST_ARGS =3D [] +# If we're making warnings fatal, apply this to Sphinx runs as well if get_option('werror') - SPHINX_ARGS +=3D [ '-W' ] + SPHINX_TEST_ARGS +=3D [ '-W' ] +endif + +build_docs =3D false +docs_option =3D get_option('docs') +# Check if tools are available to build documentation. +if sphinx_build.found() and not docs_option.disabled() + # This is a bit awkward but works: create a trivial document and + # try to run it with our configuration file (which enforces a + # version requirement). This will fail if either + # sphinx-build doesn't exist at all or if it is too old. + run_command('mkdir', ['-p', tmpdir / 'sphinx']) + run_command('touch', [tmpdir / 'sphinx/index.rst']) + sphinx_build_test_out =3D run_command(sphinx_build, SPHINX_TEST_ARGS += [ + '-c', meson.current_source_dir() / 'docs', + '-b', 'html', tmpdir / 'sphinx', + tmpdir / 'sphinx/out']) + message(sphinx_build_test_out.stderr()) + message(sphinx_build_test_out.stdout()) + if sphinx_build_test_out.returncode() =3D=3D 0 + build_docs =3D true + else + if docs_option.enabled() + if sphinx_build_option !=3D '' + warning('Warning: @0@ exists but it is either too old or uses to= o old a Python version'.format(sphinx_build_option)) + endif + error('Warning: Install a Python 3 version of python-sphinx') + endif + # do not building docs + endif endif =20 +SPHINX_ARGS =3D [sphinx_build] +SPHINX_ARGS +=3D SPHINX_TEST_ARGS +SPHINX_ARGS +=3D ['-Dversion=3D' + meson.project_version(), '-Drelease=3D'= + config_host['PKGVERSION']] + sphinx_extn_depends =3D [ meson.source_root() / 'docs/sphinx/depfile.py', meson.source_root() / 'docs/sphinx/hxtool.py', meson.source_root() / 'docs/sphinx/kerneldoc.py', @@ -1918,7 +1963,7 @@ summary_info +=3D {'QEMU_CFLAGS': config_host['= QEMU_CFLAGS']} summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info +=3D {'make': config_host['MAKE']} summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} -summary_info +=3D {'sphinx-build': config_host['SPHINX_BUILD']} +summary_info +=3D {'sphinx-build': sphinx_build.found()} summary_info +=3D {'genisoimage': config_host['GENISOIMAGE']} # TODO: add back version summary_info +=3D {'slirp support': slirp_opt =3D=3D 'disabled' ? fals= e : slirp_opt} @@ -1986,7 +2031,7 @@ if config_host.has_key('CONFIG_XEN_BACKEND') summary_info +=3D {'xen ctrl version': config_host['CONFIG_XEN_CTRL_INT= ERFACE_VERSION']} endif summary_info +=3D {'brlapi support': config_host.has_key('CONFIG_BRLAPI= ')} -summary_info +=3D {'Documentation': config_host.has_key('BUILD_DOCS')} +summary_info +=3D {'Documentation': build_docs} summary_info +=3D {'PIE': get_option('b_pie')} summary_info +=3D {'vde support': config_host.has_key('CONFIG_VDE')} summary_info +=3D {'netmap support': config_host.has_key('CONFIG_NETMAP= ')} diff --git a/meson_options.txt b/meson_options.txt index e6cb1e589b..0e3fa7136b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,8 +1,11 @@ option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') +option('docs', type : 'feature', value : 'auto', + description: 'Documentations build support') option('docdir', type : 'string', value : 'doc', description: 'Base directory for documentation installation (can be= empty)') - +option('sphinx_build', type : 'string', value : '', + description: 'Use specified sphinx-build [$sphinx_build] for buildi= ng document (default to be empty)') option('gettext', type : 'boolean', value : true, description: 'Localization of the GTK+ user interface') option('sparse', type : 'feature', value : 'auto', diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 20a7641af8..e36079cece 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -237,7 +237,7 @@ qapi_doc_out =3D custom_target('QAPI rST doc', # we want it to always really run the QAPI doc # generation code. It also means we don't # clutter up the build dir with the cache. - command: [SPHINX_ARGS, + command: SPHINX_ARGS + [ '-b', 'text', '-E', '-c', meson.source_root() / 'docs', '-D', 'master_doc=3Ddoc-good', --=20 2.28.0.windows.1 From nobody Wed Apr 24 00:32:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602792771; cv=none; d=zohomail.com; s=zohoarc; b=KsBX7Yp+tAVhTiLz0TZDXZXa52zDpqLew2HL54WAQfJn/qg51YML1dPPtsVpmp3ONXWJQS18oiJbOg7nq+f433PYvIUrePGFc2nc/YSx2db0FISmiqe21Hh9ukqXXPdl2zGp6Y3qn+ebjgCcurhNAepVePP8bLIWvOQSjz590GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602792771; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S+jw+88sOrD1wBdO71U4c/3Vn26m+fCHMRsX5Ywl9XU=; b=m1jrMze5MPamesS34pgzJNCBC58Oqwd6eaaNmXpoxIYy/UIshrbQR+yiSDbRtUVQYRefpNlkoXoD6TZLyZFUONUPthw4e4Y5fb5BdD6uebx+zV/8w6lThKg7n+3WnB4rios1wYpS2IkhlXAugHMspARQlsXtBH+KP92nIrLb58o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602792771813883.8400063227375; Thu, 15 Oct 2020 13:12:51 -0700 (PDT) Received: from localhost ([::1]:50278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT9cI-0000dK-Ct for importer@patchew.org; Thu, 15 Oct 2020 16:12:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT9ac-0007JJ-4B for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:11:06 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:34155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT9aY-0001jy-8D for qemu-devel@nongnu.org; Thu, 15 Oct 2020 16:11:05 -0400 Received: by mail-pf1-x444.google.com with SMTP id e10so99742pfj.1 for ; Thu, 15 Oct 2020 13:11:01 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id x18sm104734pfj.90.2020.10.15.13.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 13:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S+jw+88sOrD1wBdO71U4c/3Vn26m+fCHMRsX5Ywl9XU=; b=sCnHByBmxODu1aWys4LED5P/oyYOfLWCcqeechG6+Hx/swMC5uXQTQi5/RcOGg2bfN znrswI6RJpkUj+1wxj3mhifDs09Y2N2FIpKLEdnUO2xM8Q7Dd+z+7glG5uDS0jY804mX J3pBz3ANUaVJEzkHYr1SlVabO9Q56wuvVtpEDKaAoYo8A+CAILWkwoP9w0TNw/4I3BOk eFtzOMhdAoyc5h2aduVpIGv2Gu3YHgEuoELVlJFPYRYuCtyuueo09XTVuk+M7zWExxv2 ypza48ugu4BlHMqpQqQdmiq30SFimJkg0jS5bAw3o/rHLfLsO7qlcBmn/6c2mi9+hh1N XquA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S+jw+88sOrD1wBdO71U4c/3Vn26m+fCHMRsX5Ywl9XU=; b=Qg4P+43kIhWW60Cherex1f5JwFRU6EsKqzJ7TZwE240Ce+V1eKDlw8W294fNxcrVzd 2PFylcFQWcaCXY8igWQxKPw162ciKzXhO4tzFz/N8FxyuQ2z6wpBccobZPcy76OJ97dO WRfSeFLXlhUcgENypKyYOrvmV50aUQTqvQZXn6s5TJnZN/GRdSFGGFhwDNhdlNrEL3zI vlOsIL6a+dSmkrF7depCHtYBbWG5La/EFc/bSoA5t94yZF28Sb6TXJymbQJA8mzz6hQE QETALlxqWO+wFDCS7JL8OEmSQ+mt8XPdCxkr+ZlKuAXrbQopRgp572tklglf24+qiHHe xoVA== X-Gm-Message-State: AOAM532huV9isCh2zJBi+Kpio0xW+pNi4a23QGORHFSC/EVjoIezzvFy L9EpemSapM03XB4hpKPbyJd4X5iVca55+KAE X-Google-Smtp-Source: ABdhPJyZalY9chrU+vk01kb+VSwtv1CrTHUW9s4P0Nl+jNRwNyrLWf5opuQ82thN7JPUh5vmgGgqtw== X-Received: by 2002:aa7:87c7:0:b029:155:f258:99ca with SMTP id i7-20020aa787c70000b0290155f25899camr304646pfo.68.1602792660446; Thu, 15 Oct 2020 13:11:00 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] cirrus: Enable doc build on msys2/mingw Date: Fri, 16 Oct 2020 04:10:35 +0800 Message-Id: <20201015201035.1964-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015201035.1964-1-luoyonggang@gmail.com> References: <20201015201035.1964-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::444; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Currently rST depends on old version sphinx-2.x. Install it by downloading it. Remove the need of university mirror, the main repo are recovered. Signed-off-by: Yonggang Luo --- .cirrus.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 99d118239c..f42ccb956a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -76,7 +76,6 @@ windows_msys2_task: ((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-k= ey.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C= :\tools\msys64\etc\\post-install\\07-pacman-key.post C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#Check= Space/g' /etc/pacman.conf" C:\tools\msys64\usr\bin\bash.exe -lc "export" - C:\tools\msys64\usr\bin\bash.exe -lc "grep -rl 'repo.msys2.org/' /= etc/pacman.d/mirrorlist.* | xargs sed -i 's/repo.msys2.org\//mirrors.tuna.t= singhua.edu.cn\/msys2\//g'" C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Sy echo Y | C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Suu --ove= rwrite=3D* taskkill /F /FI "MODULES eq msys-2.0.dll" @@ -111,6 +110,11 @@ windows_msys2_task: mingw-w64-x86_64-curl \ mingw-w64-x86_64-gnutls \ " + bitsadmin /transfer msys_download /dynamic /download /priority FOR= EGROUND ` + https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphi= nx-2.3.1-1-any.pkg.tar.xz ` + C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz + C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/too= ls/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz" + del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg= /*" cd C:\tools\msys64 echo "Start archive" --=20 2.28.0.windows.1