From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1574263749; cv=none; d=zoho.com; s=zohoarc; b=LklPp9eR164CDVSyC26f/uwTKqZlEDnD2sQvsiXNBosn+KZuRieNMVkzjCubn63c7HkLnqHvEdRLNspdMCOPA4/t3wdRkblJIt0clrR3ITkOAr0PbWNVq5ApmnxxezMGGq+LZI2GU9Co7abrMukpJUgn/16ajffLRWuMFzCkIzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263749; 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=DYh85KAzT7Plj1QYZytRh9OCXPrvqVAtquKD2g4YmeA=; b=WAvV2vanXJftod52jZcu+dLd/XzUJGIidAruhqF9JYqFQqUG7T3yd+4n18Tb3QIbN1XXjtsioVh3s/5RbNnGsCNM1g2roQl4aRanev2gQtCUyPalmXJ1STVPUbANE1+/NZlBsJBhQXgMr5dRRTA7iARgI7csxkmCVKy0u78hnEg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1574263749360882.0488316677022; Wed, 20 Nov 2019 07:29:09 -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-17-dbFG6_v0PSSf1q5JK6t4jw-1; Wed, 20 Nov 2019 10:29:05 -0500 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 B6C731005512; Wed, 20 Nov 2019 15:28:57 +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 8805046E76; Wed, 20 Nov 2019 15:28:56 +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 445C44BB78; Wed, 20 Nov 2019 15:28:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFSsc4006964 for ; Wed, 20 Nov 2019 10:28:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 184CF66836; Wed, 20 Nov 2019 15:28:54 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FCCD5C1D4; Wed, 20 Nov 2019 15:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263748; 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=DYh85KAzT7Plj1QYZytRh9OCXPrvqVAtquKD2g4YmeA=; b=PiytCQLayjX9bO+0NvmF5BgrxNJr/bWWH35h+1fEVfWkEeCwurkvK2v7YBiaMkF3XzGE+x 11nqBG7qTmE7xteLLOF6p+mLGamij2qAbqzdbcR2BZ0IN+A90qOAZLYLotk78hXRtVb9kP PWtqKRZ29hy8BQt6Y1fY4pEW97uHWT8= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:42 +0000 Message-Id: <20191120152848.2991100-2-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/7] docs: stop using custom rules for building / installing web pages 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-MC-Unique: dbFG6_v0PSSf1q5JK6t4jw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Define automake variables for all the data we need built and installed and let automake generate the install rules normally. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 80 +++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 59 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0311bbedd8..60ca6aba5b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -49,6 +49,9 @@ apipng =3D \ html/home.png \ html/right.png =20 +apirefdir =3D $(HTML_DIR)/html +apiref_DATA =3D $(apihtml) $(apipng) + css =3D \ generic.css \ libvirt.css \ @@ -59,6 +62,9 @@ javascript =3D \ js/main.js \ $(NULL) =20 +javascriptdir =3D $(HTML_DIR)/js +javascript_DATA =3D $(javascript) + fonts =3D \ fonts/LICENSE.md \ fonts/stylesheet.css \ @@ -73,6 +79,9 @@ fonts =3D \ fonts/overpass-mono-semibold.woff \ fonts/overpass-regular.woff =20 +fontsdir =3D $(HTML_DIR)/fonts +fonts_DATA =3D $(fonts) + logofiles =3D \ logos/logo-base.svg \ logos/logo-square.svg \ @@ -92,6 +101,9 @@ logofiles =3D \ logos/logo-banner-light-256.png \ logos/logo-banner-light-800.png =20 +logofilesdir =3D $(HTML_DIR)/logos +logofiles_DATA =3D $(logofiles) + png =3D \ 32favicon.png \ libvirt-daemon-arch.png \ @@ -107,15 +119,20 @@ gif =3D \ architecture.gif \ node.gif =20 - internals_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_html =3D $(internals_html_in:%.html.in=3D%.html) =20 +internalsdir =3D $(HTML_DIR)/internals +internals_DATA =3D $(internals_html) + kbase_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) kbase_html =3D $(kbase_html_in:%.html.in=3D%.html) =20 +kbasedir =3D $(HTML_DIR)/kbase +kbase_DATA =3D $(kbase_html) + # Generate hvsupport.html and news.html first, since they take one extra s= tep. dot_html_generated_in =3D \ hvsupport.html.in \ @@ -126,6 +143,9 @@ dot_html =3D \ $(dot_html_generated_in:%.html.in=3D%.html) \ $(dot_html_in:%.html.in=3D%.html) =20 +htmldir =3D $(HTML_DIR) +html_DATA =3D $(css) $(png) $(gif) $(dot_html) + xml =3D \ libvirt-api.xml \ libvirt-refs.xml @@ -200,16 +220,11 @@ timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"= ; \ date -u; \ fi)" =20 -all-am: web - api: libvirt-api.xml libvirt-refs.xml qemu_api: libvirt-qemu-api.xml libvirt-qemu-refs.xml lxc_api: libvirt-lxc-api.xml libvirt-lxc-refs.xml admin_api: libvirt-admin-api.xml libvirt-admin-refs.xml =20 -web: $(dot_html) $(internals_html) $(kbase_html) \ - html/index.html - hvsupport.html: hvsupport.html.in =20 hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ @@ -325,56 +340,3 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(AM_V_GEN)srcdir=3D$(srcdir) builddir=3D$(builddir) \ $(RUNUTF8) $(PYTHON) $(APIBUILD) touch $@ - - -check-local: all -dist-local: all - -rebuild: api qemu_api lxc_api admin_api all - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - for f in $(css) $(gif) $(png); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR); done - for f in $(dot_html); do \ - $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR); done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/js - for f in $(javascript); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/js/; done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/logos - for f in $(logofiles); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/logos; done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html - for h in $(apihtml); do \ - $(INSTALL) -m 0644 $$h $(DESTDIR)$(HTML_DIR)/html; done - for p in $(apipng); do \ - $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals - for f in $(internals_html); do \ - $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR)/internals; done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/kbase - for f in $(kbase_html); do \ - $(INSTALL) -m 0644 $$f $(DESTDIR)$(HTML_DIR)/kbase; done - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/fonts - for f in $(fonts); do \ - $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/fonts; \ - done - -uninstall-local: - for f in $(css) $(dot_html) $(gif) $(png) $(fonts); do \ - rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ - done - for f in $(logofiles); do \ - rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ - done - for f in $(javascript); do \ - rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ - done - for h in $(apihtml); do rm -f $(DESTDIR)$(HTML_DIR)/$$h; done - for p in $(apipng); do rm -f $(DESTDIR)$(HTML_DIR)/$$p; done - for f in $(internals_html); do \ - rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ - done - for f in $(kbase_html); do \ - rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ - done --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1574263746; cv=none; d=zoho.com; s=zohoarc; b=oKXYuWnOUEBlL3T+0ZrIKgem17PYrjwjTnrd8o+kwNf5bPyXd3OvqW+cDUTYQeeqp1E7cs+YkUQSRi6QeofYNFJIg9habCut6Q+qG4x2l371Lye1fcQTO6h5HJ450SSUqz2RCbuJ7dfR2OSGLahKTgBLd3GsJtq8mB8Ziq8+cyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263746; 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=mvln3pttzJFxzrOKvv8UcFCbNnEEU7JGksnGO0iJoWY=; b=ZJ4SDxlyrnu5eiASAWmNDbKZLNOF0fuJq5XvGAP/FxG704nTcfnXUhqKs3suVvsT1hCNNcysGfeLxPaKhQ7IW3YhgnXkHJ0cNeFci5U5g8vhXmZ1WXLgC4IMvoj7iLvacwS+scD5uYH6qY06TUxTQbVlUGZgE9wLZ/FsOuIBD6c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1574263746935156.90310651643165; Wed, 20 Nov 2019 07:29:06 -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-108-T7tlhNM_PtafLyKjgVRPPQ-1; Wed, 20 Nov 2019 10:29:03 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B11D480268F; Wed, 20 Nov 2019 15:28:57 +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 86907503F1; Wed, 20 Nov 2019 15:28:57 +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 BB24F4E566; Wed, 20 Nov 2019 15:28:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFStdQ006971 for ; Wed, 20 Nov 2019 10:28:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2BAAF65E98; Wed, 20 Nov 2019 15:28:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 669605C1D4; Wed, 20 Nov 2019 15:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263745; 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=mvln3pttzJFxzrOKvv8UcFCbNnEEU7JGksnGO0iJoWY=; b=cbfx2LwXK3xiw2psmPnprxocoMR/hGOq3DuchhMv1CLIgiwgzh3fnYXmpQronE6tWZ53Wo 4pd+qsXjU0cWZcmOFIC+J6fJGrqeXKzKkB3HopvxqQjxMoIzMtRCeRFaOkuyFpqEmmOyQD h2sA8oVuBDdW0PpfgSv9yAX9La59Pos= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:43 +0000 Message-Id: <20191120152848.2991100-3-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/7] Drop building of API -refs.xml 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.12 X-MC-Unique: T7tlhNM_PtafLyKjgVRPPQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The API cross reference files are not used since commit d3043afe5ceebd5002bff45db38bb33e090bb4af Author: Daniel Veillard Date: Mon Jan 21 08:08:33 2008 +0000 Remove docs/API*.html * docs/API* docs/api.xsl docs/site.xsl docs/Makefile.am: remove the generation of the API*.html files as it's not really useful here Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 24 +++---- docs/apibuild.py | 170 ----------------------------------------------- 2 files changed, 8 insertions(+), 186 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 60ca6aba5b..5f59d057f1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -147,20 +147,16 @@ htmldir =3D $(HTML_DIR) html_DATA =3D $(css) $(png) $(gif) $(dot_html) =20 xml =3D \ - libvirt-api.xml \ - libvirt-refs.xml + libvirt-api.xml =20 qemu_xml =3D \ - libvirt-qemu-api.xml \ - libvirt-qemu-refs.xml + libvirt-qemu-api.xml =20 lxc_xml =3D \ - libvirt-lxc-api.xml \ - libvirt-lxc-refs.xml + libvirt-lxc-api.xml =20 admin_xml =3D \ - libvirt-admin-api.xml \ - libvirt-admin-refs.xml + libvirt-admin-api.xml =20 apidir =3D $(pkgdatadir)/api api_DATA =3D \ @@ -220,10 +216,10 @@ timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"= ; \ date -u; \ fi)" =20 -api: libvirt-api.xml libvirt-refs.xml -qemu_api: libvirt-qemu-api.xml libvirt-qemu-refs.xml -lxc_api: libvirt-lxc-api.xml libvirt-lxc-refs.xml -admin_api: libvirt-admin-api.xml libvirt-admin-refs.xml +api: libvirt-api.xml +qemu_api: libvirt-qemu-api.xml +lxc_api: libvirt-lxc-api.xml +admin_api: libvirt-admin-api.xml =20 hvsupport.html: hvsupport.html.in =20 @@ -285,13 +281,9 @@ python_generated_files =3D \ html/libvirt-libvirt-admin.html \ html/libvirt-virterror.html \ libvirt-api.xml \ - libvirt-refs.xml \ libvirt-lxc-api.xml \ - libvirt-lxc-refs.xml \ libvirt-qemu-api.xml \ - libvirt-qemu-refs.xml \ libvirt-admin-api.xml \ - libvirt-admin-refs.xml \ $(NULL) =20 APIBUILD=3D$(srcdir)/apibuild.py diff --git a/docs/apibuild.py b/docs/apibuild.py index dedeb86f3d..5a0224c1c6 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2323,166 +2323,6 @@ class docBuilder: output.write(" \= n" % (id)) output.write(" \n") =20 - def serialize_xrefs_files(self, output): - headers =3D sorted(self.headers.keys()) - for file in headers: - module =3D self.modulename_file(file) - output.write(" \n" % (module)) - dict =3D self.headers[file] - ids =3D uniq(list(dict.functions.keys()) + - list(dict.variables.keys()) + - list(dict.macros.keys()) + - list(dict.typedefs.keys()) + - list(dict.structs.keys()) + - list(dict.enums.keys())) - for id in ids: - output.write(" \n" % (id)) - output.write(" \n") - pass - - def serialize_xrefs_functions(self, output): - funcs =3D {} - for name in self.idx.functions.keys(): - id =3D self.idx.functions[name] - try: - (ret, params, desc) =3D id.info - for param in params: - if param[0] =3D=3D 'void': - continue - if param[0] in funcs: - funcs[param[0]].append(name) - else: - funcs[param[0]] =3D [name] - except Exception: - pass - typ =3D sorted(funcs.keys()) - for type in typ: - if type in ['', "void", "int", "char *", "const char *"]: - continue - output.write(" \n" % (type)) - ids =3D funcs[type] - ids.sort() - pid =3D '' # not sure why we have dups, but get rid of them! - for id in ids: - if id !=3D pid: - output.write(" \n" % (id)) - pid =3D id - output.write(" \n") - - def serialize_xrefs_constructors(self, output): - funcs =3D {} - for name in self.idx.functions.keys(): - id =3D self.idx.functions[name] - try: - (ret, params, desc) =3D id.info - if ret[0] =3D=3D "void": - continue - if ret[0] in funcs: - funcs[ret[0]].append(name) - else: - funcs[ret[0]] =3D [name] - except Exception: - pass - typ =3D sorted(funcs.keys()) - for type in typ: - if type in ['', "void", "int", "char *", "const char *"]: - continue - output.write(" \n" % (type)) - ids =3D sorted(funcs[type]) - for id in ids: - output.write(" \n" % (id)) - output.write(" \n") - - def serialize_xrefs_alpha(self, output): - letter =3D None - ids =3D sorted(self.idx.identifiers.keys()) - for id in ids: - if id[0] !=3D letter: - if letter is not None: - output.write(" \n") - letter =3D id[0] - output.write(" \n" % (letter)) - output.write(" \n" % (id)) - if letter is not None: - output.write(" \n") - - def serialize_xrefs_references(self, output): - typ =3D sorted(self.idx.identifiers.keys()) - for id in typ: - idf =3D self.idx.identifiers[id] - module =3D idf.header - output.write(" \n" % - (id, 'html/' + self.basename + '-' + - self.modulename_file(module) + '.html#' + - id)) - - def serialize_xrefs_index(self, output): - index =3D self.xref - typ =3D sorted(index.keys()) - letter =3D None - count =3D 0 - chunk =3D 0 - chunks =3D [] - first_letter =3D None - for id in typ: - if len(index[id]) > 30: - continue - if id[0] !=3D letter: - if letter is None or count > 200: - if letter is not None: - output.write(" \n") - output.write(" \n") - count =3D 0 - chunks.append(["chunk%s" % (chunk - 1), first_lett= er, letter]) - output.write(" \n" % (chunk= )) - first_letter =3D id[0] - chunk =3D chunk + 1 - elif letter is not None: - output.write(" \n") - letter =3D id[0] - output.write(" \n" % (letter)) - output.write(" \n" % (id)) - tokens =3D index[id] - tokens.sort() - tok =3D None - for token in tokens: - if tok =3D=3D token: - continue - tok =3D token - output.write(" \n" % (token)) - count =3D count + 1 - output.write(" \n") - if letter is not None: - output.write(" \n") - output.write(" \n") - if count !=3D 0: - chunks.append(["chunk%s" % (chunk - 1), first_letter, lett= er]) - output.write(" \n") - for ch in chunks: - output.write(" \n" % ( - ch[0], ch[1], ch[2])) - output.write(" \n") - - def serialize_xrefs(self, output): - output.write(" \n") - self.serialize_xrefs_references(output) - output.write(" \n") - output.write(" \n") - self.serialize_xrefs_alpha(output) - output.write(" \n") - output.write(" \n") - self.serialize_xrefs_constructors(output) - output.write(" \n") - output.write(" \n") - self.serialize_xrefs_functions(output) - output.write(" \n") - output.write(" \n") - self.serialize_xrefs_files(output) - output.write(" \n") - output.write(" \n") - self.serialize_xrefs_index(output) - output.write(" \n") - def serialize(self): filename =3D "%s/%s-api.xml" % (self.path, self.name) if not quiet: @@ -2519,16 +2359,6 @@ class docBuilder: print("apibuild.py: %d error(s) encountered during generation"= % self.errors, file=3Dsys.stderr) sys.exit(3) =20 - filename =3D "%s/%s-refs.xml" % (self.path, self.name) - if not quiet: - print("Saving XML Cross References %s" % (filename)) - output =3D open(filename, "w") - output.write('\n') - output.write("\n" % self.name) - self.serialize_xrefs(output) - output.write("\n") - output.close() - =20 class app: def warning(self, msg): --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1574263760; cv=none; d=zoho.com; s=zohoarc; b=amn7F8YglxyCYxpvkEJIDv5M8u0N0HxuZco50CXZwHAF/kH26Lkxnqt+D3AG0rrZmgCweEmXOUv6N9Y4So4NWCzTI1KBvEAHd9jUGYP04juPST48q3HkhOlVjbOwWNGuRgA7jAV9myuJPckmwguvaw17TrSapWpd7/SK266Et+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263760; 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=pLY/OZZYETrNuk6d8Ml00dD9dRTrdO1zXI1hJKfVZe0=; b=aeitiaSZwaGlhi1uvwDgVqa1E3gH/5sj6geGQiA6xl9ZC2E7d/RTFu17LMZqOVHYvK8lRi0+DsG65AYmUYb7D0agV8y/5/G6nnM0B9qvuS8EarboSJ6sQ4v0kvuwMLPqwhPXhOdUU4VgpBYBEvpIyAdkPE+NcIdzPavgmeuxZMY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1574263760048269.4021631448861; Wed, 20 Nov 2019 07:29:20 -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-373-QdOBQaWzM7eVpqGO2X7q-g-1; Wed, 20 Nov 2019 10:29:16 -0500 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 67D02DBAA; Wed, 20 Nov 2019 15:29:07 +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 39BD31037ADB; Wed, 20 Nov 2019 15:29:07 +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 DF60218034EB; Wed, 20 Nov 2019 15:29:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFSu60006979 for ; Wed, 20 Nov 2019 10:28:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3DE2866836; Wed, 20 Nov 2019 15:28:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 858215C1D4; Wed, 20 Nov 2019 15:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263758; 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=pLY/OZZYETrNuk6d8Ml00dD9dRTrdO1zXI1hJKfVZe0=; b=UEJfnBNrC0YDkRL8y64niASUlROqTHwWzxZ4TmVzTkD087I+Pi3dG7+jI3DIcAN3gsp+3R 2JD5RLj3Sd6T491tBNCvxOUN8K4fbJI8m71p3vqv7mDSdQcm19nNGf39V/BuZ/y0a/3iCp 9cMA/47KZU4aMry5h/gWiAkOGiBtICc= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:44 +0000 Message-Id: <20191120152848.2991100-4-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/7] docs: use variable for referencing API XML filenames 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 X-MC-Unique: QdOBQaWzM7eVpqGO2X7q-g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5f59d057f1..a360b546d6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -146,18 +146,6 @@ dot_html =3D \ htmldir =3D $(HTML_DIR) html_DATA =3D $(css) $(png) $(gif) $(dot_html) =20 -xml =3D \ - libvirt-api.xml - -qemu_xml =3D \ - libvirt-qemu-api.xml - -lxc_xml =3D \ - libvirt-lxc-api.xml - -admin_xml =3D \ - libvirt-admin-api.xml - apidir =3D $(pkgdatadir)/api api_DATA =3D \ libvirt-api.xml \ @@ -202,10 +190,7 @@ CLEANFILES =3D \ $(apihtml) \ $(internals_html) \ $(kbase_html) \ - $(xml) \ - $(qemu_xml) \ - $(lxc_xml) \ - $(admin_xml) \ + $(api_DATA) \ $(dot_html_generated_in) \ aclperms.htmlinc =20 @@ -280,10 +265,7 @@ python_generated_files =3D \ html/libvirt-libvirt-qemu.html \ html/libvirt-libvirt-admin.html \ html/libvirt-virterror.html \ - libvirt-api.xml \ - libvirt-lxc-api.xml \ - libvirt-qemu-api.xml \ - libvirt-admin-api.xml \ + $(api_DATA) \ $(NULL) =20 APIBUILD=3D$(srcdir)/apibuild.py --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1574263761; cv=none; d=zoho.com; s=zohoarc; b=hYnY1txkr8tljdZ7TUNfOgrz5z3r++j5aGyMYUpsCowJTVxDlj4wBbUSmZr/aWBdaas95LOOLi2S1ZnVQcxp7IMMftzz0vzXCRO3rTVb54Y4GuNOqrFBCHhyt3JID2sY81hMtMVy9rPNv9jQV1F/Pa+dvM097OZUUUoYSFbgIE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263761; 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=TdnEQXyu4SBexZ66FaNUm/lqpHkxW4eabgKfBogF22A=; b=WI5day5t66XdDXCCmdwl+ETPzndIHtfujjt8eUy311O0uNOxSVbqAY7DLj/PSXAIOZ729d6vlA50pXikbC+t1843g/U6X1RYH90OVM2EvG54QU/KyiqLO3rXj9Hfava0Ep4cbkzaxVwtcyI/Dt+8VMeo7GPSjJqQ9WVgK4hLd7E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574263761882176.44719980129344; Wed, 20 Nov 2019 07:29:21 -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-111-XL1dkitTNxafZq4b7pxUew-1; Wed, 20 Nov 2019 10:29:18 -0500 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 B8492802699; Wed, 20 Nov 2019 15:29:11 +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 8C9F046E76; Wed, 20 Nov 2019 15:29:11 +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 3B2E64E56D; Wed, 20 Nov 2019 15:29:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFSv1h006987 for ; Wed, 20 Nov 2019 10:28:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4F34166836; Wed, 20 Nov 2019 15:28:57 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 981985C1D4; Wed, 20 Nov 2019 15:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263760; 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=TdnEQXyu4SBexZ66FaNUm/lqpHkxW4eabgKfBogF22A=; b=LOwM7ySLBA2ig3Nc9Rz5W1Uxn5QiyiZyLa5WTY22nd4rQyOalYK3pK3fqQjrSLbXi2UmmD 4yNi4L3c8i5I8eV0yC3qI2/IaTh2Fnf36r75RSUKMTxRjpu9g7uRNLjGTbWIeVXKkOJ4ly nMIlNwCcxesJqAkScHCBCBVbC41gsyI= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:45 +0000 Message-Id: <20191120152848.2991100-5-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/7] docs: generate API reference pages for admin, qemu & lxc libraries 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-MC-Unique: XL1dkitTNxafZq4b7pxUew-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 44 +++++++++++++++++++++++++++++++++++++++++++- docs/docs.html.in | 4 ++++ docs/newapi.xsl | 13 +++++++------ 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index a360b546d6..db9470ae07 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -35,6 +35,10 @@ modules =3D \ virterror \ $(NULL) =20 +modules_admin =3D libvirt-admin +modules_qemu =3D libvirt-qemu +modules_lxc =3D libvirt-lxc + apihtml =3D \ html/index.html \ $(apihtml_generated) @@ -43,6 +47,30 @@ apihtml_generated =3D \ $(addprefix html/libvirt-,$(addsuffix .html,$(modules))) \ $(NULL) =20 +apiadminhtml =3D \ + html/index-admin.html \ + $(apiadminhtml_generated) + +apiadminhtml_generated =3D \ + $(addprefix html/libvirt-,$(addsuffix .html,$(modules_admin))) \ + $(NULL) + +apiqemuhtml =3D \ + html/index-qemu.html \ + $(apiqemuhtml_generated) + +apiqemuhtml_generated =3D \ + $(addprefix html/libvirt-,$(addsuffix .html,$(modules_qemu))) \ + $(NULL) + +apilxchtml =3D \ + html/index-lxc.html \ + $(apilxchtml_generated) + +apilxchtml_generated =3D \ + $(addprefix html/libvirt-,$(addsuffix .html,$(modules_lxc))) \ + $(NULL) + apipng =3D \ html/left.png \ html/up.png \ @@ -50,7 +78,7 @@ apipng =3D \ html/right.png =20 apirefdir =3D $(HTML_DIR)/html -apiref_DATA =3D $(apihtml) $(apipng) +apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(= apipng) =20 css =3D \ generic.css \ @@ -188,6 +216,9 @@ aclperms.htmlinc: $(top_srcdir)/src/access/viraccessper= m.h \ CLEANFILES =3D \ $(dot_html) \ $(apihtml) \ + $(apiadminhtml) \ + $(apiqemuhtml) \ + $(apilxchtml) \ $(internals_html) \ $(kbase_html) \ $(api_DATA) \ @@ -252,6 +283,9 @@ EXTRA_DIST +=3D \ || { rm $@ && exit 1; } =20 $(apihtml_generated): html/index.html +$(apiadminhtml_generated): html/index-admin.html +$(apiqemuhtml_generated): html/index-qemu.html +$(apilxchtml_generated): html/index-lxc.html =20 html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ @@ -260,6 +294,14 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $= (APIBUILD_STAMP) $(srcdir)/newapi.xsl libvirt-api.xml && \ $(XMLLINT) --nonet --noout html/*.html =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 + python_generated_files =3D \ html/libvirt-libvirt-lxc.html \ html/libvirt-libvirt-qemu.html \ diff --git a/docs/docs.html.in b/docs/docs.html.in index 6cf09f51bc..268c16f3b3 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -106,6 +106,10 @@ secret, storage, stream + and + admin, + QEMU, + LXC libs =20
Drivers
diff --git a/docs/newapi.xsl b/docs/newapi.xsl index ca8c703d5c..dd6169397b 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -23,6 +23,7 @@ =20 + =20 html @@ -101,10 +102,10 @@ <= img src=3D"left.png" width=3D"24" height=3D"24" border=3D"0" alt=3D"Prev"><= /img> - 3D"Up" - API documentation - 3D"Home" - The virtualization = API + 3D"Up" + API documentation + 3D"Home" + The virtualizatio= n API 3D"Next" @@ -830,12 +831,12 @@ - + --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1574263757; cv=none; d=zoho.com; s=zohoarc; b=l8xUw3DRAqsJNeh1tZVkGg6V2r9CZO0D8KSc1858y3Pa5msiiZQZf2JTmmUI3I9VXRquqjaCN5u4DIOsPG0EJ4jUDeNVf5D10+4kempNuAQ46eNk+kkxUxHf0X3IxRnozlIlCI81JqH9aVqerm5DGAL5PJBoEFoylJ0W+ZWSmM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263757; 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=VLI2vV5qTzXBuvkqIgeyUXuKSMAfx+D9BDuqDxhCvaI=; b=bpgKRG/JvIQaFmL3DWkWfMOp6U/OK6LDzhPcJaejWxL5UAOxoEF+p3eOz/1ffQ/Fd/vOM0yn1M5WqezV+OL0+WQwQYhFjDmQ+L2W94u38m+fRRzvitNH9uBcsJCgRMBfjNVoj8GcHSJJbbtU12JEX3xlfXTFC5o4pZkeWNWssMg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1574263757649527.6052409946558; Wed, 20 Nov 2019 07:29:17 -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-357-jEFiYHxJPeakuAox4nCnbQ-1; Wed, 20 Nov 2019 10:29:14 -0500 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 6B731107ACE3; Wed, 20 Nov 2019 15:29:07 +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 3908E6BF86; Wed, 20 Nov 2019 15:29:07 +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 E350618034EC; Wed, 20 Nov 2019 15:29:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFSwJH007000 for ; Wed, 20 Nov 2019 10:28:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 564CE66836; Wed, 20 Nov 2019 15:28:58 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EB2C5C1D4; Wed, 20 Nov 2019 15:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263756; 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=VLI2vV5qTzXBuvkqIgeyUXuKSMAfx+D9BDuqDxhCvaI=; b=gZHxn+f8xtviIlQn4UB5vy9v2QfFDpprRpvrfV935B9DS29kNKFUeu+GfyQLOt3NsEaPLB ZyNIha7Bcj3H3zMpXiODCLzyWmxaPpJmgxRTDwdKSA7YVcO5rD89DuFY6bAQXcjGicwgZ7 skxwNlc8NYB03K26fAseJH/2Y5ogEcM= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:46 +0000 Message-Id: <20191120152848.2991100-6-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/7] docs: remove unused make targets 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 X-MC-Unique: jEFiYHxJPeakuAox4nCnbQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index db9470ae07..50b2fd7066 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -232,11 +232,6 @@ timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH";= \ date -u; \ fi)" =20 -api: libvirt-api.xml -qemu_api: libvirt-qemu-api.xml -lxc_api: libvirt-lxc-api.xml -admin_api: libvirt-admin-api.xml - hvsupport.html: hvsupport.html.in =20 hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1574263765; cv=none; d=zoho.com; s=zohoarc; b=nS25eaN9R9a5y+UMg4HIBM1tq9I2MP1tRK4I+SrWyQk7T+P41NxiisckauZWcSP6EzqvPdAArAkRr5xyhuS3he66RLh16mLNsRi8uNigSUcmhri7oEzTJVqhYevSf6gSn21zWgw6vVjEDtqz1qKRiVrVA7Jzj3iE9YTSMMaDoiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263765; 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=aGnd7Mb/0x2O+DkXxaE1AbKqyoibeW91vz4YnqSh9tw=; b=axM/JEokD0jq2HCvyuej3N0OAO8A5oE4xIqP94wkvyfsyeRmcP414c9a6POQtZSEZMdZSWEQYtQzHUNz/vL1q8qzJni31AnBc08P2p0pnzt0pzUWuHjo1W06VcNkanhmhm5B8f/CB8IhpnMMuTpnThqyxdofYvSbE2TI5/wxarA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1574263765312917.5627898560693; Wed, 20 Nov 2019 07:29:25 -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-278-DuOkrXmUNRqiLeUozulUOA-1; Wed, 20 Nov 2019 10:29:22 -0500 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 B16DE80269E; Wed, 20 Nov 2019 15:29:15 +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 852E32AA8C; Wed, 20 Nov 2019 15:29:15 +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 3B98F18034EF; Wed, 20 Nov 2019 15:29:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFSxiK007007 for ; Wed, 20 Nov 2019 10:28:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 68BB866836; Wed, 20 Nov 2019 15:28:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1DFE5C1D4; Wed, 20 Nov 2019 15:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263764; 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=aGnd7Mb/0x2O+DkXxaE1AbKqyoibeW91vz4YnqSh9tw=; b=JJFekf4LvmYPC5mB50T6zhPQ/0hEzbhGsvU3Umrn29qLSzXjpe3hYgV5GFMf1q8u/UKZ93 fCdge2b3NnsbrjpeY9ofe7BYoH+VKpFILPPeJOtbGeIawZsVD0S2amAKU+BfiAmMN4F27J m+tp+ZtHD/Skl4Q5sWpeTq8zVq2o5Xk= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:47 +0000 Message-Id: <20191120152848.2991100-7-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/7] docs: fix ability to view web pages from build tree 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 X-MC-Unique: DuOkrXmUNRqiLeUozulUOA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Some of the web content is only present in the source tree, thus when viewing pages from the build tree they appear missing. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 50b2fd7066..0c828102e1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -39,6 +39,30 @@ modules_admin =3D libvirt-admin modules_qemu =3D libvirt-qemu modules_lxc =3D libvirt-lxc =20 +all: vpathhack + +# This hack enables us to view the web pages +# from within the uninstalled build tree +vpathhack: + for dir in fonts js logos; \ + do \ + ln -s $(srcdir)/$$dir $$dir ; \ + done + for file in $(css); \ + do \ + ln -s $(srcdir)/$$file $$file ; \ + done + +clean-local: + for dir in fonts js logos; \ + do \ + rm -f $$dir ; \ + done + for file in $(css); \ + do \ + rm -f $$file ; \ + done + apihtml =3D \ html/index.html \ $(apihtml_generated) --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 05:36:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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=1574263810; cv=none; d=zoho.com; s=zohoarc; b=XCO4q5VIIkYc2/AComiYdJ08kw0b816b5/17+dpNqrPPA43Ftcvo72+cW7QvA40B1Gf3cUJ0cUvp+sYehSjQESLu5r4U3jRSdi4YBnL2EF3sgBMdZY1JCRRSRRCdcExwubtdtdedbD3limSBX572rryY8yfIUIqDFK6zgy40tBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574263810; 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=49oAMACEWWt68xnYY57tlL70Ou+IZyh0wwacFNc2g24=; b=hO+Qa/iGpMJT6PFsAmglYKLzRlDmPqUIoRWsANBprHhiISbj9Upn4xrZ/JNGwJfVUvW2246p6FuYGI5hkiHdeeT+bP6zVkbqHwgP/u3oLxHQWW8Fw9Y1ayS2iCE5cplXkIDFUCBxAXqOQuhuzw94cfmKqq3ICwo4jSC/u4l5Ap0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574263810475337.15645109303966; Wed, 20 Nov 2019 07:30:10 -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-234-DBkOOqrxNCuE165wba504Q-1; Wed, 20 Nov 2019 10:29:25 -0500 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 CD0A41005512; Wed, 20 Nov 2019 15:29:19 +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 A73566BF8A; Wed, 20 Nov 2019 15:29:19 +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 5384418034FA; Wed, 20 Nov 2019 15:29:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKFT0hU007015 for ; Wed, 20 Nov 2019 10:29:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7BDB06726F; Wed, 20 Nov 2019 15:29:00 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2ED65C1D4; Wed, 20 Nov 2019 15:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263808; 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=49oAMACEWWt68xnYY57tlL70Ou+IZyh0wwacFNc2g24=; b=DrHBdq69OsnS3XSM7UO+070E6mxeo7v6HSrsXtY4FTZ54I9UujJc58afVX6xWTnrsIQIkp wVO2gb8T7ZK8BttCkqAQ4duw+35xrmE18+WAvU3hEU5JJbS0KKEYU/peDQ1tHUCliyGCU8 BMYt5G3DizKPoRMrwuapVvafyvUq4DY= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:28:48 +0000 Message-Id: <20191120152848.2991100-8-berrange@redhat.com> In-Reply-To: <20191120152848.2991100-1-berrange@redhat.com> References: <20191120152848.2991100-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/7] docs: fix include of ACL permissions 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.13 X-MC-Unique: DBkOOqrxNCuE165wba504Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The XSL generator loads included HTML files relative to the source dir but we need to tell it to load them from the build dir instead. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/Makefile.am | 1 + docs/newapi.xsl | 1 - docs/page.xsl | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0c828102e1..d4633b5d2f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -293,6 +293,7 @@ EXTRA_DIST +=3D \ style=3Dsubsite.xsl; \ fi; \ $(XSLTPROC) --stringparam pagename $$name \ + --stringparam builddir '$(abs_top_builddir)' \ --stringparam timestamp $(timestamp) --nonet \ $(top_srcdir)/docs/$$style $< > $@ \ || { rm $@ && exit 1; } diff --git a/docs/newapi.xsl b/docs/newapi.xsl index dd6169397b..670879dc48 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -22,7 +22,6 @@ =20 - =20 diff --git a/docs/page.xsl b/docs/page.xsl index 65ddeb2bb7..6f429ae087 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -7,6 +7,8 @@ exclude-result-prefixes=3D"xsl exsl html" version=3D"1.0"> =20 + + @@ -168,7 +170,7 @@ =20 - + =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list