From nobody Sun Feb 8 21:29:16 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=1594894288; cv=none; d=zohomail.com; s=zohoarc; b=GhAqOmC1TTazINzNpjItzH+LiyDff69Zo4o9DoIpvp21TaPj4zju0ST8YCkuSA/IvX89OYeGs+GoX0lR4viEM9djqOnbCdeykIPMHVVUTxP8ucNVEdjnQZj60TJx9PaVORYShOOh2sv/F2aWQWHPzaYUOzIdPiR1NX8EZiu4hds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894288; 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=INb46D1Bs6/1ThoNfPkmrH8TEGtMm8zc70MGkzPL9S8=; b=OFprN5UdaUgxZOft4b8nwtNaatlRFl1XYY/K+oQmG2cR0Nczx/8Om1oumVmDEYFg5CuEb9qFTHoKIoRM24lgPwSflXwSnFznGgsaEc3jjtpPrDpN5/qXYbii6W/Yj+uLcpLVV+BFahis029vkOPgFAT2VE8GDmmOMduLiDdGCuY= 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 1594894288282509.15714940952967; Thu, 16 Jul 2020 03:11:28 -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-228-VbRNNS3fN5q3XjDLx_eurQ-1; Thu, 16 Jul 2020 06:11:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD3B108C; Thu, 16 Jul 2020 10:11: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 BC0F278483; Thu, 16 Jul 2020 10:11: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 868DF18045C1; Thu, 16 Jul 2020 10:11:15 +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 06GA7YN7021048 for ; Thu, 16 Jul 2020 06:07:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id AB8F52DE8F; Thu, 16 Jul 2020 10:07:34 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 255042DE8A for ; Thu, 16 Jul 2020 10:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894287; 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=INb46D1Bs6/1ThoNfPkmrH8TEGtMm8zc70MGkzPL9S8=; b=AM/pmVKCcZ8h5NQCaYPl0RCWwtb/9UyL4/5s06I8Z+zZYMiDmUjbsy97PD7NWJahiVlMCw BmGkjXjzawSaftYaWSQXjeU18I9Vf1q3MZ8GWPFs2IeSWGYwHsBifoYUdnFmpM0eMNgcuX rQDsNlfcYtpemRJ73s+VTSOncoF9EsE= X-MC-Unique: VbRNNS3fN5q3XjDLx_eurQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 329/351] meson: docs/html: generate libvirt API documentation Date: Thu, 16 Jul 2020 11:59:25 +0200 Message-Id: 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.11 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 --- docs/Makefile.am | 39 +------------------------------------- docs/html/meson.build | 44 +++++++++++++++++++++++++++++++++++++++++++ docs/meson.build | 4 ++++ 3 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 docs/html/meson.build diff --git a/docs/Makefile.am b/docs/Makefile.am index 7398628b6c0..7c30d75b997 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,23 +16,6 @@ ## License along with this library. If not, see ## . =20 -modules =3D \ - libvirt-common \ - libvirt-domain \ - libvirt-domain-checkpoint \ - libvirt-domain-snapshot \ - libvirt-event \ - libvirt-host \ - libvirt-interface \ - libvirt-network \ - libvirt-nodedev \ - libvirt-nwfilter \ - libvirt-secret \ - libvirt-storage \ - libvirt-stream \ - virterror \ - $(NULL) - modules_admin =3D libvirt-admin modules_qemu =3D libvirt-qemu modules_lxc =3D libvirt-lxc @@ -47,14 +30,6 @@ vpathhack: test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done =20 -apihtml =3D \ - html/index.html \ - $(apihtml_generated) - -apihtml_generated =3D \ - $(addprefix html/libvirt-,$(addsuffix .html,$(modules))) \ - $(NULL) - apiadminhtml =3D \ html/index-admin.html \ $(apiadminhtml_generated) @@ -79,14 +54,8 @@ apilxchtml_generated =3D \ $(addprefix html/libvirt-,$(addsuffix .html,$(modules_lxc))) \ $(NULL) =20 -apipng =3D \ - html/left.png \ - html/up.png \ - html/home.png \ - html/right.png - apirefdir =3D $(HTML_DIR)/html -apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(= apipng) +apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) =20 javascript =3D \ js/main.js \ @@ -271,12 +240,6 @@ $(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 ./ \ - --stringparam builddir '$(abs_top_builddir)' \ - --stringparam timestamp $(timestamp) \ - $(srcdir)/newapi.xsl libvirt-api.xml - html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ --stringparam builddir '$(abs_top_builddir)' \ diff --git a/docs/html/meson.build b/docs/html/meson.build new file mode 100644 index 00000000000..67356c7d657 --- /dev/null +++ b/docs/html/meson.build @@ -0,0 +1,44 @@ +apipng =3D [ + 'home.png', + 'left.png', + 'right.png', + 'up.png', +] + +install_data(apipng, install_dir: docs_html_dir / 'html') + +custom_target( + 'index-api', + input: [ + newapi_xsl, + docs_api_xml, + ], + output: [ + 'index.html', + 'libvirt-libvirt-common.html', + 'libvirt-libvirt-domain.html', + 'libvirt-libvirt-domain-checkpoint.html', + 'libvirt-libvirt-domain-snapshot.html', + 'libvirt-libvirt-event.html', + 'libvirt-libvirt-host.html', + 'libvirt-libvirt-interface.html', + 'libvirt-libvirt-network.html', + 'libvirt-libvirt-nodedev.html', + 'libvirt-libvirt-nwfilter.html', + 'libvirt-libvirt-secret.html', + 'libvirt-libvirt-storage.html', + 'libvirt-libvirt-stream.html', + 'libvirt-virterror.html', + ], + command: [ + xsltproc_prog, '--nonet', '-o', docs_builddir, + '--stringparam', 'builddir', meson.build_root(), + '--stringparam', 'timestamp', docs_timestamp, + '@INPUT@', + ], + install: true, + install_dir: docs_html_dir / 'html', + depend_files: [ + page_xsl, + ], +) diff --git a/docs/meson.build b/docs/meson.build index 7dc2bbdc42a..d6944ad642a 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,5 +1,8 @@ docs_html_dir =3D docdir / 'html' =20 +# xsltproc requires that the -o path ends with '/' +docs_builddir =3D meson.current_build_dir() / '' + docs_assets =3D [ 'android-chrome-192x192.png', 'android-chrome-256x256.png', @@ -282,6 +285,7 @@ foreach data : docs_html_in_gen endforeach =20 subdir('fonts') +subdir('html') =20 =20 # This hack enables us to view the web pages --=20 2.26.2