[eog/wip/inigomartinez/meson: 3/3] build: Remove conditional EXIF documentation



commit eb190f2ce7414a731e04e8270e81b4e0f3e526ab
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Nov 10 11:38:10 2017 +0100

    build: Remove conditional EXIF documentation
    
    EXIF support in Eye of GNOME is conditional and it can be enabled
    by using an option. When shuch option is disabled, documentation
    generation with GtkDoc should exclude EXIF.
    
    This patch disables this behaviour also including EXIF when
    documentation is generated, however a blank page will be
    presented.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784354

 doc/reference/eog-docs.xml |    2 --
 doc/reference/meson.build  |   24 ------------------------
 2 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/doc/reference/eog-docs.xml b/doc/reference/eog-docs.xml
index 967a5f0..8aeccf2 100644
--- a/doc/reference/eog-docs.xml
+++ b/doc/reference/eog-docs.xml
@@ -60,9 +60,7 @@
       <xi:include href="xml/eog-debug.xml"/>
       <xi:include href="xml/eog-uri-converter.xml"/>
       <xi:include href="xml/eog-util.xml"/>
-      <!--
       <xi:include href="xml/eog-exif-util.xml"/>
-      -->
       <xi:include href="xml/eog-pixbuf-util.xml"/>
       <xi:include href="xml/zoom.xml"/>
     </chapter>
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 921298c..83f80f0 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -32,30 +32,6 @@ configure_file(
   configuration: version_conf
 )
 
-# FIXME: gtkdoc is not able to get a configure_object as main_xml file.
-#        https://github.com/mesonbuild/meson/issues/2271
-#        https://github.com/mesonbuild/meson/issues/1875
-#        https://github.com/mesonbuild/meson/issues/550
-'''
-# Build EXIF-related documentation if we really have support for it
-doc_conf = configuration_data()
-if have_exif or have_exempi
-  doc_conf.set('EOG_DOC_EXIF_START', '')
-  doc_conf.set('EOG_DOC_EXIF_STOP', '')
-else
-  doc_conf.set('EOG_DOC_EXIF_START', '<!--')
-  doc_conf.set('EOG_DOC_EXIF_STOP', '-->')
-endif
-
-docs_xml = meson.project_name() + '-docs.xml'
-
-main_xml = configure_file(
-  input: docs_xml + '.in',
-  output: docs_xml,
-  configuration: doc_conf
-)
-'''
-
 doc_path = join_paths(eog_datadir, 'gtk-doc', 'html', meson.project_name())
 
 gnome.gtkdoc(


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