From nobody Sun Feb 8 20:28:26 2026 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 --- 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