From nobody Sun Feb 8 13:45:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594894987; cv=none; d=zohomail.com; s=zohoarc; b=jrxxJ//ZGhvfftTdrBn1NJZO/66dT8ZomUDSmoFrqvdFlz9qd3NBNByaMBfnY9qbTUFw6nT51oRmMdPkJ0EPuuAtaw+ibxd3v9geW4ij2zYMoRpMecgboUOgDmyNaoGm8rh59IZo3Kjb7XfgHrZ+F0RDEi0k2gETu+QFy07MkAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894987; 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=6zH0UMgnY1qeUGr7WveUzGIrZKzI5yzM/CWZfKgl3aw=; b=M7faLmuvfxWXRkyCdXXzB/HKktQjKaylMqrCulRL8tNPMDNSrHNgzsD6QXcdNOaQAvwB/UVs3INCzXM5MZUQH2xFehvJhPneqTDVBMNaJeDLEpRRz5I0h4gPccKFz+XK8jXbA6I41SedETBNm/yytyWcoBqD4dgsAEK5HS2fI3o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894987120316.2151888650652; Thu, 16 Jul 2020 03:23:07 -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-0DfDtZjMM4e0w3EwOfwr8Q-1; Thu, 16 Jul 2020 06:09:55 -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 5630A80BCA0; Thu, 16 Jul 2020 10:09:50 +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 371CB72ACF; Thu, 16 Jul 2020 10:09:50 +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 066AEA36E1; Thu, 16 Jul 2020 10:09:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA7fM9021156 for ; Thu, 16 Jul 2020 06:07:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3CF42DE6B; Thu, 16 Jul 2020 10:07:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E9752DE9E for ; Thu, 16 Jul 2020 10:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894986; 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=6zH0UMgnY1qeUGr7WveUzGIrZKzI5yzM/CWZfKgl3aw=; b=cerCLimvDgRf6Ah6+LG9VGInfg/hlJnOo3RukyOILuit6YwqVuVxTvTHiCkzRyGmZ9OM4m hOdV5NfUnKOeQ11F0yPAuGAILNFF1sPdi0KCDJua4RZxKQ4OBMShwc1NZmIdCWbj/74ahJ 3iP/+cmJk+zuChXKavTnFySels8Th/s= X-MC-Unique: 0DfDtZjMM4e0w3EwOfwr8Q-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 337/351] meson: docs/html: add html test Date: Thu, 16 Jul 2020 11:59:33 +0200 Message-Id: <2c6231edd2bb19b6c452ad39c2c0726af875a160.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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" Signed-off-by: Pavel Hrdina --- Makefile.am | 2 +- configure.ac | 2 +- docs/Makefile.am | 22 ---------------------- docs/html/meson.build | 28 ++++++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 docs/Makefile.am diff --git a/Makefile.am b/Makefile.am index fca0c1f5c29..d538d037eb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # so force it explicitly DISTCHECK_CONFIGURE_FLAGS =3D --enable-werror =20 -SUBDIRS =3D . docs +SUBDIRS =3D . =20 XZ_OPT ?=3D -v -T0 export XZ_OPT diff --git a/configure.ac b/configure.ac index 91ba0c2af4e..06e7f7491e4 100644 --- a/configure.ac +++ b/configure.ac @@ -106,7 +106,7 @@ m4_if(m4_version_compare([2.61a.100], AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ - Makefile docs/Makefile \ + Makefile \ .color_coded \ .ycm_extra_conf.py \ libvirt.pc \ diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 40b4d224d71..00000000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2016 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -check-html: - $(XMLLINT) --nonet --noout html/*.html - -check-local: check-html diff --git a/docs/html/meson.build b/docs/html/meson.build index 7be5abe5fe5..c87cc9f7ea2 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -7,7 +7,10 @@ apipng =3D [ =20 install_data(apipng, install_dir: docs_html_dir / 'html') =20 -custom_target( +docs_html_gen =3D [] +docs_html_dep =3D [] + +index_api_gen =3D custom_target( 'index-api', input: [ newapi_xsl, @@ -43,8 +46,11 @@ custom_target( ], ) =20 +docs_html_gen +=3D index_api_gen.to_list() +docs_html_dep +=3D index_api_gen + foreach name : [ 'admin', 'lxc', 'qemu' ] - custom_target( + index_api_gen =3D custom_target( 'index-@0@-api'.format(name), input: [ newapi_xsl, @@ -67,4 +73,22 @@ foreach name : [ 'admin', 'lxc', 'qemu' ] page_xsl, ], ) + + docs_html_gen +=3D index_api_gen.to_list() + docs_html_dep +=3D index_api_gen endforeach + +docs_html_paths =3D [] + +foreach file : docs_html_gen + docs_html_paths +=3D file.full_path() +endforeach + +test( + 'check-html', + xmllint_prog, + args: [ + '--nonet', '--noout', docs_html_paths, + ], + depends: docs_html_dep, +) --=20 2.26.2