Commit fd9f6c4a authored by Iñigo Martínez's avatar Iñigo Martínez Committed by Alberto Fanjul

meson: Add trailing commas

Add missing trailing commas that avoids getting noise when another
file/parameter is added and eases reviewing changes[0].

[0] dconf!11 (comment 291585)
parent 95e96784
sources = files(
'ide-doap.c',
'ide-doap-person.c'
'ide-doap-person.c',
)
libide = static_library(
'ide',
sources: sources,
include_directories: top_inc,
dependencies: libxml_dep
dependencies: libxml_dep,
)
libide_dep = declare_dependency(
link_with: libide,
include_directories: include_directories('.'),
dependencies: valac.find_library('ide', dirs: meson.current_source_dir())
dependencies: valac.find_library('ide', dirs: meson.current_source_dir()),
)
......@@ -2,18 +2,18 @@ sources = files('xml-reader.c')
deps = [
gio_dep,
dependency('libxml-2.0', version: '>= 2.9.0')
dependency('libxml-2.0', version: '>= 2.9.0'),
]
libxml = static_library(
'xml',
sources: sources,
include_directories: top_inc,
dependencies: deps
dependencies: deps,
)
libxml_dep = declare_dependency(
link_with: libxml,
include_directories: include_directories('.'),
dependencies: deps
dependencies: deps,
)
......@@ -4,19 +4,19 @@ icon_sizes = [
'24x24',
'32x32',
'48x48',
'256x256'
'256x256',
]
foreach icon_size: icon_sizes
install_data(
'_'.join(['hicolor', 'apps', icon_size, 'gitg.png']),
rename: 'gitg.png',
install_dir: join_paths(gitg_datadir, 'icons', 'hicolor', icon_size, 'apps')
install_dir: join_paths(gitg_datadir, 'icons', 'hicolor', icon_size, 'apps'),
)
endforeach
install_data(
'_'.join(['hicolor', 'apps', 'scalable', 'gitg-symbolic.svg']),
rename: 'gitg-symbolic.svg',
install_dir: join_paths(gitg_datadir, 'icons', 'hicolor', 'scalable', 'apps')
install_dir: join_paths(gitg_datadir, 'icons', 'hicolor', 'scalable', 'apps'),
)
......@@ -8,7 +8,7 @@ desktop = 'gitg.desktop'
desktop_in = configure_file(
input: desktop + '.in.in',
output: desktop + '.in',
configuration: desktop_conf
configuration: desktop_conf,
)
custom_target(
......@@ -17,7 +17,7 @@ custom_target(
output: desktop,
command: intltool_desktop_cmd,
install: true,
install_dir: join_paths(gitg_datadir, 'applications')
install_dir: join_paths(gitg_datadir, 'applications'),
)
schema_conf = configuration_data()
......@@ -28,7 +28,7 @@ schema = 'org.gnome.gitg.gschema.xml'
schema_in = configure_file(
input: schema + '.in.in',
output: schema + '.in',
configuration: schema_conf
configuration: schema_conf,
)
custom_target(
......@@ -37,12 +37,12 @@ custom_target(
output: schema,
command: [intltool_merge, '-x', '-u', '--no-translations', '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: join_paths(gitg_datadir, 'glib-2.0', 'schemas')
install_dir: join_paths(gitg_datadir, 'glib-2.0', 'schemas'),
)
install_data(
'gitg.appdata.xml',
install_dir: join_paths(gitg_datadir, 'metainfo')
install_dir: join_paths(gitg_datadir, 'metainfo'),
)
install_man(
......@@ -53,6 +53,6 @@ enable_glade_catalog = get_option('glade_catalog')
if enable_glade_catalog
install_data(
'gitg-glade.xml',
install_dir: join_paths(gitg_datadir, 'glade', 'catalogs')
install_dir: join_paths(gitg_datadir, 'glade', 'catalogs'),
)
endif
......@@ -2,7 +2,7 @@ gitg_sources = files(
'gitg-action-support.vala',
'gitg-commit-action-cherry-pick.vala',
'gitg-ref-action-checkout.vala',
'gitg-ref-action-merge.vala'
'gitg-ref-action-merge.vala',
)
sources = gitg_sources + files(
......@@ -49,7 +49,7 @@ sources = gitg_sources + files(
'gitg-simple-notification.vala',
'gitg-ui-elements.vala',
'gitg-window.vala',
'gitg.vala'
'gitg.vala',
)
deps = [
......@@ -66,13 +66,13 @@ deps = [
libpeas_dep,
m_dep,
dependency('gobject-introspection-1.0', version: '>= 0.10.1'),
dependency('gtkspell3-3.0')
dependency('gtkspell3-3.0'),
]
cflags = warn_flags + [
'-DDATADIR="@0@"'.format(gitg_datadir),
'-DGITG_DATADIR="@0@"'.format(gitg_pkgdatadir),
'-DGITG_LOCALEDIR="@0@"'.format(gitg_localedir)
'-DGITG_LOCALEDIR="@0@"'.format(gitg_localedir),
]
resources_conf = configuration_data()
......@@ -83,7 +83,7 @@ resources = 'gitg-resources.xml'
resources_in = configure_file(
input: join_paths('resources', resources + '.in'),
output: resources,
configuration: resources_conf
configuration: resources_conf,
)
resource_data = files(
......@@ -110,7 +110,7 @@ resource_data = files(
'resources/ui//gitg-simple-notification.ui',
'resources/ui//gitg-window.ui',
'resources/ui//style.css',
'resources/ui//style-@0@.css'.format(platform_name)
'resources/ui//style-@0@.css'.format(platform_name),
)
sources += gnome.compile_resources(
......@@ -118,7 +118,7 @@ sources += gnome.compile_resources(
resources_in,
source_dir: 'resources',
dependencies: resource_data,
export: true
export: true,
)
vala_flags = '--gresourcesdir=' + join_paths(meson.current_source_dir(), 'resources')
......@@ -134,7 +134,7 @@ executable(
dependencies: deps,
c_args: cflags,
vala_args: vala_flags,
install: true
install: true,
)
ldflags = []
......@@ -149,7 +149,7 @@ if platform_name == 'win32'
sources += win.compile_resources(
'gitg.rc',
args: ['-O', 'coff']
args: ['-O', 'coff'],
)
ldflags += '-mwindows'
......@@ -164,5 +164,5 @@ gitg = shared_library(
c_args: cflags,
vala_args: vala_flags,
link_args: ldflags,
link_depends: symbol_map
link_depends: symbol_map,
)
......@@ -32,19 +32,19 @@ sources = files(
'gitg-ext-selectable.vala',
'gitg-ext-ui-element.vala',
'gitg-ext-ui.vala',
'gitg-ext-user-query.vala'
'gitg-ext-user-query.vala',
)
deps = [
gee_dep,
gtk_dep,
libgit2_glib_dep,
libgitg_dep
libgitg_dep,
]
cflags = warn_flags + [
'-DDATADIR="@0@"'.format(gitg_datadir),
'-DLIBDIR="@0@"'.format(gitg_libdir)
'-DLIBDIR="@0@"'.format(gitg_libdir),
]
ldflags = []
......@@ -71,13 +71,13 @@ libgitg_ext = shared_library(
get_option('libdir'),
join_paths(gitg_includedir, lib_api_name, lib_name),
true,
true
]
true,
],
)
libgitg_ext_dep = declare_dependency(
link_with: libgitg_ext,
include_directories: include_directories('.')
include_directories: include_directories('.'),
)
pkg.generate(
......@@ -96,7 +96,7 @@ pkg.generate(
'gthread-2.0',
'libgit2-glib-1.0',
'libgitg-1.0',
gio_system_pkg
gio_system_pkg,
],
variables: 'exec_prefix=' + gitg_prefix,
)
......@@ -108,7 +108,7 @@ if enable_docs
'--pkg', 'gio-2.0',
'--pkg', 'gtk+-3.0',
'--pkg', 'libsoup-2.4',
'--pkg', 'gee-0.8'
'--pkg', 'gee-0.8',
]
valaproc_cmd = [
......@@ -118,12 +118,12 @@ if enable_docs
vala_pkgs,
'--basedir', meson.source_root(),
'--vapidir', join_paths(meson.build_root(), 'gitg'),
sources
sources,
]
run_target(
'libgitg-ext-docs',
command: valaproc_cmd
command: valaproc_cmd,
)
endif
......@@ -133,10 +133,10 @@ custom_target(
command: [g_ir_compiler, '--shared-library', libgitg_ext.full_path(), '--includedir', libgitg_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), gir_name)],
depends: [
libgitg,
libgitg_ext
libgitg_ext,
],
install: true,
install_dir: gitg_girepositorydir
install_dir: gitg_girepositorydir,
)
enable_python = get_option('python')
......@@ -145,6 +145,6 @@ if enable_python
install_data(
'GitgExt.py',
install_dir: join_paths(python.sysconfig_path('purelib'), 'gi', 'overrides')
install_dir: join_paths(python.sysconfig_path('purelib'), 'gi', 'overrides'),
)
endif
......@@ -59,7 +59,7 @@ sources = files(
'gitg-stage.vala',
'gitg-theme.vala',
'gitg-utils.vala',
'gitg-when-mapped.vala'
'gitg-when-mapped.vala',
)
resource_data = files(
......@@ -74,14 +74,14 @@ resource_data = files(
'resources/ui/gitg-diff-view.ui',
'resources/ui/gitg-repository-list-box-row.ui',
'resources/ui/gitg-sidebar.ui',
'resources/ui/libgitg-style.css'
'resources/ui/libgitg-style.css',
)
sources += gnome.compile_resources(
'libgitg-resources',
'resources/resources.xml',
source_dir: 'resources',
dependencies: resource_data
dependencies: resource_data,
)
deps = [
......@@ -95,13 +95,13 @@ deps = [
libsoup_dep,
m_dep,
dependency('gsettings-desktop-schemas'),
dependency('libsecret-1')
dependency('libsecret-1'),
]
cflags = warn_flags + [
'-DDATADIR="@0@"'.format(gitg_datadir),
'-DLIBDIR="@0@"'.format(gitg_libdir),
'-DGETTEXT_PACKAGE="@0@"'.format(gitg_gettext)
'-DGETTEXT_PACKAGE="@0@"'.format(gitg_gettext),
]
ldflags = []
......@@ -116,13 +116,13 @@ if gdk_targets.contains('quartz')
gio_system_pkg = 'gio-unix-2.0'
deps += [
dependency(gio_system_pkg),
find_library('objc')
find_library('objc'),
]
cflags += '-xobjective-c'
test_ldflags += [
'-framework Foundation',
'-framework AppKit'
'-framework AppKit',
]
elif gdk_targets.contains('win32')
sources += files('gitg-platform-support-win32.c')
......@@ -158,13 +158,13 @@ libgitg = shared_library(
get_option('libdir'),
join_paths(gitg_includedir, lib_api_name, lib_name),
true,
true
]
true,
],
)
libgitg_dep = declare_dependency(
link_with: libgitg,
include_directories: include_directories('.')
include_directories: include_directories('.'),
)
pkg.generate(
......@@ -182,9 +182,9 @@ pkg.generate(
'gthread-2.0',
'gtk+-3.0',
'libgit2-glib-1.0',
gio_system_pkg
gio_system_pkg,
],
variables: 'exec_prefix=' + gitg_prefix
variables: 'exec_prefix=' + gitg_prefix,
)
libgitg_dir = meson.current_build_dir()
......@@ -195,5 +195,5 @@ custom_target(
command: [g_ir_compiler, '--shared-library', libgitg.full_path(), '--output', '@OUTPUT@', join_paths(libgitg_dir, gir_name)],
depends: libgitg,
install: true,
install_dir: gitg_girepositorydir
install_dir: gitg_girepositorydir,
)
......@@ -3,7 +3,7 @@ project(
version: '3.30.0',
license: 'GPL2+',
default_options: 'buildtype=debugoptimized',
meson_version: '>= 0.46.0'
meson_version: '>= 0.46.0',
)
gitg_name = meson.project_name()
......@@ -55,7 +55,7 @@ set_defines = [
# gitg
['GITG_DATADIR', gitg_pkgdatadir],
['GITG_LIBDIR', gitg_pkglibdir],
['GITG_LOCALEDIR', gitg_localedir]
['GITG_LOCALEDIR', gitg_localedir],
]
foreach define: set_defines
......@@ -73,7 +73,7 @@ if get_option('deprecations')
'-DGTK_DISABLE_DEPRECATED',
'-DGDK_PIXBUF_DISABLE_DEPRECATED',
'-DGNOME_DISABLE_DEPRECATED',
'-DGSEAL_ENABLE'
'-DGSEAL_ENABLE',
]
endif
......@@ -89,7 +89,7 @@ if gitg_debug
'-Wmissing-declarations',
'-Wnested-externs',
'-Wstrict-prototypes',
'-Wuninitialized'
'-Wuninitialized',
]
warn_flags += cc.get_supported_arguments(test_cflags)
......@@ -137,7 +137,7 @@ ggit_threads = '''
res = cc.run(ggit_threads, dependencies: libgit2_glib_dep)
assert(
res.compiled() and (res.returncode() == 0),
'please recompile a threadsafe version of libgit2 (-DTHREADSAFE:BOOL=ON)'
'please recompile a threadsafe version of libgit2 (-DTHREADSAFE:BOOL=ON)',
)
# gtk required version is set to 3.20, so this will be always true
......@@ -192,14 +192,14 @@ subdir('tests')
configure_file(
output: 'config.h',
configuration: config_h
configuration: config_h,
)
meson.add_install_script(
'meson_post_install.py',
gitg_datadir,
(enable_python ? 'python' : ''),
gitg_libdir
gitg_libdir,
)
output = '\nConfiguration:\n\n'
......
install_data(
'icons/diff-symbolic.svg',
install_dir: join_paths(gitg_pkgdatadir, 'icons', 'hicolor', 'scalable', 'actions')
install_dir: join_paths(gitg_pkgdatadir, 'icons', 'hicolor', 'scalable', 'actions'),
)
install_data(
'diff.plugin',
install_dir: plugin_dir
install_dir: plugin_dir,
)
sources = files('gitg-diff.vala')
......@@ -17,5 +17,5 @@ libdiff = shared_module(
dependencies: plugin_deps,
c_args: plugin_cflags,
install: true,
install_dir: plugin_dir
install_dir: plugin_dir,
)
install_data(
'files.plugin',
install_dir: plugin_dir
install_dir: plugin_dir,
)
sources = files(
'gitg-files.vala',
'gitg-files-tree-store.vala'
'gitg-files-tree-store.vala',
)
resource_data = files('resources/view-files.ui')
......@@ -14,7 +14,7 @@ sources += gnome.compile_resources(
'gitg-files-resources',
'resources/resources.xml',
source_dir: 'resources',
dependencies: resource_data
dependencies: resource_data,
)
libfiles = shared_module(
......@@ -24,5 +24,5 @@ libfiles = shared_module(
dependencies: plugin_deps,
c_args: plugin_cflags,
install: true,
install_dir: plugin_dir
install_dir: plugin_dir,
)
plugin_cflags = warn_flags + [
'-DDATADIR="@0@"'.format(gitg_datadir),
'-DLIBDIR="@0@"'.format(gitg_libdir)
'-DLIBDIR="@0@"'.format(gitg_libdir),
]
plugin_deps = [
......@@ -11,7 +11,7 @@ plugin_deps = [
gtksourceview_dep,
libgitg_dep,
libgitg_ext_dep,
libpeas_dep
libpeas_dep,
]
plugin_dir = join_paths(gitg_pkglibdir, 'plugins')
......
......@@ -6,7 +6,7 @@ sources = gitg_sources + support_sources + files(
'simple-notification-mock.vala',
'test-checkout-ref.vala',
'test-cherry-pick-commit.vala',
'test-merge-ref.vala'
'test-merge-ref.vala',
)
deps = [
......@@ -16,7 +16,7 @@ deps = [
gtk_dep,
libgit2_glib_dep,
libgitg_dep,
libgitg_ext_dep
libgitg_ext_dep,
]
vala_flags = '--disable-warnings'
......@@ -29,7 +29,7 @@ exe = executable(
include_directories: top_inc,
dependencies: deps,
c_args: warn_flags,
vala_args: vala_flags
vala_args: vala_flags,
)
test(test_unit, exe)
......@@ -3,7 +3,7 @@ sources = support_sources + files(
'test-commit.vala',
'test-date.vala',
'test-encoding.vala',
'test-stage.vala'
'test-stage.vala',
)
deps = [
......@@ -11,7 +11,7 @@ deps = [
gitg_assert_dep,
gtk_dep,
libgit2_glib_dep,
libgitg_dep
libgitg_dep,
]
vala_flags = '--disable-warnings'
......@@ -24,7 +24,7 @@ exe = executable(
include_directories: top_inc,
dependencies: deps,
c_args: warn_flags,
vala_args: vala_flags
vala_args: vala_flags,
)
test(test_unit, exe)
......@@ -6,13 +6,13 @@ deps = [
gee_dep,
gtk_dep,
libgit2_glib_dep,
libgitg_dep
libgitg_dep,
]
test_names = [
'diff-view',
'repository-list-box',
'progress-bin'
'progress-bin',
]
foreach test_name: test_names
......@@ -21,6 +21,6 @@ foreach test_name: test_names
sources: test_name + '.vala',
include_directories: top_inc,
dependencies: deps,
c_args: warn_flags
c_args: warn_flags,
)
endforeach
copygen = generator(
find_program('cp'),
arguments: ['@INPUT@', '@OUTPUT@'],
output: 'support-@PLAINNAME@'
output: 'support-@PLAINNAME@',
)
sources = [
'main.vala',
'repository.vala',
'test.vala'
'test.vala',
]
support_sources = []
......@@ -18,5 +18,5 @@ endforeach
gitg_assert_dep = declare_dependency(
include_directories: include_directories('.'),
dependencies: valac.find_library('gitg-assert', dirs: meson.current_source_dir())
dependencies: valac.find_library('gitg-assert', dirs: meson.current_source_dir()),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment