callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Follow gnome conventions for build option names

Browse Source
This commit is contained in:
Christoph Reiter 2019-04-04 08:48:34 +02:00
parent 0432b22e02
commit 3462fcf9a0
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci/test-docker-meson.sh
View File

@ -10,11 +10,11 @@ export PATH="${HOME}/.local/bin:${PATH}"
python3 -m pip install --user meson==0.49.2
meson \
-Ddocumentation=true \
-Dman-pages=true \
-Dbroadway-backend=true \
-Dgtk_doc=true \
-Dman=true \
-Dbroadway_backend=true \
-Dxinerama=yes \
-Dprint-backends="file,lpr,test,cloudprint,cups" \
-Dprint_backends="file,lpr,test,cloudprint,cups" \
_build
cd _build

4
.gitlab-ci/test-msys2-meson.sh
View File

@ -40,8 +40,8 @@ ccache --zero-stats
ccache --show-stats
meson \
-Dman-pages=true \
-Dbroadway-backend=true \
-Dman=true \
-Dbroadway_backend=true \
_build
ninja -C _build

2
docs/reference/gdk/meson.build
View File

@ -154,7 +154,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)

6
docs/reference/gtk/meson.build
View File

@ -445,7 +445,7 @@ else
types_conf.set('ENABLE_ON_X11', '%')
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)
@ -485,11 +485,11 @@ if get_option('documentation')
endif
xsltproc = find_program('xsltproc', required: false)
if get_option('man-pages') and not xsltproc.found()
if get_option('man') and not xsltproc.found()
error('No xsltproc found, but man pages were explicitly enabled')
endif
if get_option('man-pages') and xsltproc.found()
if get_option('man') and xsltproc.found()
xlstproc_flags = [
'--nonet',
'--stringparam', 'man.output.quietly', '1',

2
docs/reference/libgail-util/meson.build
View File

@ -1,4 +1,4 @@
if get_option('documentation')
if get_option('gtk_doc')
configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
gnome.gtkdoc('gail-libgail-util3',

2
docs/reference/meson.build
View File

@ -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')

2
docs/tools/meson.build
View File

@ -1,4 +1,4 @@
if x11_enabled and get_option('documentation')
if x11_enabled
doc_shooter_sources = [
'shadow.c',
'shooter.c',

22
meson.build
View File

@ -112,11 +112,11 @@ gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_
gtk_api_version = '@0@.0'.format(gtk_major_version)
x11_enabled = get_option('x11-backend')
wayland_enabled = get_option('wayland-backend')
broadway_enabled = get_option('broadway-backend')
quartz_enabled = get_option('quartz-backend')
win32_enabled = get_option('win32-backend')
x11_enabled = get_option('x11_backend')
wayland_enabled = get_option('wayland_backend')
broadway_enabled = get_option('broadway_backend')
quartz_enabled = get_option('quartz_backend')
win32_enabled = get_option('win32_backend')
os_unix = false
os_linux = false
@ -824,11 +824,11 @@ subdir('libgail-util')
if get_option('demos')
subdir('demos')
endif
if get_option('build-tests')
if get_option('tests')
subdir('tests')
subdir('testsuite')
endif
if get_option('build-examples')
if get_option('examples')
subdir('examples')
endif
@ -975,11 +975,11 @@ summary = [
' Cloud support: @0@'.format(get_option('cloudproviders')),
' Colord support: @0@'.format(get_option('colord')),
' Introspection: @0@'.format(get_option('introspection')),
' Documentation: @0@'.format(get_option('documentation')),
' Man pages: @0@'.format(get_option('man-pages')),
' Build tests: @0@'.format(get_option('build-tests')),
' Documentation: @0@'.format(get_option('gtk_doc')),
' Man pages: @0@'.format(get_option('man')),
' Build tests: @0@'.format(get_option('tests')),
' Demos: @0@'.format(get_option('demos')),
' Examples: @0@'.format(get_option('build-examples')),
' Examples: @0@'.format(get_option('examples')),
'Directories:',
' prefix: @0@'.format(gtk_prefix),
' includedir: @0@'.format(gtk_includedir),

22
meson_options.txt
View File

@ -1,13 +1,13 @@
# GDK backends
option('x11-backend', type: 'boolean', value: true,
option('x11_backend', type: 'boolean', value: true,
description : 'Enable the X11 gdk backend (only when building on Unix)')
option('wayland-backend', type: 'boolean', value: true,
option('wayland_backend', type: 'boolean', value: true,
description : 'Enable the wayland gdk backend (only when building on Unix except for macOS)')
option('broadway-backend', type: 'boolean', value: false,
option('broadway_backend', type: 'boolean', value: false,
description : 'Enable the broadway (HTML5) gdk backend')
option('win32-backend', type: 'boolean', value: true,
option('win32_backend', type: 'boolean', value: true,
description : 'Enable the Windows gdk backend (only when building on Windows)')
option('quartz-backend', type: 'boolean', value: true,
option('quartz_backend', type: 'boolean', value: true,
description : 'Enable the macOS gdk backend (only when building on macOS)')
# Optional dependencies
@ -17,15 +17,15 @@ option('cloudproviders', type: 'boolean', value: false,
description : 'Enable the cloudproviders support')
# Print backends
option('print-backends', type : 'string', value : 'auto',
option('print_backends', type : 'string', value : 'auto',
description : 'Build the specified print backends (comma-separated list, any of "cloudprint,cups,file,lpr,papi,test" or "auto")')
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',
description : 'Build API reference and tools documentation')
option('man-pages', type: 'boolean', value: 'false',
option('gtk_doc', type: 'boolean', value: 'false',
description : 'Build API reference with gtk-doc')
option('man', type: 'boolean', value: 'false',
description : 'Build man pages for installed tools')
option('introspection', type: 'boolean', value: 'true',
description : 'Build introspection data (requires gobject-introspection)')
@ -33,9 +33,9 @@ option('introspection', type: 'boolean', value: 'true',
# Demos and binaries
option('demos', type: 'boolean', value: 'true',
description : 'Build demo programs')
option('build-examples', type: 'boolean', value: 'true',
option('examples', type: 'boolean', value: 'true',
description : 'Build examples')
option('build-tests', type: 'boolean', value: 'true',
option('tests', type: 'boolean', value: 'true',
description : 'Build tests')
# input modules

4
modules/printbackends/meson.build
View File

@ -17,11 +17,11 @@ foreach backend: all_print_backends
endforeach
print_strict_deps = true
if get_option('print-backends') == 'auto'
if get_option('print_backends') == 'auto'
enabled_print_backends = auto_print_backends
print_strict_deps = false
else
wanted_print_backends = get_option('print-backends').split(',')
wanted_print_backends = get_option('print_backends').split(',')
enabled_print_backends = []
foreach backend: wanted_print_backends
if backend != ''