From nobody Fri Apr 26 10:02:33 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=1602798934; cv=none; d=zohomail.com; s=zohoarc; b=cGrdVbkHOPwyhQVVUAoYSqepmaoRhe6ljUtd7X7zid7URK/uaZqOFRHM7AWqRTbcrO5md+41D754U/Zs6Qt76TI20AgHw3qRroDZehN2jmQNbgndf3YG+PjZvP5FoP4JEQzOWINK8sJpxoKpjeaqTIrLRmUVhNZRrWa5kCSzMzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602798934; 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=gD6WMWYQ9CIQ4TmbgB/h0Tt9F/nzYRkxmSRyeiKZIXA=; b=a6SMNNQ5Vo3hJr7YDQopcZbCdj358IwtnG5Mo6RJ4XgEpr/XoYo/SvgWWpG0aqXvYw7iVHdOcANyuSdHskZYnCh/ca+970nH0FIEFLF6QHMuxy++ofUSu8h6rh2m0TV9r1ybGg4QQ6D7JnjKmvEt7RIayFYXX1xDNDxhVazz4Ek= 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 1602798934605767.9340254687877; Thu, 15 Oct 2020 14:55:34 -0700 (PDT) Received: from localhost ([::1]:48854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTBDh-0002Ru-C5 for importer@patchew.org; Thu, 15 Oct 2020 17:55:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTBCH-0000ln-Hj for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:05 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:41996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTBCF-0005H6-V1 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:05 -0400 Received: by mail-pl1-x635.google.com with SMTP id c6so103062plr.9 for ; Thu, 15 Oct 2020 14:54:03 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id f66sm252856pfa.59.2020.10.15.14.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 14:54:01 -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=gD6WMWYQ9CIQ4TmbgB/h0Tt9F/nzYRkxmSRyeiKZIXA=; b=hUy24E0UA9dVu7MJfrgVjWpTNElEKjUwPkZgVH0Cfblvtt7mYI7a8QSEGfrcE5mT7Q Ke7pj0Uvgy93FYR/mUhrUXtXDMgowhS+97ZfMwmrXfv69+uuSnZo9TOqeKNu7QPbC/6L dSdneeYXdnfPPnnZLT6+B7Wb4aPDk2l1r2ZHRZumo48qYEO9wpv6+PeuBSqeoo4bGN+I O659ZGEnhGbarXf0Fx1HRPORzIIdQkOGVU7uoho4If5O2lLPAsO+HHz87j8DHinKciUf bR0R0W1eJ5vs9wtjWJlSlHqTRmtcbsjvc0fHnx33WOjO8zzD1pyXXFqwGtq+JQqiMR/H EFfA== 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=gD6WMWYQ9CIQ4TmbgB/h0Tt9F/nzYRkxmSRyeiKZIXA=; b=GJF/dNN4OVZBGI8+H6cnjP9nq1rZ7ZnM0WI7qRD3UIPY2Pn6cmBFX2uzyT//8SC1po +R3YBwJN1//avg1JmjnPUxxw55s2WRSea5GPGtKcX9wX7jcDlreMbWGQ/VuVuHmFb8lb i2M2pV9CYxOYYs+9T4dqwMS8KGTGGGnKNIJ15jchEmtiAR5Euq4e5K4RSTGYRsdkFpV9 lsxJ0zC1DU0spGoAq1vOsaMgKgwlpeRlK6FN6ykK5tRkBVhexXL80/R3jh7QC803d/YX LO6pjVEgsugHvpwjVSyI5oXBnWIPaHPeLKbnGuKpSxHBAhuW4Mf7i3OzhEIZMVS9HGAX zjIw== X-Gm-Message-State: AOAM531NoEctcO8SYlBk+qKEdF9PsJyaQeCUPJHuXK84xjkRShMXzSUZ x/z6hDK1Aw2upnlK2F21Qhz+KoERyzrML5Y1 X-Google-Smtp-Source: ABdhPJycIg4IRSBaC77DCFZrTxSHjv3kPn0Z7D7hteZmTIPDsbUK1eUkVyMFMNQ/XItRHh3NJkPXug== X-Received: by 2002:a17:90a:3:: with SMTP id 3mr703818pja.184.1602798841957; Thu, 15 Oct 2020 14:54:01 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v3 1/4] docs: Fixes build docs on msys2/mingw Date: Fri, 16 Oct 2020 05:53:42 +0800 Message-Id: <20201015215345.173-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015215345.173-1-luoyonggang@gmail.com> References: <20201015215345.173-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::635; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x635.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" meson didn't support running ../scripts/kernel-do directly Signed-off-by: Yonggang Luo --- docs/conf.py | 2 +- docs/sphinx/kerneldoc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 [] --=20 2.28.0.windows.1 From nobody Fri Apr 26 10:02:33 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=1602798936; cv=none; d=zohomail.com; s=zohoarc; b=jPH2id17EhWbb4G3VbMfhDMBky86MqeBWwqFrxuxWp3i8nEykym7LBwIgZ8XrHD7epC1DDQG+L8AiY7xxw1sYMDbuOVoMjKa0p8MAyt/mL80z9ilIcuFc4/offcIeOotU3CSkjRfpi0Xi36hKqgYnBxpk3oO+1DDrcdqujJ8qsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602798936; 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=WNZXxRE7Pyv6F+HZTmZrxNHB5c5dWrYnTrbc1h9aIQqXx5kj84Lx32Y4ey+5zRCC6Nkus5kA6b1OeUOW4d/BjNdrWIe5YB8wKp7rB18X5oI+uPhVCJ4tdYUGpVsHPVnf4g16/6nxfuWlEFyeM8MTH9oEvIrkRYH9UD19tPTj+SU= 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 1602798936753608.3776225777494; Thu, 15 Oct 2020 14:55:36 -0700 (PDT) Received: from localhost ([::1]:49052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTBDj-0002Wt-GI for importer@patchew.org; Thu, 15 Oct 2020 17:55:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTBCJ-0000ow-BF for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:07 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:52443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTBCH-0005HL-Pr for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:07 -0400 Received: by mail-pj1-x102b.google.com with SMTP id gm14so202187pjb.2 for ; Thu, 15 Oct 2020 14:54:05 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id f66sm252856pfa.59.2020.10.15.14.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 14:54:03 -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=UOJbPTapcP3B1PXzcMvduCL31x38ycdzNR1iga9VQlu/q6Qic0QLwxaVzrj8XkSd/X kVZtgUeONPXE0qWx3XlSxHRJU3jNQhGoacwANEwAME0dOHvQYszsdv9qtCn0MYZ6YnjU XkSNf/amZd9VXPWxhgmz1BI4amhDuCMWroHeEJmahOOVb8YcZDERRQxyXxpmdabduTTA 3IgIk+bNt26S7CEIK0UOpGvDzuF19xcmiqndK0zRB/IOgB4WiwRM9+Pyfn41rJJIa0xo rVVVjtvZB2jMOErwCxpeVCltd0qgN+HhbONY8LRfaLJsxnanMx5GX6uY5ctB3JCnPzzl Rz/g== 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=daXbcA1dqK0py8wrqZ4TRZAs5S1Bm87kzpCEkdfz1/UkZWmydXDDsSPDt84hF9l5eQ GADx1WgCaS5PWxi5HEABAhrazS6ihhxP2r3mDgZsFqM7moU326pGTBg+gOMYJmdAj3lT Pw/kYFnml2OLz5FZkRhr7i1U4O2ou5PrTscZRvq4rMpo0ASJqEnCkcWTDxw7C1JYdt0W eWynNlyl/pk4HpOc2Ri6olHZFuthb3GXxXVwFYcuEPyyr2LDhnZkGNor+CyxVuGRMDwH k94Cv1iZU98m/JlVROK0ArSG2F1xnKFgxc26NSbfe/Qz18tyMgPfMjMTBWnvgXEtbnfr hmHg== X-Gm-Message-State: AOAM533t/A4uBqPBXuuONeU2fYycOyVinNEzSog9pB7EUh1Gx+GNH1dc 3/nqIhd1sF/5CvokMUGkXUgmWHTnxuMnITtx X-Google-Smtp-Source: ABdhPJxnV6qyk8FQ8nrXQbimStv04L00DmzroETLAXZ/+9Jig3iShJkSkLF0fF8uKM0eS1kDcIButA== X-Received: by 2002:a17:90a:77c6:: with SMTP id e6mr695899pjs.116.1602798844051; Thu, 15 Oct 2020 14:54:04 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v3 2/4] configure: the docdir option should passed to meson as is. Date: Fri, 16 Oct 2020 05:53:43 +0800 Message-Id: <20201015215345.173-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015215345.173-1-luoyonggang@gmail.com> References: <20201015215345.173-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::102b; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x102b.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 Fri Apr 26 10:02:33 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=1602799082; cv=none; d=zohomail.com; s=zohoarc; b=oLgE/BnGvaxgsCPJpzM2Y1tdSlACNbU5pS4cPperoiddPxyhnsuBgP2AxdS7lNbOVpvcBfUUKkdEE02jxf/hYrscAZ4fMlLbwnvB8hB36MDWazCy4jWfCN6torgUQ8dgOXtUpO/df6AjwNl/YRZLQliIs7d+PI+mtzOPm1pGXjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602799082; 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=g4cbzeU6YRPy8GRPuXVDcztIxUIPrUKh5dgrp8W1QMM=; b=Eo1JgzSe3T9jrdkJXB4JDvMCoAvSzranESqGUoM2YDj6y55DD5l8rxB5S39p50ULafXEJzMBk+8yvfo7yiqtdLKeqzxcJJxgd/IrzXFsWOxdocGEeKrHqATlM0a62O74BLN70ODGKuELGoOX/Mdb0BWSa5rP9AIdnWlzohLbHNw= 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 1602799082725207.450100858798; Thu, 15 Oct 2020 14:58:02 -0700 (PDT) Received: from localhost ([::1]:56470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTBG5-0005iN-C1 for importer@patchew.org; Thu, 15 Oct 2020 17:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTBCN-0000yU-KW for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:11 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:32814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTBCK-0005IK-BR for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:11 -0400 Received: by mail-pf1-x42d.google.com with SMTP id j18so256367pfa.0 for ; Thu, 15 Oct 2020 14:54:07 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id f66sm252856pfa.59.2020.10.15.14.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 14:54:05 -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=g4cbzeU6YRPy8GRPuXVDcztIxUIPrUKh5dgrp8W1QMM=; b=SChUWRIWmF0t+r6Pn4xrKpsFLbRg2uhq+78MLX9CmGUVN5b2+ZZ9d5zwESEOOPtMIV qtFHzTX3PD+Mmf6XkBE0YGOtNyMLwwWzNm462rkAgnQ2A9S4+Cid2oGuvALfy+rLXbWz 0b649TF4fhPcBNf9tCin1g1uzULc/60z+ewrwinSZp5hIqdcsiRwV5WcjmFFpY8jChh7 eXAHPP0tyxi4hLlvlSsKUHgVTX0rQ11EXsgx/pQcXz0LqkvWaRntPDcMUWPqKP9WNkX+ HyDZFKtRo58ySTWt0xeh/2PkUbBWReHjvzdnl6fFDz3bsuQkQjtLlEqUouirzO1iy8S/ dy+A== 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=g4cbzeU6YRPy8GRPuXVDcztIxUIPrUKh5dgrp8W1QMM=; b=Ik/zRpVg6TdS5Vma+B8ADPX5znPF1KkxcthDcbozrLXcb9n2XugLvEow2GZPj7U14V GrjuITr/3uX5/nJrk0raMd2f+mneWqzzVSDJj30TqB+TLU6uhpWap4Pm5cppxf5HJWzx rJoJSXfAK+MFN2lYLyyeELQcBluwcMf65pO6zHOVguooguAFQlzo2t2Gprx/Warauf7s vvFjwP1YPor1ggJzK0l+Cu8+NDnFKH+YajA6U7khasMaoBQyG/j81rnA6LNEUBg4HOAp GUPOMC3Fwk4tQQ9g4PxekO15Wni3PeAgWiPfjhM0S0k+Bs3g3Oh/vsjaIES+Gg5vbZtv PTjA== X-Gm-Message-State: AOAM531zwOkoOba5jXIgsCqEwBRf+QgKBBINzGYbofi0f/AITaI1RWNX 3uDeA1q0X/853bBmfrn7vGBJ7vllJHCWCAES X-Google-Smtp-Source: ABdhPJxJIYXgej6SwcOP3S6GmA3rRxBtiio99AkPLxBwihKNNzcFjcjA6v6ZKsp7/SCqkozpntjv6Q== X-Received: by 2002:a63:e443:: with SMTP id i3mr477093pgk.289.1602798846124; Thu, 15 Oct 2020 14:54:06 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v3 3/4] meson: Move the detection logic for sphinx to meson Date: Fri, 16 Oct 2020 05:53:44 +0800 Message-Id: <20201015215345.173-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015215345.173-1-luoyonggang@gmail.com> References: <20201015215345.173-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::42d; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x42d.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..ddd64d6df5 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']) + 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 [] +if build_docs: + 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 1f222a7a13..961b8367a9 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 Fri Apr 26 10:02:33 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=1602799018; cv=none; d=zohomail.com; s=zohoarc; b=bKNfOQ9SwR8g4592yQf0leQ5h4okUJGgLkGZUi0BsB3RmnfedVnQyLnTte4dfzYn1OHGLCm6QBhETYtltX1R3xes+xrJh9f5UPpr9rKTZVlUIOwRfovjfK7LuALikPOMl7ob7Znmk+JgA0MjD/WvZsDJZs8Hw8OYFOWmLRbA6cA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602799018; 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=hozYbTznR+3ZUri2vfs62GGDU+f61xbXPlADTa8ln4fFH7caNbOmPWtqakTjPaZN4ZQYOUWTVt14KA2FbNl8faGH3oL+QdDBJrG+v6LBGmQ6gUuCQSa/D+fG+5rK0SSBy0rRFA1hjeb2Dk3CFz6vQa2uMI47lVnJiy7q0paXJHM= 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 1602799018182211.84475635064177; Thu, 15 Oct 2020 14:56:58 -0700 (PDT) Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTBF3-0004Y4-0O for importer@patchew.org; Thu, 15 Oct 2020 17:56:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTBCO-000101-IQ for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:13 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:39649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTBCM-0005Ik-Ak for qemu-devel@nongnu.org; Thu, 15 Oct 2020 17:54:12 -0400 Received: by mail-pl1-x642.google.com with SMTP id y1so111027plp.6 for ; Thu, 15 Oct 2020 14:54:09 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id f66sm252856pfa.59.2020.10.15.14.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 14:54:07 -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=SiSQny2MBx0jJxrJI9/4iAO+PJwtp1iCc4RJ8OmRFIhXk+Q80vtgQfTVUdwddTDInz AILclXwY+pyZK12Koin7n0975E3EdkcBSVbyKLgDvSVxf31S29k4l/iCEXOjk1dLuf0v tobGMdZEmOS6taZJZhhg1KENgUVv5SdImmonAS/lgd76HekLjs3ucsvJ9+ULn7b7Dtff WsbUXHS1i13N4WFjN2Impq4qV2JIRnaizrkopkr4pNrufmrdFrdmTv8h8rH0FTyoEHwg /jnBwwsZB8LQG8OvW+J0ZRajafl41/hxfLrRUXCHTuxCn+HM2m1vhoGGnl+nBtUw4rI3 y7mA== 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=akmIQ5uq+YBLjnQphqCq+qFMSFLmWAKGeEfq3lwrA26w6fuE7V7i8Yf/slI1l5bGP0 vITPncjLvnGVnpQMBG14AAJLlrsVsWQjuV9u9ZDOEaSgI9W1LZqEZMqtddhxajsSxe3A 1DYgjegGbLJDdonhHOatgF/xZKTWLMawS4g6rloe0bSxSVTM4osk7c5jk7fh1IrZj56G P9Wbt/fABqAKZizfVU/LOfWVmmIbT2EZRRN5x24iNfRhx70AjZZ1fzVBG2kZ5fdEsp6A shZ88ylNkSasfPGwLYYQAekzxfkp26mEneq2VCWUot+3D1+8WoXK/W6Uwy2dXunS5jxt ptqQ== X-Gm-Message-State: AOAM531yzFuFAyBdSZQj2jGUE4vz/xoXVubbMcaKmMAqAuPvOo9JODjl ZZSskOF68RTxRin2BAY6LJNgYJPtOVwm80YR X-Google-Smtp-Source: ABdhPJzo2bNBsc/V138T9LW0/KTEPKzrX+xUv9AIVbauL5KWxHLZPDoU0TJVAXixPXJQtQ5lvYnnDA== X-Received: by 2002:a17:90a:1bca:: with SMTP id r10mr790205pjr.4.1602798848418; Thu, 15 Oct 2020 14:54:08 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v3 4/4] cirrus: Enable doc build on msys2/mingw Date: Fri, 16 Oct 2020 05:53:45 +0800 Message-Id: <20201015215345.173-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201015215345.173-1-luoyonggang@gmail.com> References: <20201015215345.173-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::642; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x642.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