diff --git a/automation/meson.build b/automation/meson.build index baf3b2615..ac3a2c85f 100644 --- a/automation/meson.build +++ b/automation/meson.build @@ -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: join_paths(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: join_paths(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: join_paths(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: join_paths(automation_dir, 'include', 'aegisub')) diff --git a/build/meson.build b/build/meson.build index 0240f4671..d1699bc4c 100644 --- a/build/meson.build +++ b/build/meson.build @@ -5,7 +5,7 @@ else endif version_inc = include_directories('.') version_h = custom_target('git_version.h', - command : [version_sh, meson.source_root()], + command: [version_sh, meson.source_root()], build_by_default: true, build_always_stale: true, # has internal check whether target file will be refreshed output: ['git_version.h', 'git_version.xml']) diff --git a/libaegisub/meson.build b/libaegisub/meson.build index 1752ff688..a02cc8750 100644 --- a/libaegisub/meson.build +++ b/libaegisub/meson.build @@ -83,6 +83,6 @@ libaegisub_cpp_pch = ['lagi_pre.h'] libaegisub_inc = include_directories('include') libaegisub = static_library('aegisub', libaegisub_src, acconf, - include_directories : libaegisub_inc, - cpp_pch : 'include/lagi_pre.h', - dependencies : deps) + include_directories: libaegisub_inc, + cpp_pch: 'include/lagi_pre.h', + dependencies: deps) diff --git a/meson.build b/meson.build index 9f5536e3a..139132c13 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,11 @@ -project('Aegisub', ['c', 'cpp'], license : 'BSD-3-Clause', - meson_version : '>=0.47.0', - default_options : ['cpp_std=c++11', 'b_lto=true']) +project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause', + meson_version: '>=0.47.0', + default_options: ['cpp_std=c++11', 'b_lto=true']) subdir('build') dataroot = join_paths(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') conf = configuration_data() @@ -25,20 +25,20 @@ endif cxx = meson.get_compiler('cpp') cc = meson.get_compiler('c') -deps += cc.find_library('m', required : false) -deps += cc.find_library('dl', required : false) -deps += cc.find_library('iconv', required : false) +deps += cc.find_library('m', required: false) +deps += cc.find_library('dl', required: false) +deps += cc.find_library('iconv', required: false) -deps += dependency('libass', version : '>=0.9.7', static: b_static) -deps += dependency('boost', version : '>=1.50.0', static: b_static, - modules : ['chrono', 'filesystem', 'locale', 'regex', - 'system', 'thread']) -deps += dependency('icu-uc', version : '>=4.8.1.1', static: b_static) -deps += dependency('icu-i18n', version : '>=4.8.1.1', static: b_static) +deps += dependency('libass', version: '>=0.9.7', static: b_static) +deps += dependency('boost', version: '>=1.50.0', static: b_static, + modules: ['chrono', 'filesystem', 'locale', 'regex', + 'system', 'thread']) +deps += dependency('icu-uc', version: '>=4.8.1.1', static: b_static) +deps += dependency('icu-i18n', version: '>=4.8.1.1', static: b_static) deps += dependency('zlib', static: b_static) dep_avail = [] -foreach dep : [ +foreach dep: [ # audio, in order of precedence ['libpulse', '', 'PulseAudio'], ['alsa', '', 'ALSA'], @@ -51,8 +51,8 @@ foreach dep : [ ['hunspell', '', 'Hunspell'], ['uchardet', '', 'uchardet'], ] - d = dependency(dep[0], version : dep[1] != '' ? dep[1] : '>=0', - required : false, static: b_static) + d = dependency(dep[0], version: dep[1] != '' ? dep[1]: '>=0', + required: false, static: b_static) optname = 'enable_@0@'.format(dep[0].split('-')[0]) if d.found() and get_option(optname) != 'false' @@ -80,7 +80,7 @@ endif conf_platform = configuration_data() conf_platform.set('DEFAULT_PLAYER_AUDIO', def_audio) -luajit = dependency('luajit', version : '>=2.0.0', required : get_option('system_luajit')) +luajit = dependency('luajit', version: '>=2.0.0', required: get_option('system_luajit')) if luajit.found() luajit_test = cc.run('''#include int main(void) @@ -90,7 +90,7 @@ int main(void) // This is valid in lua 5.2, but a syntax error in 5.1 const char testprogram[] = "function foo() while true do break return end end"; return luaL_loadstring(L, testprogram) == LUA_ERRSYNTAX; -}''', dependencies : luajit) +}''', dependencies: luajit) if luajit_test.returncode() == 1 if get_option('system_luajit') @@ -114,19 +114,19 @@ else endif subdir('vendor/luabins/src') -deps += dependency('wxWidgets', version : '>=3.0.0', - modules : ['std', 'stc', 'gl']) +deps += dependency('wxWidgets', version: '>=3.0.0', + modules: ['std', 'stc', 'gl']) -dep_gl = dependency('gl', required : false) +dep_gl = dependency('gl', required: false) if not dep_gl.found() if host_machine.system() == 'windows' - dep_gl = cc.find_library('opengl32', required : false) + dep_gl = cc.find_library('opengl32', required: false) else - dep_gl = cc.find_library('GL', required : false) + dep_gl = cc.find_library('GL', required: false) endif if not cc.has_header('GL/gl.h') - dep_gl = dependency('', required : false) + dep_gl = dependency('', required: false) endif endif @@ -136,7 +136,7 @@ endif deps += dep_gl -acconf = configure_file(output : 'acconf.h', configuration : conf) +acconf = configure_file(output: 'acconf.h', configuration: conf) subdir('automation') subdir('libaegisub') diff --git a/packages/meson.build b/packages/meson.build index 30ba88c6e..3be1d6301 100644 --- a/packages/meson.build +++ b/packages/meson.build @@ -4,16 +4,16 @@ c_pkg.set('AEGISUB_COMMAND', 'aegisub') if host_machine.system() == 'windows' elif host_machine.system() == 'darwin' else - configure_file(input : 'desktop/aegisub.desktop.template.in', - output : 'aegisub.desktop', - configuration : c_pkg, - install_dir : join_paths(get_option('datadir'), 'applications')) + configure_file(input: 'desktop/aegisub.desktop.template.in', + output: 'aegisub.desktop', + configuration: c_pkg, + install_dir: join_paths(get_option('datadir'), 'applications')) 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'] 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_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', dir, 'apps')) endforeach diff --git a/po/meson.build b/po/meson.build index 8b2f65bf6..48bded975 100644 --- a/po/meson.build +++ b/po/meson.build @@ -31,4 +31,4 @@ langs = [ 'zh_TW', ] -i18n.gettext('aegisub', languages : langs) +i18n.gettext('aegisub', languages: langs) diff --git a/src/libresrc/meson.build b/src/libresrc/meson.build index b0392dc54..9c4ab499e 100644 --- a/src/libresrc/meson.build +++ b/src/libresrc/meson.build @@ -2,27 +2,27 @@ respack = find_program('../../tools/respack.py') resrc = [ custom_target('bitmap.{cpp,h}', - command : [respack, '@INPUT@', '@OUTPUT@'], - input : files('../bitmaps/manifest.respack'), - output : ['bitmap.cpp', 'bitmap.h']) + command: [respack, '@INPUT@', '@OUTPUT@'], + input: files('../bitmaps/manifest.respack'), + output: ['bitmap.cpp', 'bitmap.h']) ] conf_platform_json = configure_file(input: 'default_config_platform.json.in', - output : '@BASENAME@', - configuration : conf_platform) + output: '@BASENAME@', + configuration: conf_platform) if host_machine.system() == 'darwin' resrc += custom_target('default_config.{cpp,h}', - command : [respack, '@INPUT0@', '@OUTPUT@'], - input : [files('manifest_osx.respack'), conf_platform_json], - output : ['default_config.cpp', 'default_config.h']) + command: [respack, '@INPUT0@', '@OUTPUT@'], + input: [files('manifest_osx.respack'), conf_platform_json], + output: ['default_config.cpp', 'default_config.h']) else resrc += custom_target('default_config.{cpp,h}', - command : [respack, '@INPUT0@', '@OUTPUT@'], - input : [files('manifest.respack'), conf_platform_json], - output : ['default_config.cpp', 'default_config.h']) + command: [respack, '@INPUT0@', '@OUTPUT@'], + input: [files('manifest.respack'), conf_platform_json], + output: ['default_config.cpp', 'default_config.h']) endif libresrc_inc = include_directories('.') -libresrc = static_library('resrc', 'libresrc.cpp', resrc, dependencies : deps) +libresrc = static_library('resrc', 'libresrc.cpp', resrc, dependencies: deps) diff --git a/src/meson.build b/src/meson.build index 939978f4b..df94b4b6f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -189,15 +189,15 @@ opt_src = [ ['Hunspell', 'spellchecker_hunspell.cpp'], ] -foreach opt : opt_src +foreach opt: opt_src if dep_avail.contains(opt[0]) aegisub_src += opt[1] endif endforeach aegisub = executable('aegisub', aegisub_src, version_h, acconf, - link_with : [libresrc, libluabins, libaegisub], - include_directories : [libaegisub_inc, libresrc_inc, version_inc], - cpp_pch : 'include/agi_pre.h', - install : true, - dependencies : deps) + link_with: [libresrc, libluabins, libaegisub], + include_directories: [libaegisub_inc, libresrc_inc, version_inc], + cpp_pch: 'include/agi_pre.h', + install: true, + dependencies: deps)