[gtk/option-names] meson: Rename documentation option to gtk_doc



commit b1ebbda94897f340ddaa64cd0c69b31bb6d41c49
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 1 12:57:16 2019 -0400

    meson: Rename documentation option to gtk_doc
    
    This name is what most of the stack is using.
    Lets follow along, even though it is (imo)
    uglier.

 docs/reference/gdk/meson.build   | 2 +-
 docs/reference/gsk/meson.build   | 2 +-
 docs/reference/gtk/building.sgml | 8 ++++----
 docs/reference/gtk/meson.build   | 2 +-
 docs/reference/meson.build       | 2 +-
 docs/tools/meson.build           | 2 +-
 meson.build                      | 2 +-
 meson_options.txt                | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 39ce4b3d42..707481d90a 100644
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -99,7 +99,7 @@ if wayland_enabled
   src_dir += [ gdkwayland_inc ]
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gdk4',
diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
index 7e33a9bad3..6f95e8e206 100644
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -34,7 +34,7 @@ private_headers = [
 images = [
 ]
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
   gnome.gtkdoc('gsk4',
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index ccdd787210..86d059fe90 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -355,8 +355,8 @@ How to compile GTK itself
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Ddocumentation=true</arg>
-            <arg choice="plain">-Ddocumentation=false</arg>
+            <arg choice="plain">-Dgtk_doc=true</arg>
+            <arg choice="plain">-Dgtk_doc=false</arg>
           </group>
           <sbr/>
           <group>
@@ -382,7 +382,7 @@ How to compile GTK itself
       </formalpara>
 
       <formalpara>
-        <title><systemitem>documentation</systemitem> and
+        <title><systemitem>gtk_doc</systemitem> and
           <systemitem>man-pages</systemitem></title>
 
         <para>
@@ -394,7 +394,7 @@ How to compile GTK itself
           <application>gtk-doc</application> installed and
           are modifying GTK, you may want to enable
           <application>gtk-doc</application> support by passing
-          in <systemitem>documentation</systemitem>.
+          in <systemitem>gtk_doc</systemitem>.
         </para>
         <para>
           Additionally, some tools provided by GTK have their own
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 53d88ee9aa..1243d12c95 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -394,7 +394,7 @@ else
   types_conf.set('DISABLE_ON_QUARTZ', '')
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
   configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
   configure_file(input: 'getting_started.xml.in', output: 'getting_started.xml', configuration: src_dir_conf)
 
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 55b0fb9e47..a308cc4c87 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
   glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
   glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 
diff --git a/docs/tools/meson.build b/docs/tools/meson.build
index 5de632f141..a7ec75b447 100644
--- a/docs/tools/meson.build
+++ b/docs/tools/meson.build
@@ -1,4 +1,4 @@
-if x11_enabled and get_option('documentation')
+if x11_enabled and get_option('gtk_doc')
   doc_shooter_sources = [
     'shadow.c',
     'shooter.c',
diff --git a/meson.build b/meson.build
index 716298a7d9..483a874475 100644
--- a/meson.build
+++ b/meson.build
@@ -827,7 +827,7 @@ summary = [
   '    Colord support: @0@'.format(get_option('colord')),
   '          Profiler: @0@'.format(get_option('profiler')),
   '     Introspection: @0@'.format(get_option('introspection')),
-  '     Documentation: @0@'.format(get_option('documentation')),
+  '     Documentation: @0@'.format(get_option('gtk_doc')),
   '         Man pages: @0@'.format(get_option('man-pages')),
   '       Build tests: @0@'.format(get_option('build-tests')),
   '     Install tests: @0@'.format(get_option('install-tests')),
diff --git a/meson_options.txt b/meson_options.txt
index 20dc5d0338..73f26da7da 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,7 +31,7 @@ option('colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Build colord support for the CUPS printing backend')
 
 # Documentation and introspection
-option('documentation', type: 'boolean', value: 'false',
+option('gtk_doc', type: 'boolean', value: 'false',
   description : 'Build API reference and tools documentation')
 option('man-pages', type: 'boolean', value: 'false',
   description : 'Build man pages for installed tools')


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