[gnome-bluetooth] build: Rename build options
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] build: Rename build options
- Date: Wed, 15 Nov 2017 12:51:54 +0000 (UTC)
commit b029fbe1ac0716163193a7e896a84e0f08bbcfdf
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Tue Nov 14 09:59:24 2017 +0100
build: Rename build options
Following the new meson porting guidelines, this patch renames the
build options as follows:
- Remove the 'enable' prefix from boolean options.
- Remove the 'with' prefix from string options.
- The character separator in multi-word options has been changed
to underscore.
https://bugzilla.gnome.org/show_bug.cgi?id=790332
meson.build | 6 +++---
meson_options.txt | 6 +++---
meson_post_install.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 87a9ca0..ead2206 100644
--- a/meson.build
+++ b/meson.build
@@ -41,8 +41,8 @@ gnomebt_buildtype = get_option('buildtype')
gnomebt_debug = gnomebt_buildtype.contains('debug')
# options
-enable_gtk_doc = get_option('enable-gtk-doc')
-enable_gir = get_option('enable-introspection')
+enable_gtk_doc = get_option('gtk_doc')
+enable_gir = get_option('introspection')
# Before making a release, the GNOMEBT_LT_VERSION string should be modified.
# The string is of the form C:R:A.
@@ -175,7 +175,7 @@ endif
subdir('po')
-meson.add_install_script('meson_post_install.py', get_option('enable-icon-update') ? 'icon-update' : '')
+meson.add_install_script('meson_post_install.py', get_option('icon_update') ? 'icon_update' : '')
output = '\nConfigure summary:\n\n'
output += ' Compiler....................: ' + cc.get_id() + '\n\n'
diff --git a/meson_options.txt b/meson_options.txt
index 8bee50b..1defb70 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
-option('enable-icon-update', type: 'boolean', value: true, description: 'Enable icon cache update')
-option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
-option('enable-introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection
(depends on GObject)')
+option('icon_update', type: 'boolean', value: true, description: 'Enable icon cache update')
+option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends on
GObject)')
diff --git a/meson_post_install.py b/meson_post_install.py
index ffcc071..824a94c 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -13,6 +13,6 @@ icon_dir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'icons', 'h
[os.rename(file, os.path.join(os.path.dirname(file), name_pattern.search(file).group(1)))
for file in glob.glob(icon_dir + search_pattern, recursive=True)]
-if not os.environ.get('DESTDIR') and sys.argv[1] == 'icon-update':
+if not os.environ.get('DESTDIR') and sys.argv[1] == 'icon_update':
print('Update icon cache...')
subprocess.call(['gtk-update-icon-cache', '-f', '-t', icon_dir])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]