From 916e077551e836ef13d8e655e48e8ec6a1a16d10 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 22 Jul 2020 20:20:43 +0200
Subject: [PATCH] docs: meson: Simplify generation of html files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just convert 'docs_html_in_files' into 'docs_html_in_gen'. The target
definitions for those were almost the same.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 docs/meson.build | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/docs/meson.build b/docs/meson.build
index 2f06e8eace..e81251f29d 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -192,49 +192,29 @@ docs_rst2html_gen = generator(
   capture: true,
 )
 
-foreach name : docs_html_in_files
-  html_in_file = '@0@.html.in'.format(name)
-  html_file = '@0@.html'.format(name)
-
-  out_file = custom_target(
-    html_file,
-    input: html_in_file,
-    output: html_file,
-    command: [
-      meson_python_prog,
-      python3_prog.path(),
-      meson_html_gen_prog.path(),
-      xsltproc_prog.path(),
-      xmllint_prog.path(),
-      meson.build_root(),
-      docs_timestamp,
-      site_xsl,
-      '@INPUT@',
-      '@OUTPUT@',
-      html_in_file,
-    ],
-    depends: [ aclperms_gen ],
-    depend_files: [ page_xsl ],
-    install: true,
-    install_dir: docs_html_dir,
-  )
-
-  install_web_deps += out_file
-  install_web_files += '@0@:@1@'.format(out_file.full_path(), docs_html_dir)
-endforeach
-
 
 # docs_html_in_gen:
 #   each entry is a dictionary with following items:
 #   name - base file name (required)
 #   file - generated file (required)
+# source - source filename (required)
 docs_html_in_gen = []
 
+foreach name : docs_html_in_files
+  html_in_file = '@0@.html.in'.format(name)
+  docs_html_in_gen += {
+    'name': name,
+    'file': html_in_file,
+    'source': html_in_file,
+  }
+endforeach
+
 foreach name : docs_rst_files
   rst_file = '@0@.rst'.format(name)
   docs_html_in_gen += {
     'name': name,
     'file': docs_rst2html_gen.process(rst_file),
+    'source': rst_file,
   }
 endforeach
 
@@ -262,17 +242,18 @@ hvsupport_html_in = custom_target(
 docs_html_in_gen += {
   'name': 'hvsupport',
   'file': hvsupport_html_in,
+  'source': 'hvsupport.html.in',
 }
 
 news_html_in = docs_rst2html_gen.process(meson.source_root() / 'NEWS.rst')
 docs_html_in_gen += {
   'name': 'news',
   'file': news_html_in,
+  'source': 'NEWS.rst',
 }
 
 foreach data : docs_html_in_gen
   html_file = '@0@.html'.format(data['name'])
-  rst_in_file = '@0@.rst'.format(data['name'])
 
   out_file = custom_target(
     html_file,
@@ -289,7 +270,7 @@ foreach data : docs_html_in_gen
       site_xsl,
       '@INPUT@',
       '@OUTPUT@',
-      rst_in_file,
+      data['source'],
     ],
     depends: [ aclperms_gen ],
     depend_files: [ page_xsl ],