From 83fcab07755699f7af16046ffc0b60737e7659b3 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Wed, 30 Jan 2019 17:07:39 -0500 Subject: [PATCH] Switch to newer path concatenation syntax --- automation/meson.build | 10 +++++----- meson.build | 4 ++-- packages/meson.build | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/automation/meson.build b/automation/meson.build index ac3a2c85f..fff6b45c1 100644 --- a/automation/meson.build +++ b/automation/meson.build @@ -1,4 +1,4 @@ -automation_dir = join_paths(get_option('datadir'), 'aegisub', 'automation') +automation_dir = get_option('datadir') / 'aegisub' / 'automation' install_data( 'autoload/cleantags-autoload.lua', @@ -8,13 +8,13 @@ install_data( 'autoload/macro-2-mkfullwitdh.lua', 'autoload/select-overlaps.moon', 'autoload/strip-tags.lua', - install_dir: join_paths(automation_dir, 'autoload')) + install_dir: automation_dir / 'autoload') install_data( 'demos/future-windy-blur.lua', 'demos/raytracer.lua', 'demos/raytracer-test1.ass', - install_dir: join_paths(automation_dir, 'demos')) + install_dir: automation_dir / 'demos') install_data( 'include/cleantags.lua', @@ -27,7 +27,7 @@ install_data( 'include/unicode.lua', 'include/utils-auto4.lua', 'include/utils.lua', - install_dir: join_paths(automation_dir, 'include')) + install_dir: automation_dir / 'include') install_data( 'include/aegisub/argcheck.moon', @@ -37,4 +37,4 @@ install_data( 'include/aegisub/re.moon', 'include/aegisub/unicode.moon', 'include/aegisub/util.moon', - install_dir: join_paths(automation_dir, 'include', 'aegisub')) + install_dir: automation_dir / 'include' / 'aegisub') diff --git a/meson.build b/meson.build index 139132c13..f87aa28a0 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,10 @@ 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']) 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') b_static = get_option('static') diff --git a/packages/meson.build b/packages/meson.build index 3be1d6301..799f4ff68 100644 --- a/packages/meson.build +++ b/packages/meson.build @@ -7,13 +7,13 @@ else configure_file(input: 'desktop/aegisub.desktop.template.in', output: 'aegisub.desktop', configuration: c_pkg, - install_dir: join_paths(get_option('datadir'), 'applications')) + install_dir: get_option('datadir') / 'applications') endif foreach s: ['16x16.png', '22x22.png', '24x24.png', '32x32.png', '48x48.png', '64x64.png', 'scalable.svg'] dir = s.split('.')[0] ext = s.split('.')[1] - install_data(join_paths('desktop', dir, 'aegisub.' + ext), - install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', dir, 'apps')) + install_data('desktop' / dir / 'aegisub.' + ext), + install_dir: get_option('datadir') / 'icons' / 'hicolor' / dir / 'apps') endforeach