[gnome-characters: 1/2] build: Use meson's default options for devel builds
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-characters: 1/2] build: Use meson's default options for devel builds
- Date: Tue, 10 Jul 2018 08:48:14 +0000 (UTC)
commit 294c70632619be901ac99cd3689023b9f0178ac2
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Mon Jul 9 13:16:42 2018 +0200
build: Use meson's default options for devel builds
Following meson porting guidelines[0], the profile option has been
replaced by meson's `buildtype` option. This option offers the
following build types[1]:
- plain
- debug
- debugoptimized
- release
When hacking the source code, the `debug*` options should be used,
and this options can replace the `development` profile, while
`plain` and `release` options can replace the `default` profile.
[0] https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
[1] http://mesonbuild.com/Running-Meson.html#configuring-the-source
meson.build | 10 +---------
meson_options.txt | 1 -
2 files changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index d4f8eaa..d2c2912 100644
--- a/meson.build
+++ b/meson.build
@@ -6,17 +6,9 @@ project(
meson_version: '>= 0.42.0'
)
-if get_option('profile') == 'development'
- profile = 'Devel'
- name_suffix = ' (Development Snapshot)'
-else
- profile = ''
- name_suffix = ''
-endif
-
characters_name = 'org.gnome.Characters'
characters_background_name = characters_name + '.BackgroundService'
-characters_application_id = characters_name + profile
+characters_application_id = characters_name + (get_option('buildtype').contains('debug') ? 'Devel' : '')
characters_version = meson.project_version()
diff --git a/meson_options.txt b/meson_options.txt
index 7725e2c..62ff6fa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
option('dbus_service_dir', type: 'string', value: '', description: 'custom directory for dbus service files')
option('pangoft2', type: 'boolean', value: true, description: 'enable pangoft2 support')
option('installed_tests', type: 'boolean', value: false, description: 'Enable installation of some test
cases')
-option ('profile', type: 'combo', choices: ['default', 'development'], value: 'default')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]