[gtk-doc/wip/smcv/ci-meson-tests: 1/3] tests: Generate gtkdocentities.xml during Meson build




commit 4376d3c8a8427f23bea21e3a770f8489d2fe5cd1
Author: Simon McVittie <smcv debian org>
Date:   Fri Aug 21 14:27:20 2020 +0100

    tests: Generate gtkdocentities.xml during Meson build
    
    Otherwise tests will fail when we can't load external entities from it.
    
    Signed-off-by: Simon McVittie <smcv debian org>

 meson.build                            | 7 ++++++-
 tests/annotations/docs/meson.build     | 2 ++
 tests/annotations/docs/xml/meson.build | 5 +++++
 tests/bugs/docs/meson.build            | 2 ++
 tests/bugs/docs/xml/meson.build        | 5 +++++
 tests/empty/docs/meson.build           | 2 ++
 tests/empty/docs/xml/meson.build       | 5 +++++
 tests/fail/docs/meson.build            | 2 ++
 tests/fail/docs/xml/meson.build        | 5 +++++
 tests/gobject/docs/meson.build         | 2 ++
 tests/gobject/docs/xml/meson.build     | 5 +++++
 tests/gtkdocentities.ent.in            | 7 +++++++
 tests/program/docs/meson.build         | 2 ++
 tests/program/docs/xml/meson.build     | 5 +++++
 tests/repro/docs/meson.build           | 2 ++
 15 files changed, 57 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index e821e35..0345989 100644
--- a/meson.build
+++ b/meson.build
@@ -99,7 +99,12 @@ binary_in.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
 binary_in.set('datadir', '${datarootdir}')
 
 binary_in.set('PACKAGE', package_name)
-
+binary_in.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/gtk-doc/issues')
+binary_in.set('PACKAGE_NAME', package_name)
+binary_in.set('PACKAGE_STRING', package_name)
+binary_in.set('PACKAGE_TARNAME', package_name)
+binary_in.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/gtk-doc')
+binary_in.set('PACKAGE_VERSION', version)
 binary_in.set('VERSION', version)
 
 foreach binary: gtkdoc_binaires
diff --git a/tests/annotations/docs/meson.build b/tests/annotations/docs/meson.build
index 2ec4b8f..bc27cf8 100644
--- a/tests/annotations/docs/meson.build
+++ b/tests/annotations/docs/meson.build
@@ -21,6 +21,8 @@ annotations_test_output_dir = join_paths(
 
 annotations_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-annotations-scan',
   python_prg,
diff --git a/tests/annotations/docs/xml/meson.build b/tests/annotations/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/annotations/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/bugs/docs/meson.build b/tests/bugs/docs/meson.build
index e70f1c1..add878f 100644
--- a/tests/bugs/docs/meson.build
+++ b/tests/bugs/docs/meson.build
@@ -21,6 +21,8 @@ bugs_test_output_dir = join_paths(
 
 bugs_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-bugs-scan',
   python_prg,
diff --git a/tests/bugs/docs/xml/meson.build b/tests/bugs/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/bugs/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/empty/docs/meson.build b/tests/empty/docs/meson.build
index f05939c..d002f43 100644
--- a/tests/empty/docs/meson.build
+++ b/tests/empty/docs/meson.build
@@ -21,6 +21,8 @@ empty_test_output_dir = join_paths(
 
 empty_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-empty-scan',
   python_prg,
diff --git a/tests/empty/docs/xml/meson.build b/tests/empty/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/empty/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/fail/docs/meson.build b/tests/fail/docs/meson.build
index 8a5b9c2..f578b9b 100644
--- a/tests/fail/docs/meson.build
+++ b/tests/fail/docs/meson.build
@@ -21,6 +21,8 @@ fail_test_output_dir = join_paths(
 
 fail_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-fail-scan',
   python_prg,
diff --git a/tests/fail/docs/xml/meson.build b/tests/fail/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/fail/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build
index e1e6acc..08acd74 100644
--- a/tests/gobject/docs/meson.build
+++ b/tests/gobject/docs/meson.build
@@ -21,6 +21,8 @@ gobject_test_output_dir = join_paths(
 
 gobject_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-gobject-scan',
   python_prg,
diff --git a/tests/gobject/docs/xml/meson.build b/tests/gobject/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/gobject/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/gtkdocentities.ent.in b/tests/gtkdocentities.ent.in
new file mode 100644
index 0000000..c4ba2bf
--- /dev/null
+++ b/tests/gtkdocentities.ent.in
@@ -0,0 +1,7 @@
+<!ENTITY package "${PACKAGE}">
+<!ENTITY package_bugreport "${PACKAGE_BUGREPORT}">
+<!ENTITY package_name "${PACKAGE_NAME}">
+<!ENTITY package_string "${PACKAGE_STRING}">
+<!ENTITY package_tarname "${PACKAGE_TARNAME}">
+<!ENTITY package_url "${PACKAGE_URL}">
+<!ENTITY package_version "${PACKAGE_VERSION}">
diff --git a/tests/program/docs/meson.build b/tests/program/docs/meson.build
index 1520e7e..5806fc2 100644
--- a/tests/program/docs/meson.build
+++ b/tests/program/docs/meson.build
@@ -21,6 +21,8 @@ program_test_output_dir = join_paths(
 
 program_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-program-scan',
   python_prg,
diff --git a/tests/program/docs/xml/meson.build b/tests/program/docs/xml/meson.build
new file mode 100644
index 0000000..94eca1a
--- /dev/null
+++ b/tests/program/docs/xml/meson.build
@@ -0,0 +1,5 @@
+configure_file(
+  input: join_paths(srcdir, 'tests', 'gtkdocentities.ent.in'),
+  output: 'gtkdocentities.ent',
+  configuration: binary_in,
+)
diff --git a/tests/repro/docs/meson.build b/tests/repro/docs/meson.build
index 08a0f08..09554f9 100644
--- a/tests/repro/docs/meson.build
+++ b/tests/repro/docs/meson.build
@@ -21,6 +21,8 @@ repro_test_output_dir = join_paths(
 
 repro_test_html_data = []
 
+subdir('xml')
+
 test(
   'test-repro-scan',
   python_prg,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]