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
@@ -49,11 +49,9 @@ dummy_deps = [
|
||||
]
|
||||
|
||||
dummy_sources = files(
|
||||
[
|
||||
'calls-dummy-call.c', 'calls-dummy-call.h',
|
||||
'calls-dummy-origin.c', 'calls-dummy-origin.h',
|
||||
'calls-dummy-provider.c', 'calls-dummy-provider.h'
|
||||
]
|
||||
'calls-dummy-call.c',
|
||||
'calls-dummy-origin.c',
|
||||
'calls-dummy-provider.c',
|
||||
)
|
||||
|
||||
calls_dummy = shared_module(
|
||||
@@ -63,5 +61,5 @@ calls_dummy = shared_module(
|
||||
include_directories: src_include,
|
||||
link_with: libcalls,
|
||||
install: true,
|
||||
install_dir: dummy_install_dir
|
||||
install_dir: dummy_install_dir,
|
||||
)
|
||||
|
||||
@@ -48,13 +48,7 @@ mm_deps = [
|
||||
dependency('libpeas-2'),
|
||||
]
|
||||
|
||||
mm_sources = files(
|
||||
[
|
||||
'calls-mm-call.c', 'calls-mm-call.h',
|
||||
'calls-mm-origin.c', 'calls-mm-origin.h',
|
||||
'calls-mm-provider.c', 'calls-mm-provider.h'
|
||||
]
|
||||
)
|
||||
mm_sources = files('calls-mm-call.c', 'calls-mm-origin.c', 'calls-mm-provider.c')
|
||||
|
||||
calls_mm = shared_module(
|
||||
'mm',
|
||||
@@ -63,5 +57,5 @@ calls_mm = shared_module(
|
||||
include_directories: src_include,
|
||||
link_with: libcalls,
|
||||
install: true,
|
||||
install_dir: mm_install_dir
|
||||
install_dir: mm_install_dir,
|
||||
)
|
||||
|
||||
@@ -27,25 +27,22 @@ dbus_interfaces = ['manager', 'modem', 'call', 'ussd']
|
||||
|
||||
gdbofono_src = []
|
||||
gdbofono_headers = []
|
||||
foreach iface: dbus_interfaces
|
||||
foreach iface : dbus_interfaces
|
||||
src = gnome.gdbus_codegen(
|
||||
'gdbo-' + iface,
|
||||
iface + '.xml',
|
||||
interface_prefix: 'org.ofono.',
|
||||
namespace: 'GDBO'
|
||||
namespace: 'GDBO',
|
||||
)
|
||||
gdbofono_src += src
|
||||
gdbofono_headers += src[1]
|
||||
endforeach
|
||||
|
||||
gdbofono_deps = [
|
||||
dependency('gio-2.0'),
|
||||
dependency('gio-unix-2.0'),
|
||||
]
|
||||
gdbofono_deps = [dependency('gio-2.0'), dependency('gio-unix-2.0')]
|
||||
|
||||
gdbofono_lib = static_library(
|
||||
'gdbofono',
|
||||
gdbofono_src,
|
||||
include_directories: top_include,
|
||||
dependencies: gdbofono_deps
|
||||
dependencies: gdbofono_deps,
|
||||
)
|
||||
|
||||
@@ -48,22 +48,18 @@ ofono_deps = [
|
||||
]
|
||||
|
||||
ofono_sources = files(
|
||||
[
|
||||
'calls-ofono-call.c', 'calls-ofono-call.h',
|
||||
'calls-ofono-origin.c', 'calls-ofono-origin.h',
|
||||
'calls-ofono-provider.c', 'calls-ofono-provider.h'
|
||||
]
|
||||
'calls-ofono-call.c',
|
||||
'calls-ofono-origin.c',
|
||||
'calls-ofono-provider.c',
|
||||
)
|
||||
|
||||
calls_ofono = shared_module(
|
||||
'ofono',
|
||||
ofono_sources, gdbofono_headers,
|
||||
ofono_sources,
|
||||
gdbofono_headers,
|
||||
dependencies: ofono_deps,
|
||||
include_directories: [
|
||||
src_include,
|
||||
include_directories('.')
|
||||
],
|
||||
include_directories: [src_include, include_directories('.')],
|
||||
link_with: [gdbofono_lib, libcalls],
|
||||
install: true,
|
||||
install_dir: ofono_install_dir
|
||||
install_dir: ofono_install_dir,
|
||||
)
|
||||
|
||||
@@ -53,36 +53,29 @@ sip_deps = [
|
||||
]
|
||||
|
||||
sip_sources = files(
|
||||
[
|
||||
'calls-sdp-crypto-context.c', 'calls-sdp-crypto-context.h',
|
||||
'calls-sip-account-widget.c', 'calls-sip-account-widget.h',
|
||||
'calls-sip-call.c', 'calls-sip-call.h',
|
||||
'calls-sip-media-manager.c', 'calls-sip-media-manager.h',
|
||||
'calls-sip-media-pipeline.c', 'calls-sip-media-pipeline.h',
|
||||
'calls-sip-origin.c', 'calls-sip-origin.h',
|
||||
'calls-sip-provider.c', 'calls-sip-provider.h',
|
||||
'calls-sip-util.c', 'calls-sip-util.h',
|
||||
'calls-srtp-utils.c', 'calls-srtp-utils.h',
|
||||
'gst-rfc3551.c', 'gst-rfc3551.h',
|
||||
]
|
||||
'calls-sdp-crypto-context.c',
|
||||
'calls-sip-account-widget.c',
|
||||
'calls-sip-call.c',
|
||||
'calls-sip-media-manager.c',
|
||||
'calls-sip-media-pipeline.c',
|
||||
'calls-sip-origin.c',
|
||||
'calls-sip-provider.c',
|
||||
'calls-sip-util.c',
|
||||
'calls-srtp-utils.c',
|
||||
'gst-rfc3551.c',
|
||||
)
|
||||
|
||||
pipeline_enum_headers = [
|
||||
'calls-sip-media-pipeline.h',
|
||||
]
|
||||
pipeline_enum_headers = ['calls-sip-media-pipeline.h']
|
||||
|
||||
pipeline_enums = gnome.mkenums_simple('calls-media-pipeline-enums',
|
||||
sources: pipeline_enum_headers)
|
||||
pipeline_enums = gnome.mkenums_simple(
|
||||
'calls-media-pipeline-enums',
|
||||
sources: pipeline_enum_headers,
|
||||
)
|
||||
sip_sources += pipeline_enums
|
||||
|
||||
sip_enum_headers = [
|
||||
'calls-sdp-crypto-context.h',
|
||||
'calls-sip-util.h',
|
||||
]
|
||||
sip_enum_headers = ['calls-sdp-crypto-context.h', 'calls-sip-util.h']
|
||||
|
||||
sip_enums = gnome.mkenums_simple('calls-sip-enums',
|
||||
sources: sip_enum_headers,
|
||||
)
|
||||
sip_enums = gnome.mkenums_simple('calls-sip-enums', sources: sip_enum_headers)
|
||||
|
||||
sip_sources += sip_enums
|
||||
|
||||
@@ -102,5 +95,5 @@ calls_sip = shared_module(
|
||||
include_directories: src_include,
|
||||
link_with: libcalls,
|
||||
install: true,
|
||||
install_dir: sip_install_dir
|
||||
install_dir: sip_install_dir,
|
||||
)
|
||||
|
||||
@@ -20,7 +20,9 @@
|
||||
#
|
||||
|
||||
|
||||
if get_option('tests')
|
||||
if not get_option('tests')
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
test_env = [
|
||||
'G_DEBUG=gc-friendly,fatal-warnings',
|
||||
@@ -35,19 +37,14 @@ test_env = [
|
||||
'CALLS_PLUGIN_DIR=@0@/plugins'.format(meson.project_build_root()),
|
||||
]
|
||||
|
||||
test_cflags = [
|
||||
'-DFOR_TESTING',
|
||||
'-Wno-error=deprecated-declarations',
|
||||
]
|
||||
test_cflags = ['-DFOR_TESTING', '-Wno-error=deprecated-declarations']
|
||||
|
||||
test_link_args = [
|
||||
'-fPIC',
|
||||
]
|
||||
test_link_args = ['-fPIC']
|
||||
|
||||
tests = [
|
||||
[ 'provider', [] ],
|
||||
[ 'origin', [ 'provider' ] ],
|
||||
[ 'call', [ 'provider', 'origin' ] ],
|
||||
['provider', []],
|
||||
['origin', ['provider']],
|
||||
['call', ['provider', 'origin']],
|
||||
]
|
||||
|
||||
foreach test : tests
|
||||
@@ -58,88 +55,78 @@ foreach test : tests
|
||||
|
||||
test_sources = []
|
||||
foreach base : setup_bases
|
||||
test_sources += [ 'setup-' + base + '.c',
|
||||
'setup-' + base + '.h' ]
|
||||
test_sources += ['setup-' + base + '.c', 'setup-' + base + '.h']
|
||||
endforeach
|
||||
test_sources += [ 'test-' + name + '.c',
|
||||
'common.h' ]
|
||||
test_sources += ['test-' + name + '.c', 'common.h']
|
||||
|
||||
t = executable(name, test_sources,
|
||||
dummy_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
dummy_include,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
name,
|
||||
test_sources,
|
||||
dummy_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: calls_deps,
|
||||
include_directories: [calls_includes, dummy_include],
|
||||
)
|
||||
test(name, t, env: test_env)
|
||||
endforeach
|
||||
|
||||
|
||||
|
||||
test_sources = [ 'test-media.c' ]
|
||||
test_sources = ['test-media.c']
|
||||
test_sources += sip_sources
|
||||
t = executable('media', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
sip_include,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'media',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories: [calls_includes, sip_include],
|
||||
)
|
||||
test('media', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-sip.c' ]
|
||||
test_sources = ['test-sip.c']
|
||||
test_sources += sip_sources
|
||||
t = executable('sip', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
sip_include,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'sip',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories: [calls_includes, sip_include],
|
||||
)
|
||||
test('sip', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-srtp.c' ]
|
||||
test_sources = ['test-srtp.c']
|
||||
test_sources += sip_sources
|
||||
t = executable('srtp', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
sip_include,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'srtp',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories: [calls_includes, sip_include],
|
||||
)
|
||||
test('srtp', t, env: test_env)
|
||||
|
||||
test_sources = [ 'test-sdp-crypto.c' ]
|
||||
test_sources = ['test-sdp-crypto.c']
|
||||
test_sources += sip_sources
|
||||
t = executable('sdp-crypto', test_sources,
|
||||
c_args : test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with : [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories : [
|
||||
calls_includes,
|
||||
sip_include,
|
||||
]
|
||||
)
|
||||
t = executable(
|
||||
'sdp-crypto',
|
||||
test_sources,
|
||||
c_args: test_cflags,
|
||||
link_args: test_link_args,
|
||||
pie: true,
|
||||
link_with: [calls_vala, libcalls],
|
||||
dependencies: [calls_deps, sip_deps],
|
||||
include_directories: [calls_includes, sip_include],
|
||||
)
|
||||
test('sdp-crypto', t, env: test_env)
|
||||
|
||||
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user