nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

**/*/meson.build: Update meson files to be more idiomatic

Browse source
This commit is contained in:
Michael Gratton 2020-03-30 19:24:57 +11:00
parent 4c5a3e860a
commit 87ca799104
9 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
meson.build
View file

@ -25,15 +25,15 @@ endif
# Configurable install dirs
geary_prefix = get_option('prefix')
bin_dir = join_paths(geary_prefix, get_option('bindir'))
data_dir = join_paths(geary_prefix, get_option('datadir'))
lib_dir = join_paths(geary_prefix, get_option('libdir'))
locale_dir = join_paths(geary_prefix, get_option('localedir'))
bin_dir = geary_prefix / get_option('bindir')
data_dir = geary_prefix / get_option('datadir')
lib_dir = geary_prefix / get_option('libdir')
locale_dir = geary_prefix / get_option('localedir')
# Source dirs
metadata_dir = join_paths(meson.source_root(), 'bindings', 'metadata')
po_dir = join_paths(meson.source_root(), 'po')
vapi_dir = join_paths(meson.source_root(), 'bindings', 'vapi')
metadata_dir = meson.source_root() / 'bindings'/ 'metadata'
po_dir = meson.source_root() / 'po'
vapi_dir = meson.source_root() / 'bindings' / 'vapi'
# Compiler configuration
add_project_arguments([
@ -137,10 +137,10 @@ gnome = import('gnome')
i18n = import('i18n')
# Static install dirs
dbus_services_dir = join_paths(data_dir, 'dbus-1', 'services')
client_lib_dir = join_paths(lib_dir, 'geary')
plugins_dir = join_paths(client_lib_dir, 'plugins')
web_extensions_dir = join_paths(client_lib_dir, 'web-extensions')
dbus_services_dir = data_dir / 'dbus-1' / 'services'
client_lib_dir = lib_dir / 'geary'
plugins_dir = client_lib_dir / 'plugins'
web_extensions_dir = client_lib_dir / 'web-extensions'
# Ensure SQLite was built correctly
if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite)
@ -157,17 +157,17 @@ if enable_valadoc
endif
# Language detection
iso_codes_dir = join_paths(iso_codes.get_pkgconfig_variable('prefix'), 'share', 'xml', 'iso-codes')
iso_codes_dir = iso_codes.get_pkgconfig_variable('prefix')/'share'/'xml'/'iso-codes'
if iso_639_xml == ''
iso_639_xml = join_paths(iso_codes_dir, 'iso_639.xml')
iso_639_xml = iso_codes_dir / 'iso_639.xml'
endif
if iso_3166_xml == ''
iso_3166_xml = join_paths(iso_codes_dir, 'iso_3166.xml')
iso_3166_xml = iso_codes_dir / 'iso_3166.xml'
endif
files(iso_639_xml, iso_3166_xml) # Check to make sure these exist
# Post-install scripts
meson.add_install_script(join_paths('build-aux', 'post_install.py'))
meson.add_install_script('build-aux' / 'post_install.py')
# GNOME Builder doesn't support YAML manifests, so generate a JSON
# version from the YAML and commit it. :( GNOME/gnome-builder#520

8
src/client/plugin/desktop-notifications/meson.build
View file

@ -1,9 +1,9 @@
plugin_name = 'desktop-notifications'
plugin_src = join_paths(plugin_name + '.vala')
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_src = files(plugin_name + '.vala')
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
plugin_name,
@ -17,7 +17,7 @@ shared_module(
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

8
src/client/plugin/folder-highlight/meson.build
View file

@ -1,9 +1,9 @@
plugin_name = 'folder-highlight'
plugin_src = join_paths(plugin_name + '.vala')
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_src = files(plugin_name + '.vala')
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
plugin_name,
@ -17,7 +17,7 @@ shared_module(
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

8
src/client/plugin/messaging-menu/meson.build
View file

@ -18,9 +18,9 @@ if libmessagingmenu_dep.found()
]
)
plugin_src = join_paths(plugin_name + '.vala')
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_src = files(plugin_name + '.vala')
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
# Use a non-standard name for the lib since the standard one
@ -36,7 +36,7 @@ if libmessagingmenu_dep.found()
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

6
src/client/plugin/notification-badge/meson.build
View file

@ -5,8 +5,8 @@ plugin_src = files(
plugin_name + '.vala',
'unity-launcher-entry.vala'
)
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
plugin_name,
@ -20,7 +20,7 @@ shared_module(
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

8
src/client/plugin/sent-sound/meson.build
View file

@ -4,9 +4,9 @@ plugin_name = 'sent-sound'
send_sound_dependencies = plugin_dependencies
send_sound_dependencies += gsound
plugin_src = join_paths(plugin_name + '.vala')
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_src = files(plugin_name + '.vala')
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
plugin_name,
@ -20,7 +20,7 @@ shared_module(
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

8
src/client/plugin/special-folders/meson.build
View file

@ -1,9 +1,9 @@
plugin_name = 'special-folders'
plugin_src = join_paths(plugin_name + '.vala')
plugin_data = join_paths(plugin_name + '.plugin')
plugin_dest = join_paths(plugins_dir, plugin_name)
plugin_src = files(plugin_name + '.vala')
plugin_data = plugin_name + '.plugin'
plugin_dest = plugins_dir / plugin_name
shared_module(
plugin_name,
@ -17,7 +17,7 @@ shared_module(
)
i18n.merge_file(
input: plugin_data + '.in',
input: files(plugin_data + '.in'),
output: plugin_data,
type: 'desktop',
po_dir: po_dir,

4
src/meson.build
View file

@ -6,7 +6,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
conf.set_quoted('_APP_ID', geary_id)
conf.set_quoted('_BUILD_ROOT_DIR', meson.build_root())
conf.set_quoted('_GSETTINGS_DIR', join_paths(meson.build_root(), 'desktop'))
conf.set_quoted('_GSETTINGS_DIR', meson.build_root() / 'desktop')
conf.set_quoted('_INSTALL_PREFIX', geary_prefix)
conf.set_quoted('_ISO_CODE_3166_XML', iso_3166_xml)
conf.set_quoted('_ISO_CODE_639_XML', iso_639_xml)
@ -76,7 +76,7 @@ geary_web_process = library('geary-web-process',
# Now finally, make the geary executable
geary_bin_sources = files(
join_paths('client', 'application', 'main.vala'),
'client' / 'application' / 'main.vala',
)
geary_bin_sources += [

4
src/sqlite3-unicodesn/meson.build
View file

@ -3,8 +3,8 @@ sqlite3_unicodesn_sources = [
'fts3_unicodesn.c',
'static.c',
join_paths('libstemmer_c', 'runtime', 'api_sq3.c'),
join_paths('libstemmer_c', 'runtime', 'utilities_sq3.c'),
'libstemmer_c' / 'runtime' / 'api_sq3.c',
'libstemmer_c' / 'runtime' / 'utilities_sq3.c',
]
sqlite3_unicodesn_c_flags = [