From nobody Thu Mar 28 09:07:22 2024 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=1574863616; cv=none; d=zohomail.com; s=zohoarc; b=QJ5Zs1yH4Mh6O+1DWsm25TeOMXdNrTM2soj1u658z0y1UZ5MRG7bLBKdBvenJapbYp7bELQsqx3JIPlRacoSx/BJ/WYjRVh6rK39LGkq33gLfCn9vSxNFGw2F1pCJrFa5T2Cz8moEz5QTlOMLqCdplxQ2SG7kULruvA1pvt683Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574863616; 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=sjVXI9o3wIjLQZlHlvEgwYLEfeV+12vKVNYOnhK6i2Y=; b=U7dbeu/943LhvcTrGjxBgztozbmfIvj0QiBElYU4O1YsYXRx9iYbtuAMbtEC2EyOaPUQ2AVf4k98AdhqdBPf1upLUnOTr10NEOnJtTfAPLUCt7HlwQJFMBmApcuM1/Hfqtot/ERHdxx0Ejkvx+jABIxIBWo9iECVlN1xbiICox4= 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-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1574863616798752.3696589655573; Wed, 27 Nov 2019 06:06:56 -0800 (PST) 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-74-I5VHXx4JPWeU_JiGBsZQjQ-1; Wed, 27 Nov 2019 09:06:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38A202F2B; Wed, 27 Nov 2019 14:06:49 +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 C4BBD5C219; Wed, 27 Nov 2019 14:06:47 +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 5CF044BB65; Wed, 27 Nov 2019 14:06:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xARE6iGD001413 for ; Wed, 27 Nov 2019 09:06:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1B39A600CA; Wed, 27 Nov 2019 14:06:44 +0000 (UTC) Received: from dhcp-16-105.lcy.redhat.com (unknown [10.42.16.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D7A5600C8; Wed, 27 Nov 2019 14:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574863615; 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=sjVXI9o3wIjLQZlHlvEgwYLEfeV+12vKVNYOnhK6i2Y=; b=Y8+PUN68uONpwXvBNXAjgemXxbXxNFuhdFjdUVjm8ACMiQUnlHA8TBs3NivO6ZtCYxpLEJ zrri5Xie3QBdwzwsBDD3rg0CrNmDoiuYDiGob4qlOyY1gGD554OmGdA9/ZmMzDpwK5+ogu OMFYElKZOz76DjwQqNGC2UwU8Dabk5c= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 27 Nov 2019 14:06:38 +0000 Message-Id: <20191127140638.2882769-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH for 5.10.0] docs: don't run xmllint when generating API HTML files 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.16 X-MC-Unique: I5VHXx4JPWeU_JiGBsZQjQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) After generating the API HTML files we run xmllint in docs/html/*.html to validate the correctness. Since commit 0aa8536f14b08dfb5188d0bb3aba532680500d38 Author: Daniel P. Berrang=C3=A9 Date: Wed Nov 20 14:49:26 2019 +0000 docs: generate API reference pages for admin, qemu & lxc libraries we have many rules generating files into docs/html/. The xmllint calls for each rule are picking up files which are part-generated by other parallel build rules resulting in transient errors like: GEN html/index.html GEN html/index-admin.html GEN html/index-qemu.html GEN html/index-lxc.html GEN hvsupport.html.in html/index-lxc.html:1: parser error : Document is empty ^ make[4]: *** [Makefile:2407: html/index-qemu.html] Error 1 The easiest solution is to move the xmllint rules to the 'make check' phase of the build. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- docs/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 2a104bc837..0e43f382b1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -311,16 +311,19 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl = $(APIBUILD_STAMP) $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ --stringparam builddir '$(abs_top_builddir)' \ --stringparam timestamp $(timestamp) \ - $(srcdir)/newapi.xsl libvirt-api.xml && \ - $(XMLLINT) --nonet --noout html/*.html + $(srcdir)/newapi.xsl libvirt-api.xml =20 html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ --stringparam builddir '$(abs_top_builddir)' \ --stringparam timestamp $(timestamp) \ --stringparam indexfile $(@:html/%=3D%) \ - $(srcdir)/newapi.xsl $< && \ - $(XMLLINT) --nonet --noout html/*.html + $(srcdir)/newapi.xsl $< + +check-html: + $(XMLLINT) --nonet --noout html/*.html + +check-local: check-html =20 python_generated_files =3D \ html/libvirt-libvirt-lxc.html \ --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list