docs: ensure HTML/images are built before running reference tests

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.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/images/meson.build b/docs/images/meson.build
index b9ab30fc91af42a4286298023c5252d2d7505abc..f3e3dd50dadd5a1a90426a3930876c33d13caced 100644 (file)
--- 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('>=0.64.0')
-    fs.copyfile(file)
+    imgfile = fs.copyfile(file)
+    install_web_deps += imgfile
   else
     configure_file(input: file, output: file, copy: true)
   endif

diff --git a/docs/logos/meson.build b/docs/logos/meson.build
index c3f4c9f522c9ff03ebeadb09ba0010ee553b54f0..2d9d0fcbb0831b1d658e273cd1a5f642df4885c0 100644 (file)
--- 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('>=0.64.0')
-    fs.copyfile(file)
+    logofile = fs.copyfile(file)
+    install_web_deps += logofile
   else
     configure_file(input: file, output: file, copy: true)
   endif

diff --git a/docs/meson.build b/docs/meson.build
index 87d728213c8210c85c3a4aed1a8d9f96e70b564f..2dfe98ef626db98155734b91b3dbe2d12c86446a 100644 (file)
--- 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'
   )