mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Use join_paths() instead of '/'

Browse source 
Let Meson decide correct seperator such as '\' for Windows and
'/' for others
This commit is contained in:
Seungha Yang 2018-12-07 20:30:23 +09:00 committed by Tim-Philipp Müller
parent 90e801e62d
commit 076d023508
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -31,7 +31,7 @@ curversion = gst_version_minor * 100 + gst_version_micro
libversion = '@0@.@1@.0'.format(soversion, curversion) libversion = '@0@.@1@.0'.format(soversion, curversion)
osxversion = curversion + 1 osxversion = curversion + 1
plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
host_system = host_machine.system() host_system = host_machine.system()

14
tests/check/meson.build
View file

@ -152,15 +152,15 @@ foreach t : base_tests
env = environment() env = environment()
env.set('GST_PLUGIN_PATH_1_0', env.set('GST_PLUGIN_PATH_1_0',
meson.build_root(), '@0@/@1@'.format(get_option('prefix'), plugins_install_dir), meson.build_root(), join_paths(get_option('prefix'), plugins_install_dir),
pluginsdirs) pluginsdirs)
env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink') env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink')
env.set('CK_DEFAULT_TIMEOUT', '20') env.set('CK_DEFAULT_TIMEOUT', '20')
env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', gst_tag_dir + '/license-translations.dict') env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', join_paths(gst_tag_dir, 'license-translations.dict'))
env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer',
'gst-plugins-base@' + meson.build_root(), separator: ':') 'gst-plugins-base@' + meson.build_root(), separator: ':')
env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
test(test_name, exe, env: env, timeout: 3 * 60) test(test_name, exe, env: env, timeout: 3 * 60)
endif endif
endforeach endforeach
@ -168,7 +168,7 @@ endforeach
# videoscale tests (split in groups) # videoscale tests (split in groups)
foreach group : [1, 2, 3, 4, 5, 6] foreach group : [1, 2, 3, 4, 5, 6]
vscale_test_name = 'elements-videoscale-@0@'.format(group) vscale_test_name = 'elements-videoscale-@0@'.format(group)
exe = executable(vscale_test_name, 'elements/videoscale.c', exe = executable(vscale_test_name, join_paths('elements', 'videoscale.c'),
include_directories : [configinc], include_directories : [configinc],
c_args : ['-DHAVE_CONFIG_H=1', '-DVSCALE_TEST_GROUP=@0@'.format(group) ] + test_defines, c_args : ['-DHAVE_CONFIG_H=1', '-DVSCALE_TEST_GROUP=@0@'.format(group) ] + test_defines,
dependencies : [libm] + test_deps + extra_deps) dependencies : [libm] + test_deps + extra_deps)
@ -176,15 +176,15 @@ foreach group : [1, 2, 3, 4, 5, 6]
# TODO Use env.copy when it is in meson # TODO Use env.copy when it is in meson
env = environment() env = environment()
env.set('GST_PLUGIN_PATH_1_0', env.set('GST_PLUGIN_PATH_1_0',
meson.build_root(), '@0@/@1@'.format(get_option('prefix'), plugins_install_dir), meson.build_root(), join_paths(get_option('prefix'), plugins_install_dir),
pluginsdirs) pluginsdirs)
env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink') env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink')
env.set('CK_DEFAULT_TIMEOUT', '20') env.set('CK_DEFAULT_TIMEOUT', '20')
env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', gst_tag_dir + '/license-translations.dict') env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', join_paths(gst_tag_dir, 'license-translations.dict'))
env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer',
'gst-plugins-base@' + meson.build_root(), separator: ':') 'gst-plugins-base@' + meson.build_root(), separator: ':')
env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
test(vscale_test_name, exe, env: env, timeout: 3 * 60) test(vscale_test_name, exe, env: env, timeout: 3 * 60)
endforeach endforeach