From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605928; cv=none; d=zohomail.com; s=zohoarc; b=kS7y/5tYjas9BbgYCDGBUlAYr37leiSCXRmQv6KVtWWC0o6sb1NwUwbzrcRgezXL3H16zShPKXrkqiNkdNkhLe+yRaby+K0xR5gkcdQPV6xTSmW1/C+A4vkLxMyU3Y36bPNYXGnGd/kC+GyerZbxHEZ1VZ7Lb+Uq49RiRSv8dAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605928; h=Content-Type:Content-Transfer-Encoding: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=BXzssLf9UjUT5nG7jEC9uIk9FtU0jR1Ws1FOBh4P74Y=; b=VlUOZL1QEQ5/aebFaCLCsNTim4kx5es4mTpvuioMr5aE+7UNkqQtyujFs2uvykkFrA+0ZZuBRxo7B5nu1nr7LUFwRF5raGan8vbzsGs4MmE5ToiymNvA1E5OC3ya798wr4ujS/Htar9KxtAb93PZy/zIUv1xWJ/8CLcC5npBkyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602605928267275.7425188414775; Tue, 13 Oct 2020 09:18:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-ToQbV2LDOGyuZZwVYO575A-1; Tue, 13 Oct 2020 12:18:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 708261015CAF; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F00B5D9DD; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 17645181A07D; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIJRv000858 for ; Tue, 13 Oct 2020 12:18:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCF385D9D3; Tue, 13 Oct 2020 16:18:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CB315D9CD for ; Tue, 13 Oct 2020 16:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605927; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BXzssLf9UjUT5nG7jEC9uIk9FtU0jR1Ws1FOBh4P74Y=; b=hmABtOtrbybuF23PCk9UpQBjY30zUms48U8m2Ei++VgMB1jIoLdDX9LyKk1y3Cw5Czj0bC Fwl+Ey6rhRBp7fORigRYNqIVww6dz6Qxqq4Z55qD6XjY7Z6XtXcb8FQ6kHd437A57/ZDU9 ik2GrhBWkrH1ntoFcGEOG3+d2P9jqi8= X-MC-Unique: ToQbV2LDOGyuZZwVYO575A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 1/9] docs: migration: Fix syntax Date: Tue, 13 Oct 2020 18:18:05 +0200 Message-Id: <404099eb9717b86b52c68a4a4fe2292a2ede5b54.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" One of the paragraphs added in f51cbe92c0d was not terminated thus making it invalid XML/XHTML. This was not caught by the build system as 'scripts/meson-html-gen.py' unnecessarily obscures and hides errors from 'xsltproc'. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/migration.html.in | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/migration.html.in b/docs/migration.html.in index 162c202227..dd5eddd6f4 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -653,6 +653,7 @@ virsh migrate --p2p --tunnelled web1 qemu+ssh://desthos= t/system qemu+ssh://10.0. daemons or forwarding connections to these sockets manually (using socat, netcat or a custom piece of software): + 

 virsh migrate web1 [--p2p] --copy-storage-all 'qemu+unix:///system?socket=
=3D/tmp/migdir/test-sock-driver' 'unix:///tmp/migdir/test-sock-qemu' --disk=
s-uri unix:///tmp/migdir/test-sock-nbd
--=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605916; cv=none; d=zohomail.com; s=zohoarc; b=J6a+iB3EFObTYI6L5uLdkYtl7lseGUES2aetnggFgXgClkz76lTIeLuZesLAPZVRp33wL686TrL51+yv+cUA0WbuOdioKoxRthMmYJHSr4ARWGWTktCkEZcb/PfQIuzjZp9ynlA5oEFFfWvLFhLDi30sfglLAyZeWNqJ+gRiZAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605916; h=Content-Type:Content-Transfer-Encoding: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=cLF+PMR2lpWrAo5B5QekRaWYC6fyzpd6iYQQ0QzbAp8=; b=l8AHUTUlgufVmFM1V39MxdCmyrD3WVWDPDPoypywqVJvcwr8DyP0Qfk2RnrKjflgdmOP2vum3vdDi+zTqblC4U1NS2q3J2ltRwiYkvV8tBOCREjfND0cna2vvU6quJVyxsRl6FgC8MUXhBDW0uM4aCn4SJg04cVc8gbscpC+rZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602605916483496.4920287918385; Tue, 13 Oct 2020 09:18:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-224U4WJwOVucsYVNonNQlw-1; Tue, 13 Oct 2020 12:18:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 401511868410; Tue, 13 Oct 2020 16:18:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DCC1019C59; Tue, 13 Oct 2020 16:18:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 643AB181A050; Tue, 13 Oct 2020 16:18:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIL6u000869 for ; Tue, 13 Oct 2020 12:18:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B5405D9D3; Tue, 13 Oct 2020 16:18:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AF4A5D9CD for ; Tue, 13 Oct 2020 16:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605914; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cLF+PMR2lpWrAo5B5QekRaWYC6fyzpd6iYQQ0QzbAp8=; b=bcoIcbtGhQozKzECImok+Ii7pRPmhiLDKvrb2V7MyUU3UVoAy3P2codffKdJa1TqUeWTnv 4KP3sVUxWlGzeXTUO8aN+Za2+E3OLuATvM3ZSm1QrlzEJ4o5ZJMc8O3+l60Gk0L6x+3X2Z S9eQgmWrcHxDtUr5tTyL9ExA9v0JyVI= X-MC-Unique: 224U4WJwOVucsYVNonNQlw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 2/9] scripts/meson-html-gen.py: Don't rereformat output files Date: Tue, 13 Oct 2020 18:18:06 +0200 Message-Id: <06117ff0180251cc81e1473c2d450dcb83e96438.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The output HTML files (especially those generated from rST files) don't look good even after reformatting. Skip the extra step and accept that no matter what we do HTMLs will not look great. This additionally makes it way simpler to remove meson-html-gen.py in the future (thus I've neglected to remove passing of xmllint). Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- scripts/meson-html-gen.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/meson-html-gen.py b/scripts/meson-html-gen.py index 2731d734a7..dcc11f37cf 100755 --- a/scripts/meson-html-gen.py +++ b/scripts/meson-html-gen.py @@ -14,7 +14,7 @@ parser.add_argument("htmlfile", type=3Dstr, help=3D"path = to generated HTML file") parser.add_argument("pagesrc", type=3Dstr, default=3D"", nargs=3D'?', help= =3D"(optional) path to source file used for edit this page") args =3D parser.parse_args() -html_tmp =3D subprocess.run( +html =3D subprocess.run( [ args.xsltproc, '--stringparam', 'pagesrc', args.pagesrc, @@ -26,12 +26,5 @@ html_tmp =3D subprocess.run( stderr=3Dsubprocess.PIPE, ) -html =3D subprocess.run( - [args.xmllint, '--nonet', '--format', '-'], - input=3Dhtml_tmp.stdout, - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.PIPE, -) - with open(args.htmlfile, 'wb') as outfile: outfile.write(html.stdout) --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605927; cv=none; d=zohomail.com; s=zohoarc; b=bCdUAiWr9J2vF8ts5mjisHL5UIKJzef5jdlBwC5InFT1+KAbhDjmTaISX5Hxe+Z2a7KYsF1/qXXDYsLGi6Jm6pgwbqr4lj/HNzolLhfISnlhirRqN62iA9PLYLT86lWrTRoMRVEZ/qbyDuDQinT+5pxbZsUistyPrVqIwPVYRtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605927; h=Content-Type:Content-Transfer-Encoding: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=Rk/PuAiW4m3YAfS9KI73yaqdnbpmM1XeXZlj5KtkZoo=; b=ehCZKYrnxT7h8iswsGGID1rG37bhKwBi7rMhsm3fZTVP+xJoJsgSMALVxPwI9BDtll3Nb9l+wvjwDiBB2GuwpudQLMMTe4SmQJrI8yaPWP9AwRAZzuXcDbFqVAbgta/Wcq5WHK9Ue5LXj1FAo6WETTEul6SJdqcSHB4FLTIIfm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602605927501634.007687012254; Tue, 13 Oct 2020 09:18:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-315-_vfTm2XENomppNrzFcgMlQ-1; Tue, 13 Oct 2020 12:18:44 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 708E657084; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B84C10013D7; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 16206181A07C; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIMfd000880 for ; Tue, 13 Oct 2020 12:18:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0DE25D9D3; Tue, 13 Oct 2020 16:18:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id E12DA5D9CD for ; Tue, 13 Oct 2020 16:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605926; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Rk/PuAiW4m3YAfS9KI73yaqdnbpmM1XeXZlj5KtkZoo=; b=Tkd9tQjtR8xSdiZkUfzpwCw5PHtRHtlZmjxKqHuNsgF36pwqhjpOYvDxCvW7nLrWUN7rWv LmXGIlm+piWIiezQsCb9Q+xLEga/hXa0BHiPTw6+HSS+e7U9H8h8Hnx2wTJZdpCC4Csgt7 g7f9suhZ3RcksiI/kPHa/eNZkXW/rrg= X-MC-Unique: _vfTm2XENomppNrzFcgMlQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 3/9] docs: meson.build: Limit html files depending on 'aclperms.htmlinc' Date: Tue, 13 Oct 2020 18:18:07 +0200 Message-Id: <18a766a9a2fabe5bf647a3c3c06242457332f7cf.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Only 'acl.html' output file includes that file so there's no need to make everything depend on it. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/meson.build | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 400c1ca955..d18e5c1feb 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -32,7 +32,6 @@ docs_assets =3D [ docs_html_in_files =3D [ '404', - 'acl', 'aclpolkit', 'api_extension', 'api', @@ -199,6 +198,7 @@ docs_rst2html_gen =3D generator( # name - base file name (required) # file - generated file (required) # source - source filename relative to repository root (optional, if there= is no source) +# depends - explicit dependency on other input (optional) docs_html_in_gen =3D [] foreach name : docs_html_in_files @@ -219,6 +219,13 @@ foreach name : docs_rst_files } endforeach +docs_html_in_gen +=3D { + 'name': 'acl.html', + 'file': 'acl.html.in', + 'source': 'docs' / 'acl.html.in', + 'depends': aclperms_gen, +} + hvsupport_html_in =3D custom_target( 'hvsupport.html.in', output: 'hvsupport.html.in', @@ -272,7 +279,7 @@ foreach data : docs_html_in_gen '@OUTPUT@', data.get('source', []), ], - depends: [ aclperms_gen ], + depends: data.get('depends', []), depend_files: [ page_xsl ], install: true, install_dir: docs_html_dir, --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605952; cv=none; d=zohomail.com; s=zohoarc; b=GexNuFeXhZaQnMRzQAGolbzr1A2IwroEb6YLXAazRAQHKsVho9DE6lY5rrvXOobiJNUDI3a+yUHa6vXwZJWLVQB/nIjKh10zIQFZIKEF8ROiIox9KT5k9E8EoGLiw8043QA3Iq5j79ReFe2b/4uooVDiI12w8/aAAqH+S6K2lgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605952; h=Content-Type:Content-Transfer-Encoding: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=Oly9ncigVq3Df2NPNOSVwQPJHgqEZ9632T8OEBL1tIY=; b=OQRLHJ2kYRlz7mpbXCsuyd4O9Bkx/tISkqNlpOyknRda87BlF36s7ZC7qxcbAgFOMW42aqHBnG2eq35wQnDgVIDAXBdnKSAJ3piXCVpvckUoCpbjr5vh33meODpfyhihWoLqTT/OtYxygf18azeXWepGrAj4D/lS/E1HKkP7pd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602605952858502.0667652665643; Tue, 13 Oct 2020 09:19:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-581-wkAsOQjoOc61VABus4dHEg-1; Tue, 13 Oct 2020 12:18:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BBEE914704; Tue, 13 Oct 2020 16:18:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1804727BD8; Tue, 13 Oct 2020 16:18:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D239B181A55A; Tue, 13 Oct 2020 16:18:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIOqf000893 for ; Tue, 13 Oct 2020 12:18:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7547D5D9D3; Tue, 13 Oct 2020 16:18:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B24965D9CD for ; Tue, 13 Oct 2020 16:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605951; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Oly9ncigVq3Df2NPNOSVwQPJHgqEZ9632T8OEBL1tIY=; b=iMKDM2DP3h2ueUWsyCIE6e5PZa/8tSH4XjOXWf4HpoTcStKlg2LCTsWHM0u8UseiPYK8Vk /PM6Dhyc0mrg/0CfNsmV0ZKOhij93rq74vD6ILy0UrH5o95f8L9kDa1N3BlS7zWpFRZUom oRw6nFEqxpcYuQko7RT1RuELlSabp3I= X-MC-Unique: wkAsOQjoOc61VABus4dHEg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 4/9] docs: meson.build: Generate HTML files directly by meson Date: Tue, 13 Oct 2020 18:18:08 +0200 Message-Id: <3d5c10e09ede2c2ecc0fa928374d6ee800b0e631.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since we no longer reformat the XSLT-transformed files, there's no need to use an external script any more. Unfortunately this hid errors from 'xsltproc' as return value was not checked and the stderr was piped into xmllints stdin. The result was that any invalid input file would result into an empty output file. Since the script's only purpose was to prevent additional temporary files at the time we were reformatting the output in a pipeline we no longer need this. Moving the generation directly into the meson definition makes it more obvious what's happening and saves readers from having to parse what's going on. A free bonus is that errors are now properly caught and reported. This patch converts the main docs/ directory for now with cleanup of other comming later. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/meson.build | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index d18e5c1feb..8b7c63bc6f 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -267,20 +267,17 @@ foreach data : docs_html_in_gen input: data['file'], output: html_file, command: [ - meson_python_prog, - python3_prog.path(), - meson_html_gen_prog.path(), - xsltproc_prog.path(), - xmllint_prog.path(), - meson.build_root(), - docs_timestamp, + xsltproc_prog, + '--stringparam', 'pagesrc', data.get('source', ''), + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '--nonet', site_xsl, '@INPUT@', - '@OUTPUT@', - data.get('source', []), ], depends: data.get('depends', []), depend_files: [ page_xsl ], + capture: true, install: true, install_dir: docs_html_dir, ) --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605932; cv=none; d=zohomail.com; s=zohoarc; b=YeuCW5yaOmkmVRNI2FuHmObG2d9+fsAU/aKyvCf6JHULz53qCbanTMkbGoEz/2E8MoMCOjZCMwofKEcsuEtfyUkiVc/0mNQ9kU0AEkDH5g8pA7ePHgELcHrGIrJHg4IiPOvBsKn/FobUcPS59ftoh5fL8K89jH+W2W603Hacaj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605932; h=Content-Type:Content-Transfer-Encoding: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=OOLG46kvWocpRAAol6KNvskfli7ZD7Z36jjnlqthcrs=; b=HqB+zOIvzCrebFr3a8z53JJlyI9+UWy+KIQreR9STSo+94nHbaP2nwfZWzdwOMioauAIwMyCxZ8Eikcb34tL+/Ktx53rgHsA9WE4RgNxsBDho4+KyRt6DwDt8YrkQqN2SqMq1XaH6wIw2p16sS25Pc8hkGwtGWkuoKnz5NncJuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602605932121105.67600777153359; Tue, 13 Oct 2020 09:18:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-j9SZ7udSPLaULhgj-V0dKg-1; Tue, 13 Oct 2020 12:18:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 222701015CB1; Tue, 13 Oct 2020 16:18:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F36956EF5A; Tue, 13 Oct 2020 16:18:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C122D58129; Tue, 13 Oct 2020 16:18:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIQ5v000906 for ; Tue, 13 Oct 2020 12:18:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04FD15D9D3; Tue, 13 Oct 2020 16:18:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B6975D9CD for ; Tue, 13 Oct 2020 16:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OOLG46kvWocpRAAol6KNvskfli7ZD7Z36jjnlqthcrs=; b=ak0tqxhw1lM0foPt90uMvG4OTPoIDWGFZnakDqFQ6wwKaG9GEzvXHOUAiYVpV0BzgDQ0yZ Hs392UI4WlNewje7Inxw5rggB1d7K1iHd0ciGnoQjuL6PsKeJaC0/Yq1Ahr0/T8fqqK0Qt xlSTWesB/6M+9a0r79RiNnu6Vf/+0Nk= X-MC-Unique: j9SZ7udSPLaULhgj-V0dKg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 5/9] docs: meson.build: Prepare for use of identical code for XSLT processing of htmls Date: Tue, 13 Oct 2020 18:18:09 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson unfortunately doesn't give us any means to share the code using xsltproc to output HTMLs processed by our template. This means we will have to resort to copy&paste engineering. To make things simpler, let's use the same block of code in docs/meson.build but also any of the subdirs which generate htmls. This will be achieved by making it configurable and wrapping it in a comment that instructs anybody editing it to keep it identical. We need to be able to configure the template file used and installation directory. The rest of the processing is same as we do in docs/meson.build. This code will then be copied to subdirs to refactor the current approach used there. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/meson.build | 60 +++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 8b7c63bc6f..a915d6252a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -193,35 +193,37 @@ docs_rst2html_gen =3D generator( ) -# docs_html_in_gen: +# html_xslt_gen config + +html_xslt_gen_xslt =3D site_xsl +html_xslt_gen_install_dir =3D docs_html_dir + +html_xslt_gen =3D [] +# html_xslt_gen: # each entry is a dictionary with following items: -# name - base file name (required) -# file - generated file (required) +# name - base file name (required), output file will become 'name.html' +# file - input file (optional, 'name.html.in' assumed if missing) # source - source filename relative to repository root (optional, if there= is no source) # depends - explicit dependency on other input (optional) -docs_html_in_gen =3D [] foreach name : docs_html_in_files - html_in_file =3D '@0@.html.in'.format(name) - docs_html_in_gen +=3D { + html_xslt_gen +=3D { 'name': name, - 'file': html_in_file, - 'source': 'docs' / html_in_file, + 'source': 'docs' / name + '.html.in', } endforeach foreach name : docs_rst_files rst_file =3D '@0@.rst'.format(name) - docs_html_in_gen +=3D { + html_xslt_gen +=3D { 'name': name, 'file': docs_rst2html_gen.process(rst_file), 'source': 'docs' / rst_file, } endforeach -docs_html_in_gen +=3D { - 'name': 'acl.html', - 'file': 'acl.html.in', +html_xslt_gen +=3D { + 'name': 'acl', 'source': 'docs' / 'acl.html.in', 'depends': aclperms_gen, } @@ -247,45 +249,55 @@ hvsupport_html_in =3D custom_target( docs_api_generated, ], ) -docs_html_in_gen +=3D { +html_xslt_gen +=3D { 'name': 'hvsupport', 'file': hvsupport_html_in, } news_html_in =3D docs_rst2html_gen.process(meson.source_root() / 'NEWS.rst= ') -docs_html_in_gen +=3D { +html_xslt_gen +=3D { 'name': 'news', 'file': news_html_in, 'source': 'NEWS.rst', } -foreach data : docs_html_in_gen - html_file =3D '@0@.html'.format(data['name']) +# The following code between the markers must be kept identical with the o= ther +# copies of the code in various subdirs, since meson doesn't support any k= ind +# of functions. + +# --- begin of XSLT processing --- - out_file =3D custom_target( - html_file, - input: data['file'], - output: html_file, +foreach data : html_xslt_gen + html_filename =3D data['name'] + '.html' + + html_file =3D custom_target( + html_filename, + input: data.get('file', data['name'] + '.html.in'), + output: html_filename, command: [ xsltproc_prog, '--stringparam', 'pagesrc', data.get('source', ''), '--stringparam', 'builddir', meson.build_root(), '--stringparam', 'timestamp', docs_timestamp, '--nonet', - site_xsl, + html_xslt_gen_xslt, '@INPUT@', ], depends: data.get('depends', []), depend_files: [ page_xsl ], capture: true, install: true, - install_dir: docs_html_dir, + install_dir: html_xslt_gen_install_dir, ) - install_web_deps +=3D out_file - install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir) + install_web_deps +=3D html_file + install_web_files +=3D html_file.full_path() + ':' + html_xslt_gen_insta= ll_dir endforeach +html_xslt_gen =3D [] + +# --- end of XSLT processing --- + subdir('fonts') subdir('html') subdir('internals') --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602606001; cv=none; d=zohomail.com; s=zohoarc; b=ZFhKqg5u/LNJUNWo1t56nGyhkUSxsHA7JDennIQGyFUVcE5x8no7+iIkcDyIAKI9KM28SWktT8M9Q6nsaiIWUYu2FpA3uZUZpt1/6o+W9UtXKhDpLdUgq7OAYEIEnTvnqAVwLGQb3GO7Zx0ZdhNuxSutfDutY1OjBBMqUy21rN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602606001; h=Content-Type:Content-Transfer-Encoding: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=Wp3ZCR1zBVIFKLyDLmvkLV8SLSql1QKT/+PkR43Zsm0=; b=gxl803m8yjEPOHjCW6rUGo4ilvtKER2tgplvfPTQnI/kIQ+YfhzIMwpRaw79tYcGPVwDiN5ZUJSsk1/UTVhTgLoXHecOWOIXi8py0Q3d79OnSODwHqQEoAKylo1JE4RbvpuPGB8nXJQGVvdq8nZY57H5663TVfOOPiaor4vND+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602606001065659.1584665003045; Tue, 13 Oct 2020 09:20:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-577-MhRYIWtUOm6glZmRKa857g-1; Tue, 13 Oct 2020 12:18:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 930951015CB8; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 735926EF54; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 422CA5812E; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIR76000915 for ; Tue, 13 Oct 2020 12:18:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A76F5D9D3; Tue, 13 Oct 2020 16:18:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F9B05D9CD for ; Tue, 13 Oct 2020 16:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602606000; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Wp3ZCR1zBVIFKLyDLmvkLV8SLSql1QKT/+PkR43Zsm0=; b=V2zScwg1WCFrI2ehu7oLDZD78UMUZvzI3ocI2EBiuO3h5G6jgFlBvjxmdb+c+drhIoMrio Cbob5/dr9SVKzPKEnsPTSjnLlvoXHiHaDG9mxnhcbJgygCGoDZLDv/iarca+y5aomtYyUW QrWiTg+nNCUbPsF8tw6P2huUOljrihM= X-MC-Unique: MhRYIWtUOm6glZmRKa857g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 6/9] docs/internals/meson.build: Use template code for XSLT processing Date: Tue, 13 Oct 2020 18:18:10 +0200 Message-Id: <6790d10556bd5631d793fa0710dddca55b33343e.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace the reimplementation of the XSLT processing custom target with an identical copy form docs/meson.build and an comment to keep them in sync. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/internals/meson.build | 55 ++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/docs/internals/meson.build b/docs/internals/meson.build index 5d008dec5b..5aa67ded5c 100644 --- a/docs/internals/meson.build +++ b/docs/internals/meson.build @@ -5,33 +5,48 @@ internals_in_files =3D [ 'rpc', ] +html_xslt_gen_xslt =3D subsite_xsl +html_xslt_gen_install_dir =3D docs_html_dir / 'internals' +html_xslt_gen =3D [] + foreach name : internals_in_files - html_in_file =3D '@0@.html.in'.format(name) - html_file =3D '@0@.html'.format(name) + html_xslt_gen +=3D { + 'name': name, + 'source': 'docs/internals' / name + '.html.in', + } +endforeach + +# keep the XSLT processing code block in sync with docs/meson.build + +# --- begin of XSLT processing --- - out_file =3D custom_target( - html_file, - input: html_in_file, - output: html_file, +foreach data : html_xslt_gen + html_filename =3D data['name'] + '.html' + + html_file =3D custom_target( + html_filename, + input: data.get('file', data['name'] + '.html.in'), + output: html_filename, command: [ - meson_python_prog, - python3_prog.path(), - meson_html_gen_prog.path(), - xsltproc_prog.path(), - xmllint_prog.path(), - meson.build_root(), - docs_timestamp, - subsite_xsl, + xsltproc_prog, + '--stringparam', 'pagesrc', data.get('source', ''), + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '--nonet', + html_xslt_gen_xslt, '@INPUT@', - '@OUTPUT@', - 'docs/internals' / html_in_file, ], - depends: [ aclperms_gen ], + depends: data.get('depends', []), depend_files: [ page_xsl ], + capture: true, install: true, - install_dir: docs_html_dir / 'internals', + install_dir: html_xslt_gen_install_dir, ) - install_web_deps +=3D out_file - install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'internals') + install_web_deps +=3D html_file + install_web_files +=3D html_file.full_path() + ':' + html_xslt_gen_insta= ll_dir endforeach + +html_xslt_gen =3D [] + +# --- end of XSLT processing --- --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605933; cv=none; d=zohomail.com; s=zohoarc; b=LfWwKSgrDisSgZk7txJKROYHqwglwmkTfTnNR6RDsxFNsMUc2dbflWm2POTpve2m4FmKwuhaCV84kQeH4vU38ln3/rQniQ66PJ4rGxzenHOkfo9sT8Ungb4mtg09iv0sUe/ghoWOUCt6jFMGMALmXQhUJPZywv75oIkF3AkcDaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605933; h=Content-Type:Content-Transfer-Encoding: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=m3hVmwzpW+OxPXssxX/UDKXAH0XsFAKAA0C/zoBcUSY=; b=b7NeCfeA0ABmbGvub8Gd3vCDXtCTP6h05KCgK4ZmtzL2YCXvzvj9avkNUzHYuqjzhezT82PWNLz2b85iUv4yMCMVMwwl4I5E3dlTyN2zMmusDK4CdJh9ZhV+5XoXQdoj3ecK7f53uAPJh8f13juR+EqvDDNHXmg9Dn+6Y2cRrxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602605933683705.1685669030735; Tue, 13 Oct 2020 09:18:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-beaQyAffO0mIklo2E0EjEw-1; Tue, 13 Oct 2020 12:18:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C732E802B7C; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A1EC710013D0; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 700215812F; Tue, 13 Oct 2020 16:18:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGISbq000926 for ; Tue, 13 Oct 2020 12:18:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAFF45D9CD; Tue, 13 Oct 2020 16:18:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C9945D9D3 for ; Tue, 13 Oct 2020 16:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=m3hVmwzpW+OxPXssxX/UDKXAH0XsFAKAA0C/zoBcUSY=; b=Wz3g8zTTgpeNrfQt/QBEoj7h5e0aCNWkZDONmK3xUN2ecNXt+adwkj98xBHZgltA5sgKjY jzmMFG/bXS+8kBy5gV2m1BCL6UJNjAkMGMJ68R/DqQh/d+BEhT/RWaPOGznZWNdv6c9oNh 1N1jWJbsYGv/fvGUHWDD0oYZuknqOII= X-MC-Unique: beaQyAffO0mIklo2E0EjEw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 7/9] docs/kbase/meson.build: Use template code for XSLT processing Date: Tue, 13 Oct 2020 18:18:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace the reimplementation of the XSLT processing custom target with an identical copy form docs/meson.build and an comment to keep them in sync. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/kbase/meson.build | 56 +++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index b1d1d7610b..c0fa72ff35 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -17,35 +17,51 @@ docs_kbase_files =3D [ 'virtiofs', ] +html_xslt_gen_xslt =3D subsite_xsl +html_xslt_gen_install_dir =3D docs_html_dir / 'kbase' +html_xslt_gen =3D [] + foreach name : docs_kbase_files rst_file =3D '@0@.rst'.format(name) - html_file =3D '@0@.html'.format(name) - html_in =3D docs_rst2html_gen.process(rst_file) + html_xslt_gen +=3D { + 'name': name, + 'file': docs_rst2html_gen.process(rst_file), + 'source': 'docs/kbase' / rst_file, + } +endforeach + +# keep the XSLT processing code block in sync with docs/meson.build + +# --- begin of XSLT processing --- - out_file =3D custom_target( - html_file, - input: html_in, - output: html_file, +foreach data : html_xslt_gen + html_filename =3D data['name'] + '.html' + + html_file =3D custom_target( + html_filename, + input: data.get('file', data['name'] + '.html.in'), + output: html_filename, command: [ - meson_python_prog, - python3_prog.path(), - meson_html_gen_prog.path(), - xsltproc_prog.path(), - xmllint_prog.path(), - meson.build_root(), - docs_timestamp, - subsite_xsl, + xsltproc_prog, + '--stringparam', 'pagesrc', data.get('source', ''), + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '--nonet', + html_xslt_gen_xslt, '@INPUT@', - '@OUTPUT@', - 'docs/kbase' / rst_file, ], - depends: [ aclperms_gen ], + depends: data.get('depends', []), depend_files: [ page_xsl ], + capture: true, install: true, - install_dir: docs_html_dir / 'kbase', + install_dir: html_xslt_gen_install_dir, ) - install_web_deps +=3D out_file - install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'kbase') + install_web_deps +=3D html_file + install_web_files +=3D html_file.full_path() + ':' + html_xslt_gen_insta= ll_dir endforeach + +html_xslt_gen =3D [] + +# --- end of XSLT processing --- --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605920; cv=none; d=zohomail.com; s=zohoarc; b=kY7rleKlUrYKVGUV5aevbV7Eqf7hOWl05QeR1wJnE+UDw+Son4NMYk+otKvwEYFRiMf3si/dQ12TKGpaIK4QWjwLsJ0KmbfphCa2aDHL2Pgbx4a2O22HDSbTdL2j+HEnJZ/qEKrtqcC23/+YEDijla8GCFLBBEM/98WvsxkNah4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605920; h=Content-Type:Content-Transfer-Encoding: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=ZKvezf5KUEBjA2cuMy53cYU89B3RlOHkw4jc5ZgfW/4=; b=IVO6X5MY9xakhIEUZfA2KM/D2qYHMXR8tB5NIYg7jwINwNFzvuAMFWGDXT/kzICpdmqWe6HNx5XqXDWHbkpqZSQm6WZS9yEph+yXH5OPLjDPkQXxEHBNfA2bOdkMFpFVjR1p+se71gylXT4+CMnNuFctmvNW1zcE4IAqy8V/jQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602605920542780.0917680877313; Tue, 13 Oct 2020 09:18:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-rqE2MOgnP_-eiUxDsv8yFw-1; Tue, 13 Oct 2020 12:18:37 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 48FEA1015CAE; Tue, 13 Oct 2020 16:18:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0842A73665; Tue, 13 Oct 2020 16:18:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BA6D658129; Tue, 13 Oct 2020 16:18:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIULp000939 for ; Tue, 13 Oct 2020 12:18:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 45E955D9D3; Tue, 13 Oct 2020 16:18:30 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B90E5D9CD for ; Tue, 13 Oct 2020 16:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605919; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZKvezf5KUEBjA2cuMy53cYU89B3RlOHkw4jc5ZgfW/4=; b=U7hF9ubeM6p8Njl28hfxiw1kQAOSto/+GzIMWBtt2MbcQoBEGuNohw2QFWvTOgfqVpZN+w Wrd2OSCvMftw430gfrNu35sM4DnshApp6rtmsblSQZPcc/EOHBv+nPGA1nJ7xj28JuucIh YQ4ugAvlsl4V0LH9VtKqv4rZmJNv7Ps= X-MC-Unique: rqE2MOgnP_-eiUxDsv8yFw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 8/9] docs/manpages/meson.build: Use template code for XSLT processing Date: Tue, 13 Oct 2020 18:18:12 +0200 Message-Id: <0a17ea33dab1c5cff9c3ad0fa31ee8dac7e2ee25.1602605642.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace the reimplementation of the XSLT processing custom target with an identical copy form docs/meson.build and an comment to keep them in sync. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- docs/manpages/meson.build | 55 ++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 7ed1d304a4..ecc517e80e 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -1,3 +1,7 @@ +html_xslt_gen_xslt =3D subsite_xsl +html_xslt_gen_install_dir =3D docs_html_dir / 'manpages' +html_xslt_gen =3D [] + # docs_man_files # each entry is a dictionary with following items: # name - man page name (required) @@ -104,29 +108,44 @@ foreach data : docs_man_files capture: true, ) - out_file =3D custom_target( - html_file, - input: html_in, - output: html_file, + html_xslt_gen +=3D { + 'name': data['name'], + 'file': html_in, + 'source': 'docs/manpages' / rst_in_file, + } +endforeach + +# keep the XSLT processing code block in sync with docs/meson.build + +# --- begin of XSLT processing --- + +foreach data : html_xslt_gen + html_filename =3D data['name'] + '.html' + + html_file =3D custom_target( + html_filename, + input: data.get('file', data['name'] + '.html.in'), + output: html_filename, command: [ - meson_python_prog, - python3_prog.path(), - meson_html_gen_prog.path(), - xsltproc_prog.path(), - xmllint_prog.path(), - meson.build_root(), - docs_timestamp, - subsite_xsl, + xsltproc_prog, + '--stringparam', 'pagesrc', data.get('source', ''), + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '--nonet', + html_xslt_gen_xslt, '@INPUT@', - '@OUTPUT@', - 'docs/manpages' / rst_in_file, ], - depends: [ aclperms_gen ], + depends: data.get('depends', []), depend_files: [ page_xsl ], + capture: true, install: true, - install_dir: docs_html_dir / 'manpages', + install_dir: html_xslt_gen_install_dir, ) - install_web_deps +=3D out_file - install_web_files +=3D '@0@:@1@'.format(out_file.full_path(), docs_html_= dir / 'manpages') + install_web_deps +=3D html_file + install_web_files +=3D html_file.full_path() + ':' + html_xslt_gen_insta= ll_dir endforeach + +html_xslt_gen =3D [] + +# --- end of XSLT processing --- --=20 2.26.2 From nobody Wed Apr 24 22:56:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602605946; cv=none; d=zohomail.com; s=zohoarc; b=hdeTXnUGKvc5fAUJ0gRfEqyB9XvCZMIi0eMr2K4Zdfpr5SvXh49DGuzqwUkdts2SbWjwKiUXD3t4L1OLt4XVEHZDGdSYE4xprkwqTKQj+5JCFL1KQQkbyPQO9RyxmIo3zDQ/mwfrtrGYzZ3EYQu9MT3uJ22UCvZwzrnnieLw7v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605946; h=Content-Type:Content-Transfer-Encoding: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=x2DecEfvR4ba4M9BjfoFeHw3w+iOHXmLAxFzK+7lH+w=; b=U9CfTU/nbYbFmIPlttLbkiOVQ9q3ByMGNAc79Lo+SwhjlOXZJ61OCeRNSsvGQ2p35RxP1MLuwrgJhjgO2WrN75qqXp2ON6H05+7fvPXf7oJK5aGqCE9uTJQTNqzhsotAXztuBeaQSMzUsHMKEMG2QFDCSOk0zN/vI1bQb28g7Uo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602605946865842.8108954306949; Tue, 13 Oct 2020 09:19:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-576-tkftKBe0NGywHSu9mmhWfg-1; Tue, 13 Oct 2020 12:18:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D20F914702; Tue, 13 Oct 2020 16:18:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E222A73667; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B0E47181A271; Tue, 13 Oct 2020 16:18:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09DGIXlI000967 for ; Tue, 13 Oct 2020 12:18:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEB6E5DA2A; Tue, 13 Oct 2020 16:18:33 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id E74DC5D9DD for ; Tue, 13 Oct 2020 16:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602605945; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=x2DecEfvR4ba4M9BjfoFeHw3w+iOHXmLAxFzK+7lH+w=; b=fVsV3Nv9jwpdvaYAYLPQQxHoIv8G/vD9ILEWAscdkdsNNKcjayf7hdbX+b3jp30ws+qzpZ 0NuQUjsTLhzZ++/WCOE5skD2p/wAohn/RXcKmEl4mh1t9zHG3FPr6r+6QwRVlxnnvmwQUF xZvZqZTLwtimdZftG5XrdDoPHhlCm5A= X-MC-Unique: tkftKBe0NGywHSu9mmhWfg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 9/9] scripts: meson-html-gen: Remove Date: Tue, 13 Oct 2020 18:18:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The script was obscuring what's happening and not reporting errors properly. Remove it since it's no longer used now. Signed-off-by: Peter Krempa Reviewed-by: Martin Kletzander --- scripts/meson-html-gen.py | 30 ------------------------------ scripts/meson.build | 1 - 2 files changed, 31 deletions(-) delete mode 100755 scripts/meson-html-gen.py diff --git a/scripts/meson-html-gen.py b/scripts/meson-html-gen.py deleted file mode 100755 index dcc11f37cf..0000000000 --- a/scripts/meson-html-gen.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import subprocess - -parser =3D argparse.ArgumentParser() -parser.add_argument("xsltproc", type=3Dstr, help=3D"path to xsltproc bin") -parser.add_argument("xmllint", type=3Dstr, help=3D"path to xmllint bin") -parser.add_argument("builddir", type=3Dstr, help=3D"build root dir path") -parser.add_argument("timestamp", type=3Dstr, help=3D"docs timestamp") -parser.add_argument("style", type=3Dstr, help=3D"XSL stile file") -parser.add_argument("infile", type=3Dstr, help=3D"path to source HTML file= ") -parser.add_argument("htmlfile", type=3Dstr, help=3D"path to generated HTML= file") -parser.add_argument("pagesrc", type=3Dstr, default=3D"", nargs=3D'?', help= =3D"(optional) path to source file used for edit this page") -args =3D parser.parse_args() - -html =3D subprocess.run( - [ - args.xsltproc, - '--stringparam', 'pagesrc', args.pagesrc, - '--stringparam', 'builddir', args.builddir, - '--stringparam', 'timestamp', args.timestamp, - '--nonet', args.style, args.infile, - ], - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.PIPE, -) - -with open(args.htmlfile, 'wb') as outfile: - outfile.write(html.stdout) diff --git a/scripts/meson.build b/scripts/meson.build index 59b3c9bacd..655ec0e0e2 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -22,7 +22,6 @@ scripts =3D [ 'meson-gen-authors.py', 'meson-gen-def.py', 'meson-gen-sym.py', - 'meson-html-gen.py', 'meson-install-dirs.py', 'meson-install-symlink.py', 'meson-install-web.py', --=20 2.26.2