From nobody Fri May 3 18:26:45 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=1622809892; cv=none; d=zohomail.com; s=zohoarc; b=Y1Lfp+aKbpHJgBuDK1/ctY7JsxJYPpB02zUexO3EI8JO4kBebO19bWNLjqE3RX22O36zelUYNqNDzBYPjnq6bMg49inpuiORrMxrmCuuN2sHPhiOHiY5QsZYwzOJ8eje9PswcL3AfAFhpQnhSZ8QfSQ29347jtkyua7Bci0EnO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622809892; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ylQxgQe6dp9FBtY0vqxmZOZBeJGwor+GrPXaYDdxXPs=; b=RWOhBgS0BxFZ15zTBkKOoIu1HEwJuEBska4GGs1AluyxT1/9Fp/8kSmqI4cw1zunUm+pIALh6AJUgy6nMO0tZF8f5ne3loRkofM0sdel76pxEZLtQIlF99wnqNPLE4DgJppQ1wOnYpIky917NwON2MT9ygp2XbAGMdfuYWBeG0Y= 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 1622809892939366.06039155776944; Fri, 4 Jun 2021 05:31:32 -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-139-_8GUInYIMPi3OI3hdaECtg-1; Fri, 04 Jun 2021 08:31:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60D3D185A0DD; Fri, 4 Jun 2021 12:31:20 +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 C51F961F47; Fri, 4 Jun 2021 12:31:16 +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 4CFFE4BB40; Fri, 4 Jun 2021 12:31:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 154CVBje022263 for ; Fri, 4 Jun 2021 08:31:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B7B360C17; Fri, 4 Jun 2021 12:31:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.192.162]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C357160C05 for ; Fri, 4 Jun 2021 12:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622809892; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ylQxgQe6dp9FBtY0vqxmZOZBeJGwor+GrPXaYDdxXPs=; b=DE25OcaUoJ+UrqomKsC1g0OO9KjA2S4MFBVOK2WfE/mrFV9ON7XCD4tE4kO5wxG021wDdA F10VQ6xYFVGhcSP6g6QFnARaHLCuIsGDR97nB0cXzQYFZlmAOdsGLKsF1slGx6uYvtOcsq UZmFfFgj0YHgSqJZMRrdHWzVYU3Ng8Y= X-MC-Unique: _8GUInYIMPi3OI3hdaECtg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Ask rst2html to strip comments Date: Fri, 4 Jun 2021 14:31:08 +0200 Message-Id: <20210604123108.150878-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.15 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" They can be problematic: in particular, the rst files generated by keycodemapdb's keymap-gen contain things like To re-generate, run: keymap-gen --lang=3Drst --title=3Dvirkeycode-osx [...] which result in xsltproc later choking with [1/12] Generating virkeyname-osx.html with a meson_exe.py custom command FAILED: docs/manpages/virkeyname-osx.html /usr/bin/meson --internal exe --capture docs/manpages/virkeyname-osx.html= \ /usr/bin/xsltproc [...] --nonet ../docs/subsite.xsl docs/manpages/virke= yname-osx.html.in docs/manpages/virkeyname-osx.html.in:17: parser error : Double hyphen wit= hin comment: keymap-gen --lang=3Drst --title=3Dvirkeyname-osx [...] ^ Stripping comments avoids the issue entirely. Signed-off-by: Andrea Bolognani --- docs/manpages/meson.build | 2 +- docs/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 0fa93fad89..eda0aa8441 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -118,7 +118,7 @@ foreach data : docs_man_files html_in_file, input: rst_file, output: html_in_file, - command: [ rst2html_prog, '--stylesheet=3D', '--strict', '@INPUT@' ], + command: [ rst2html_prog, '--strip-comments', '--stylesheet=3D', '--st= rict', '@INPUT@' ], capture: true, ) =20 diff --git a/docs/meson.build b/docs/meson.build index f550629d8e..c94a3c7f13 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -185,7 +185,7 @@ docs_admin_api_xml =3D docs_api_generated[3] docs_rst2html_gen =3D generator( rst2html_prog, output: '@BASENAME@.html.in', - arguments: [ '--stylesheet=3D', '--strict', '@INPUT@' ], + arguments: [ '--strip-comments', '--stylesheet=3D', '--strict', '@INPUT@= ' ], capture: true, ) =20 --=20 2.31.1