From nobody Sun Feb 8 05:07:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1587038044; cv=none; d=zohomail.com; s=zohoarc; b=inJlW1BqULAnAfyC/n0Ek+od89gPrHuwZA0Ec30n+RKTSmB8pHZwG3SmU6heJZAyCmqoAK0FFZEpsXgPqFSf64LDfVShM/mROg8OeEPqufmEpVTqoZdZ24I3E8LepyzgfPtX1Et9jQFJ+a/thwuKOoksmMfsh0ao8Ed9DBN+5Hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587038044; 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=P9hz/Z/CjuqVJfDjS6930jhoQSdG7/hAKIyQ88NESnU=; b=XBwmh4+SO89HoWZ60qmAL/v5Ll+Kp6/ryV0nGpuiAqh4QLWAF+oqQTcd7ldkS0zPwgTBhkLMGjoebzae7j28RdgR0KP8Le1Y35QWd6A4EDlbMjWazphTSRdH8g7CrZxCf/nrOP0U0kty2W0K2rkWpr8O8d3CKzlcIFLQyqlQkyc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.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 1587038044806372.2063320280163; Thu, 16 Apr 2020 04:54:04 -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-215-_czWAimpP1SliToZjxEg0A-1; Thu, 16 Apr 2020 07:54:00 -0400 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 83F3F8018A1; Thu, 16 Apr 2020 11:53:55 +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 F358D1001902; Thu, 16 Apr 2020 11:53:54 +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 22A1118089CD; Thu, 16 Apr 2020 11:53:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03GBrqVK025821 for ; Thu, 16 Apr 2020 07:53:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id B082A60BF1; Thu, 16 Apr 2020 11:53:52 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 797EA60BE0; Thu, 16 Apr 2020 11:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587038043; 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=P9hz/Z/CjuqVJfDjS6930jhoQSdG7/hAKIyQ88NESnU=; b=cbtFxD5MLYx2SXBfNh+2KJ/y/U0b0GPlWXjeJkfTErJnijGXV4d7imTpZHYAlvd2EGmHIX lyor5ZC0GvPI3i/CR2VIgMoKknSG7GJfst3jdNq/YMbEr8cKDhr1o4qyAUjQyLOFiI7klj nsSu9KSlAf5yVPS6vTwwkT4g41WNyeY= X-MC-Unique: _czWAimpP1SliToZjxEg0A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] docs: fix handling of static assets in build dir Date: Thu, 16 Apr 2020 12:53:43 +0100 Message-Id: <20200416115345.19810-2-berrange@redhat.com> In-Reply-To: <20200416115345.19810-1-berrange@redhat.com> References: <20200416115345.19810-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.22 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" We previously added a hack to symlink CSS files from the source dir into the build dir, to allow the website to be browsed locally. We should have also done this for any images. This change merges several variables into one "$(assets)" so that we treat all static files in the root dir the same way. Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/Makefile.am | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 6860efc888..c6518d653e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -48,7 +48,7 @@ vpathhack: do \ test -e $$dir || ln -s $(srcdir)/$$dir $$dir ; \ done - @for file in $(css); \ + @for file in $(assets); \ do \ test -e $$file || ln -s $(srcdir)/$$file $$file ; \ done @@ -58,7 +58,7 @@ clean-local: do \ rm -f $$dir ; \ done - for file in $(css); \ + for file in $(assets); \ do \ rm -f $$file ; \ done @@ -104,12 +104,6 @@ apipng =3D \ apirefdir =3D $(HTML_DIR)/html apiref_DATA =3D $(apihtml) $(apiadminhtml) $(apiqemuhtml) $(apilxchtml) $(= apipng) =20 -css =3D \ - generic.css \ - libvirt.css \ - mobile.css \ - main.css - javascript =3D \ js/main.js \ $(NULL) @@ -156,20 +150,23 @@ logofiles =3D \ logofilesdir =3D $(HTML_DIR)/logos logofiles_DATA =3D $(logofiles) =20 -png =3D \ +assets =3D \ 32favicon.png \ + architecture.gif \ + generic.css \ + libvirt.css \ libvirt-daemon-arch.png \ libvirt-driver-arch.png \ libvirt-object-model.png \ + main.css \ migration-managed-direct.png \ migration-managed-p2p.png \ migration-native.png \ migration-tunnel.png \ - migration-unmanaged-direct.png - -gif =3D \ - architecture.gif \ - node.gif + migration-unmanaged-direct.png \ + mobile.css \ + node.gif \ + $(NULL) =20 internals_html_in =3D \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) @@ -326,7 +323,7 @@ dot_html =3D \ $(dot_rst_html_in:%.html.in=3D%.html) =20 htmldir =3D $(HTML_DIR) -html_DATA =3D $(css) $(png) $(gif) $(dot_html) +html_DATA =3D $(assets) $(dot_html) =20 apidir =3D $(pkgdatadir)/api api_DATA =3D \ @@ -351,8 +348,8 @@ schema_DATA =3D $(wildcard $(srcdir)/schemas/*.rng) EXTRA_DIST=3D \ site.xsl subsite.xsl newapi.xsl page.xsl \ wrapstring.xsl \ - $(dot_html_in) $(dot_rst) $(gif) $(apipng) \ - $(fig) $(png) $(css) \ + $(dot_html_in) $(dot_rst) $(apipng) \ + $(fig) $(assets) \ $(javascript) $(logofiles) \ $(internals_html_in) $(internals_rst) $(fonts) \ $(kbase_html_in) $(kbase_rst) \ --=20 2.25.2