summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-01 12:57:16 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-07-01 20:16:37 -0400
commit4eaf860e8674c6a30385e5eb55bb056bb02560d6 (patch)
tree624b877974af1be168b9446158c5c69fecfc43f8
parentf6019f1a16345e591fcc778b5383085d5046a64a (diff)
downloadgtk+-4eaf860e8674c6a30385e5eb55bb056bb02560d6.tar.gz
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.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--docs/reference/gdk/meson.build2
-rw-r--r--docs/reference/gsk/meson.build2
-rw-r--r--docs/reference/gtk/building.sgml8
-rw-r--r--docs/reference/gtk/meson.build2
-rw-r--r--docs/reference/meson.build2
-rw-r--r--docs/tools/meson.build2
-rw-r--r--meson.build2
-rw-r--r--meson_options.txt2
9 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf08e699a7..20b4919b53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ pages:
image: registry.gitlab.gnome.org/gnome/gtk/master:v6
stage: deploy
script:
- - meson -Ddocumentation=true _build .
+ - meson -Dgtk_doc=true _build .
- ninja -C _build
- ninja -C _build gdk4-doc gsk4-doc gtk4-doc
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')