mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-12 13:30:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: replace join_paths(a, b) with a / b

Browse source 
More readable and from the meson reference manual:
(since 0.49.0) Using the/ operator on strings is equivalent to calling join_paths.
This commit is contained in:
Peter Hutterer 2021-04-15 14:41:04 +10:00 • committed by Wim Taymans
parent 2f78829fda
commit 223f20709d
34 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/daemon/media-session.d/meson.build
View file

@ -11,11 +11,11 @@ foreach c : conf_files
configure_file(input : c.get(0),
output : c.get(1),
configuration : conf_config,
install_dir : join_paths(conf_install_dir, 'media-session.d'))
install_dir : conf_install_dir / 'media-session.d')
endforeach
install_data(
sources : [
'with-jack',
'with-pulseaudio' ],
install_dir : join_paths(conf_install_dir, 'media-session.d'))
install_dir : conf_install_dir / 'media-session.d')

16
src/daemon/meson.build
View file

@ -10,19 +10,19 @@ pipewire_c_args = [
conf_config = configuration_data()
conf_config.set('VERSION', '"@0@"'.format(pipewire_version))
conf_config.set('media_session_path', join_paths(pipewire_bindir, 'pipewire-media-session'))
conf_config.set('pipewire_path', join_paths(pipewire_bindir, 'pipewire'))
conf_config.set('pipewire_pulse_path', join_paths(pipewire_bindir, 'pipewire-pulse'))
conf_config.set('media_session_path', pipewire_bindir / 'pipewire-media-session')
conf_config.set('pipewire_path', pipewire_bindir / 'pipewire')
conf_config.set('pipewire_pulse_path', pipewire_bindir / 'pipewire-pulse')
conf_config.set('comment', '#')
conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
conf_install_dir = get_option('sysconfdir') / 'pipewire'
conf_config_uninstalled = conf_config
conf_config_uninstalled.set('media_session_path',
join_paths(meson.build_root(), 'src', 'examples', 'pipewire-media-session'))
meson.build_root() / 'src' / 'examples' / 'pipewire-media-session')
conf_config_uninstalled.set('pipewire_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire'))
meson.build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire-pulse'))
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('comment', '')
@ -77,7 +77,7 @@ custom_target('pipewire-uninstalled',
# po_dir : po_dir,
# type : 'desktop',
# install : true,
# install_dir : join_paths(pipewire_sysconfdir, 'xdg', 'autostart')
# install_dir : pipewire_sysconfdir / 'xdg' / 'autostart'
#)
#
#desktop_utils = find_program('desktop-file-validate', required: false)

4
src/daemon/systemd/system/meson.build
View file

@ -4,8 +4,8 @@ install_data(sources : 'pipewire.socket',
install_dir : systemd_system_services_dir)
systemd_config = configuration_data()
systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
configure_file(input : 'pipewire.service.in',
output : 'pipewire.service',

6
src/daemon/systemd/user/meson.build
View file

@ -8,9 +8,9 @@ install_data(
install_dir : systemd_user_services_dir)
systemd_config = configuration_data()
systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse')
systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
configure_file(input : 'pipewire.service.in',
output : 'pipewire.service',

30
src/examples/meson.build
View file

@ -2,42 +2,42 @@ executable('video-src',
'video-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('video-src-alloc',
'video-src-alloc.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('video-src-reneg',
'video-src-reneg.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('audio-src',
'audio-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('audio-dsp-src',
'audio-dsp-src.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
executable('export-source',
'export-source.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -45,7 +45,7 @@ executable('audio-dsp-filter',
'audio-dsp-filter.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -53,7 +53,7 @@ executable('export-spa',
'export-spa.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -61,7 +61,7 @@ executable('export-spa-device',
'export-spa-device.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -114,7 +114,7 @@ executable('bluez-session',
'bluez-session.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, mathlib],
)
@ -123,21 +123,21 @@ if sdl_dep.found()
'video-play.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
executable('video-play-reneg',
'video-play-reneg.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
executable('video-dsp-play',
'video-dsp-play.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
@ -145,7 +145,7 @@ if sdl_dep.found()
'local-v4l2.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep],
)
@ -153,7 +153,7 @@ if sdl_dep.found()
'export-sink.c',
c_args : [ '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'examples'),
install_dir : installed_tests_execdir / 'examples',
dependencies : [pipewire_dep, sdl_dep, mathlib],
)
endif

4
src/extensions/meson.build
View file

@ -15,7 +15,7 @@ pipewire_ext_headers = [
]
install_headers(pipewire_ext_sm_headers,
subdir : join_paths(pipewire_headers_dir, 'extensions', 'session-manager'))
subdir : pipewire_headers_dir / 'extensions' / 'session-manager')
install_headers(pipewire_ext_headers,
subdir : join_paths(pipewire_headers_dir, 'extensions'))
subdir : pipewire_headers_dir / 'extensions')

2
src/modules/meson.build
View file

@ -165,7 +165,7 @@ test('pw-test-protocol-native',
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-test-protocol-native'))
test_conf.set('exec', installed_tests_execdir / 'pw-test-protocol-native')
configure_file(
input: installed_tests_template,
output: 'pw-test-protocol-native.test',

2
src/pipewire/meson.build
View file

@ -78,7 +78,7 @@ pipewire_sources = [
configure_file(input : 'version.h.in',
output : 'version.h',
install_dir : join_paths(get_option('includedir'), pipewire_headers_dir),
install_dir : get_option('includedir') / pipewire_headers_dir,
configuration : cdata)

4
src/tests/meson.build
View file

@ -25,7 +25,7 @@ foreach a : test_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-' + a))
test_conf.set('exec', installed_tests_execdir / 'pw-' + a)
configure_file(
input: installed_tests_template,
output: 'pw-' + a + '.test',
@ -45,7 +45,7 @@ test('pw-test-cpp', test_cpp)
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec', join_paths(installed_tests_execdir, 'pw-test-cpp'))
test_conf.set('exec', installed_tests_execdir / 'pw-test-cpp')
configure_file(
input: installed_tests_template,
output: 'pw-test-cpp.test',

2
src/tools/meson.build
View file

@ -50,7 +50,7 @@ if not get_option('pw-cat').disabled() and sndfile_dep.found()
)
foreach alias : pwcat_aliases
dst = join_paths(pipewire_bindir, alias)
dst = pipewire_bindir / alias
cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pw-cat', dst)
meson.add_install_script('sh', '-c', cmd)
endforeach