From nobody Sat Feb 7 11:44:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1715184448310500.7803982898306; Wed, 8 May 2024 09:07:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 014FF1B9B; Wed, 8 May 2024 12:07:26 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4127A1B97; Wed, 8 May 2024 12:06:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A52A1B8F; Wed, 8 May 2024 12:06:47 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D215F1AEA for ; Wed, 8 May 2024 12:06:45 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-20-cBwF82TTOHaFfsIIR1WZaw-1; Wed, 08 May 2024 12:06:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E60B80027F for ; Wed, 8 May 2024 16:06:43 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF9D72022F10; Wed, 8 May 2024 16:06:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: cBwF82TTOHaFfsIIR1WZaw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2] docs: ensure HTML/images are built before running reference tests Date: Wed, 8 May 2024 17:06:42 +0100 Message-ID: <20240508160642.1266155-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: HGVOX2ZZZ5SNJL7LCRIUI2NQRR5PGJJ7 X-Message-ID-Hash: HGVOX2ZZZ5SNJL7LCRIUI2NQRR5PGJJ7 X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1715184448799100001 The 'check-html-references' test will process the built HTML files, so they must exist before it is run, along with any images that they point to. If using the older 'configure_file' command, no changes are needed since that always gets executed at 'meson setup' time, rather than at 'meson compile' time. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- docs/images/meson.build | 3 ++- docs/logos/meson.build | 3 ++- docs/meson.build | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) This is the only remaining unpushed patch from my previous v1 series, now I figured out how to make it compatible with old meson (see last sentence in the commit message) diff --git a/docs/images/meson.build b/docs/images/meson.build index b9ab30fc91..f3e3dd50da 100644 --- a/docs/images/meson.build +++ b/docs/images/meson.build @@ -18,7 +18,8 @@ foreach file : docs_image_files # This hack enables us to view the web pages # from within the uninstalled build tree if meson.version().version_compare('>=3D0.64.0') - fs.copyfile(file) + imgfile =3D fs.copyfile(file) + install_web_deps +=3D imgfile else configure_file(input: file, output: file, copy: true) endif diff --git a/docs/logos/meson.build b/docs/logos/meson.build index c3f4c9f522..2d9d0fcbb0 100644 --- a/docs/logos/meson.build +++ b/docs/logos/meson.build @@ -26,7 +26,8 @@ foreach file : docs_logo_files # This hack enables us to view the web pages # from within the uninstalled build tree if meson.version().version_compare('>=3D0.64.0') - fs.copyfile(file) + logofile =3D fs.copyfile(file) + install_web_deps +=3D logofile else configure_file(input: file, output: file, copy: true) endif diff --git a/docs/meson.build b/docs/meson.build index 87d728213c..2dfe98ef62 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -360,6 +360,7 @@ if tests_enabled[0] '--webroot', meson.project_build_root() / 'docs' ], + depends: install_web_deps, env: runutf8, suite: 'script' ) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org