mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Switch to newer path concatenation syntax

Browse source
This commit is contained in:
Ryan Lucia 2019-01-30 17:07:39 -05:00
parent cde5778283
commit 83fcab0775
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
automation/meson.build
View file

@ -1,4 +1,4 @@
automation_dir = join_paths(get_option('datadir'), 'aegisub', 'automation') automation_dir = get_option('datadir') / 'aegisub' / 'automation'
install_data( install_data(
'autoload/cleantags-autoload.lua', 'autoload/cleantags-autoload.lua',
@ -8,13 +8,13 @@ install_data(
'autoload/macro-2-mkfullwitdh.lua', 'autoload/macro-2-mkfullwitdh.lua',
'autoload/select-overlaps.moon', 'autoload/select-overlaps.moon',
'autoload/strip-tags.lua', 'autoload/strip-tags.lua',
install_dir: join_paths(automation_dir, 'autoload')) install_dir: automation_dir / 'autoload')
install_data( install_data(
'demos/future-windy-blur.lua', 'demos/future-windy-blur.lua',
'demos/raytracer.lua', 'demos/raytracer.lua',
'demos/raytracer-test1.ass', 'demos/raytracer-test1.ass',
install_dir: join_paths(automation_dir, 'demos')) install_dir: automation_dir / 'demos')
install_data( install_data(
'include/cleantags.lua', 'include/cleantags.lua',
@ -27,7 +27,7 @@ install_data(
'include/unicode.lua', 'include/unicode.lua',
'include/utils-auto4.lua', 'include/utils-auto4.lua',
'include/utils.lua', 'include/utils.lua',
install_dir: join_paths(automation_dir, 'include')) install_dir: automation_dir / 'include')
install_data( install_data(
'include/aegisub/argcheck.moon', 'include/aegisub/argcheck.moon',
@ -37,4 +37,4 @@ install_data(
'include/aegisub/re.moon', 'include/aegisub/re.moon',
'include/aegisub/unicode.moon', 'include/aegisub/unicode.moon',
'include/aegisub/util.moon', 'include/aegisub/util.moon',
install_dir: join_paths(automation_dir, 'include', 'aegisub')) install_dir: automation_dir / 'include' / 'aegisub')

4
meson.build
View file

@ -1,10 +1,10 @@
project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause', project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause',
meson_version: '>=0.47.0', meson_version: '>=0.49.0',
default_options: ['cpp_std=c++11', 'b_lto=true']) default_options: ['cpp_std=c++11', 'b_lto=true'])
subdir('build') subdir('build')
dataroot = join_paths(get_option('prefix'), get_option('datadir'), 'aegisub') dataroot = get_option('prefix') / get_option('datadir') / 'aegisub'
add_project_arguments('-DP_DATA="@0@"'.format(dataroot), language: 'cpp') add_project_arguments('-DP_DATA="@0@"'.format(dataroot), language: 'cpp')
b_static = get_option('static') b_static = get_option('static')

6
packages/meson.build
View file

@ -7,13 +7,13 @@ else
configure_file(input: 'desktop/aegisub.desktop.template.in', configure_file(input: 'desktop/aegisub.desktop.template.in',
output: 'aegisub.desktop', output: 'aegisub.desktop',
configuration: c_pkg, configuration: c_pkg,
install_dir: join_paths(get_option('datadir'), 'applications')) install_dir: get_option('datadir') / 'applications')
endif endif
foreach s: ['16x16.png', '22x22.png', '24x24.png', '32x32.png', foreach s: ['16x16.png', '22x22.png', '24x24.png', '32x32.png',
'48x48.png', '64x64.png', 'scalable.svg'] '48x48.png', '64x64.png', 'scalable.svg']
dir = s.split('.')[0] dir = s.split('.')[0]
ext = s.split('.')[1] ext = s.split('.')[1]
install_data(join_paths('desktop', dir, 'aegisub.' + ext), install_data('desktop' / dir / 'aegisub.' + ext),
install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', dir, 'apps')) install_dir: get_option('datadir') / 'icons' / 'hicolor' / dir / 'apps')
endforeach endforeach