treewide: Reformat meson files
Ran `meson format -e -i -r`. Signed-off-by: Evangelos Ribeiro Tzaras <devrtz@fortysixandtwo.eu> Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/798>
This commit is contained in:
committed by
Marge Bot
parent
50b34aec53
commit
fec9e953ae
@@ -1,4 +1,6 @@
|
||||
if get_option('tests')
|
||||
if not get_option('tests')
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
test_env = [
|
||||
'G_DEBUG=gc-friendly,fatal-warnings',
|
||||
@@ -13,18 +15,20 @@ test_env = [
|
||||
'FOLKS_BACKENDS_ALLOWED=key-file',
|
||||
'FOLKS_PRIMARY_STORE=key-file',
|
||||
'CALLS_RECORD_DIR=@0@/tests/record-db'.format(meson.project_build_root()),
|
||||
'CALLS_SIP_ACCOUNT_FILE=@0@/tests/sip-account.cfg'.format(meson.project_build_root()),
|
||||
'CALLS_SIP_ACCOUNT_FILE=@0@/tests/sip-account.cfg'.format(
|
||||
meson.project_build_root(),
|
||||
),
|
||||
]
|
||||
|
||||
test_cflags = [
|
||||
'-DFOR_TESTING',
|
||||
'-Wno-error=deprecated-declarations',
|
||||
'-DTEST_DATABASE="@0@"'.format(meson.current_source_dir() / 'data' / 'serviceproviders.xml'),
|
||||
'-DTEST_DATABASE="@0@"'.format(
|
||||
meson.current_source_dir() / 'data' / 'serviceproviders.xml',
|
||||
),
|
||||
]
|
||||
|
||||
test_link_args = [
|
||||
'-fPIC',
|
||||
]
|
||||
test_link_args = ['-fPIC']
|
||||
|
||||
dbus_service_conf = configuration_data()
|
||||
dbus_service_conf.set('CALLS_BUILD_DIR', '@0@'.format(builddir))
|
||||
@@ -32,172 +36,172 @@ dbus_service_conf.set('CALLS_BUILD_DIR_STR', '"@0@"'.format(builddir))
|
||||
dbus_service_conf.set('CALLS_DBUS_NAME', '"org.gnome.Calls"')
|
||||
dbus_service_conf.set('CALLS_DBUS_OBJECT_PATH', '"/org/gnome/Calls"')
|
||||
|
||||
dbus_config_h = configure_file(output : 'calls-dbus-config.h',
|
||||
configuration : dbus_service_conf)
|
||||
dbus_config_h = configure_file(
|
||||
output: 'calls-dbus-config.h',
|
||||
configuration: dbus_service_conf,
|
||||
)
|
||||
|
||||
test_includes = include_directories('.')
|
||||
|
||||
subdir('mock')
|
||||
subdir('services')
|
||||
|
||||
test_sources = [ 'test-emergency-call-types.c' ]
|
||||
t = executable('emergency-call-types', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test_sources = ['test-emergency-call-types.c']
|
||||
t = executable(
|
||||
'emergency-call-types',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('emergency-call-types', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-service-providers.c' ]
|
||||
t = executable('service-providers', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test_sources = ['test-service-providers.c']
|
||||
t = executable(
|
||||
'service-providers',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('service-providers', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-manager.c' ]
|
||||
test_sources = ['test-manager.c']
|
||||
|
||||
t = executable('manager', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'manager',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('manager', t, env: test_env, depends: calls_plugins)
|
||||
|
||||
test_sources = [ 'test-plugins.c' ]
|
||||
test_sources = ['test-plugins.c']
|
||||
|
||||
t = executable('plugins', test_sources,
|
||||
calls_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'plugins',
|
||||
test_sources,
|
||||
calls_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('plugins', t, env: test_env, depends: calls_plugins)
|
||||
|
||||
test_sources = [ 'test-util.c' ]
|
||||
t = executable('util', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test_sources = ['test-util.c']
|
||||
t = executable(
|
||||
'util',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('util', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-ui-call.c', 'mock-call.c', 'mock-call.h' ]
|
||||
t = executable('ui-call', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args : test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies : calls_deps,
|
||||
include_directories : [
|
||||
calls_includes
|
||||
]
|
||||
)
|
||||
test_sources = ['test-ui-call.c', 'mock-call.c', 'mock-call.h']
|
||||
t = executable(
|
||||
'ui-call',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('ui-call', t, env: test_env)
|
||||
|
||||
test_sources = [
|
||||
'mock-call.c', 'mock-call.h',
|
||||
'test-ringer.c'
|
||||
]
|
||||
test_sources = ['mock-call.c', 'mock-call.h', 'test-ringer.c']
|
||||
|
||||
t = executable('ringer', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls, libfeedback],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'ringer',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls, libfeedback],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('ringer', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-contacts.c' ]
|
||||
t = executable('contacts', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test_sources = ['test-contacts.c']
|
||||
t = executable(
|
||||
'contacts',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('contacts', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-settings.c' ]
|
||||
t = executable('settings', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test_sources = ['test-settings.c']
|
||||
t = executable(
|
||||
'settings',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('settings', t, env: test_env)
|
||||
|
||||
test_sources = ['test-dbus.c']
|
||||
t = executable('dbus', test_sources, generated_dbus_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'dbus',
|
||||
test_sources,
|
||||
generated_dbus_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test('dbus', t, env: test_env)
|
||||
|
||||
dbus_run_session = find_program('dbus-run-session')
|
||||
|
||||
if dbus_run_session.found ()
|
||||
test_sources = [ 'test-application.c' ]
|
||||
t = executable('application', test_sources, calls_resources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
]
|
||||
)
|
||||
test('application',
|
||||
dbus_run_session,
|
||||
args: t.full_path(),
|
||||
env: test_env,
|
||||
timeout : 300,
|
||||
depends: t
|
||||
)
|
||||
endif
|
||||
|
||||
if dbus_run_session.found()
|
||||
test_sources = ['test-application.c']
|
||||
t = executable(
|
||||
'application',
|
||||
test_sources,
|
||||
calls_resources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes],
|
||||
)
|
||||
test(
|
||||
'application',
|
||||
dbus_run_session,
|
||||
args: t.full_path(),
|
||||
env: test_env,
|
||||
timeout: 300,
|
||||
depends: t,
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -2,14 +2,9 @@ libfeedback_libdir = get_option('libdir')
|
||||
libfeedback_link_args = []
|
||||
libfeedback_symbols_file = 'libfeedback.syms'
|
||||
|
||||
lfb_enum_headers = files([
|
||||
'lfb-event.h',
|
||||
])
|
||||
lfb_enum_headers = files('lfb-event.h')
|
||||
|
||||
libfeedback_headers = [
|
||||
'libfeedback.h',
|
||||
'lfb-event.h',
|
||||
]
|
||||
libfeedback_headers = ['libfeedback.h', 'lfb-event.h']
|
||||
|
||||
libfeedback_sources = [
|
||||
'lfb-enums.c',
|
||||
@@ -18,35 +13,29 @@ libfeedback_sources = [
|
||||
'lfb-event.c',
|
||||
]
|
||||
|
||||
gio = dependency('gio-2.0', version: '>=2.50.0')
|
||||
glib = dependency('glib-2.0', version: '>=2.50.0')
|
||||
gobject = dependency('gobject-2.0', version: '>=2.50.0')
|
||||
gio = dependency('gio-2.0', version: '>=2.50.0')
|
||||
glib = dependency('glib-2.0', version: '>=2.50.0')
|
||||
gobject = dependency('gobject-2.0', version: '>=2.50.0')
|
||||
|
||||
libfeedback_deps = [
|
||||
gio,
|
||||
glib,
|
||||
gobject,
|
||||
]
|
||||
libfeedback_deps = [gio, glib, gobject]
|
||||
|
||||
libfeedback_c_args = [
|
||||
'-DG_LOG_DOMAIN="libfeedback"',
|
||||
]
|
||||
libfeedback_c_args = ['-DG_LOG_DOMAIN="libfeedback"']
|
||||
|
||||
libtype = 'shared_library'
|
||||
libfeedback = build_target(
|
||||
'feedback-0',
|
||||
libfeedback_sources,
|
||||
soversion : 0,
|
||||
c_args : libfeedback_c_args,
|
||||
dependencies : libfeedback_deps,
|
||||
link_args : [],
|
||||
install : false,
|
||||
target_type : libtype,
|
||||
soversion: 0,
|
||||
c_args: libfeedback_c_args,
|
||||
dependencies: libfeedback_deps,
|
||||
link_args: [],
|
||||
install: false,
|
||||
target_type: libtype,
|
||||
)
|
||||
|
||||
libfeedback_inc = include_directories('.')
|
||||
libfeedback_dep = declare_dependency(
|
||||
link_with : libfeedback,
|
||||
link_with: libfeedback,
|
||||
dependencies: libfeedback_deps,
|
||||
include_directories : libfeedback_inc,
|
||||
include_directories: libfeedback_inc,
|
||||
)
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
t = executable('calls-dbus-server', 'calls-server.c',
|
||||
dbus_config_h,
|
||||
calls_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
test_includes,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'calls-dbus-server',
|
||||
'calls-server.c',
|
||||
dbus_config_h,
|
||||
calls_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes, test_includes],
|
||||
)
|
||||
|
||||
service_file = 'org.gnome.Calls.service'
|
||||
|
||||
service = configure_file (
|
||||
input : service_file + '.in',
|
||||
output : service_file,
|
||||
configuration : dbus_service_conf)
|
||||
service = configure_file(
|
||||
input: service_file + '.in',
|
||||
output: service_file,
|
||||
configuration: dbus_service_conf,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user