GNOME.org
 

[eog: 6/21] build: Add trailing commas

commit e5651322f93d2a431710e24e9acfa1f9bcfad244
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jun 27 22:11:36 2019 +0200

    build: Add trailing commas
    
    Add missing trailing commas that avoids getting noise when another
    file/parameter is added and eases reviewing changes[0].
    
    [0] https://gitlab.gnome.org/GNOME/dconf/merge_requests/11#note_291585

 data/icons/meson.build    |  8 ++++----
 data/meson.build          | 12 ++++++------
 doc/reference/meson.build |  6 +++---
 help/meson.build          |  6 +++---
 jpegutils/meson.build     |  4 ++--
 meson.build               | 12 ++++++------
 plugins/meson.build       |  8 ++++----
 src/meson.build           | 34 +++++++++++++++++-----------------
 tests/meson.build         | 10 +++++-----
 9 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index bd400c3d..c0801c1b 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,22 +1,22 @@
 install_subdir(
   'scalable/apps',
-  install_dir: eog_datadir / 'icons/hicolor/scalable'
+  install_dir: eog_datadir / 'icons/hicolor/scalable',
 )
 
 install_subdir(
   'symbolic',
-  install_dir: eog_datadir / 'icons/hicolor'
+  install_dir: eog_datadir / 'icons/hicolor',
 )
 
 foreach icon_size: ['16x16', '22x22', '24x24', '32x32', '48x48']
   install_subdir(
     icon_size / 'actions',
     install_dir: eog_pkgdatadir / 'icons/hicolor' / icon_size,
-    exclude_files: ['eog-plugin.svg', 'slideshow-play.svg', 'eog-image-gallery.svg']
+    exclude_files: ['eog-plugin.svg', 'slideshow-play.svg', 'eog-image-gallery.svg'],
   )
 endforeach
 
 install_subdir(
   'scalable/actions',
-  install_dir: eog_pkgdatadir / 'icons/hicolor/scalable'
+  install_dir: eog_pkgdatadir / 'icons/hicolor/scalable',
 )
diff --git a/data/meson.build b/data/meson.build
index 0a6c21c4..92b5e336 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,7 +11,7 @@ resource_data = files(
   'fullscreen-toolbar.ui',
   'help-overlay.ui',
   'metadata-sidebar.ui',
-  'popup-menus.ui'
+  'popup-menus.ui',
 )
 
 desktop_conf = configuration_data()
@@ -22,7 +22,7 @@ desktop = 'eog.desktop'
 desktop_in = configure_file(
   input: desktop + '.in.in',
   output: desktop + '.in',
-  configuration: desktop_conf
+  configuration: desktop_conf,
 )
 
 i18n.merge_file(
@@ -32,7 +32,7 @@ i18n.merge_file(
   output: desktop,
   po_dir: po_dir,
   install: true,
-  install_dir: eog_datadir / 'applications'
+  install_dir: eog_datadir / 'applications',
 )
 
 appdata = 'eog.appdata.xml'
@@ -43,7 +43,7 @@ i18n.merge_file(
   output: appdata,
   po_dir: po_dir,
   install: true,
-  install_dir: eog_datadir / 'metainfo'
+  install_dir: eog_datadir / 'metainfo',
 )
 
 schema_conf = configuration_data()
@@ -56,10 +56,10 @@ configure_file(
   output: schema,
   install: true,
   install_dir: eog_schemadir,
-  configuration: schema_conf
+  configuration: schema_conf,
 )
 
 install_data(
   'eog.convert',
-  install_dir: eog_datadir / 'GConf/gsettings'
+  install_dir: eog_datadir / 'GConf/gsettings',
 )
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 13bccf0c..d9550418 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -14,7 +14,7 @@ private_headers = [
   'eog-plugin-engine.h',
   'eog-preferences-dialog.h',
   'eog-print-image-setup.h',
-  'eog-print-preview.h'
+  'eog-print-preview.h',
 ]
 
 if not enable_libexif
@@ -29,7 +29,7 @@ version_xml = 'version.xml'
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -42,5 +42,5 @@ gnome.gtkdoc(
     '--ignore-headers=' + ' '.join(private_headers),
   ],
   gobject_typesfile: meson.project_name() + '.types',
-  install: true
+  install: true,
 )
diff --git a/help/meson.build b/help/meson.build
index 7af74358..78c59b38 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -32,7 +32,7 @@ sources = [
   'slideshow.page',
   'translate.page',
   'view.page',
-  'zoom.page'
+  'zoom.page',
 ]
 
 media = [
@@ -41,12 +41,12 @@ media = [
   'figures/org.gnome.eog.svg',
   'figures/org.gnome.eog-symbolic.svg',
   'figures/plugins-all.png',
-  'figures/prefs-plugins.png'
+  'figures/prefs-plugins.png',
 ]
 
 gnome.yelp(
   meson.project_name(),
   sources: sources,
   media: media,
-  symlink_media: true
+  symlink_media: true,
 )
diff --git a/jpegutils/meson.build b/jpegutils/meson.build
index 0db03109..df5c376c 100644
--- a/jpegutils/meson.build
+++ b/jpegutils/meson.build
@@ -8,11 +8,11 @@ libjpegutils = static_library(
   'eog-jpegutils',
   sources: sources,
   include_directories: top_inc,
-  dependencies: libjpeg_dep
+  dependencies: libjpeg_dep,
 )
 
 libjpegutils_dep = declare_dependency(
   include_directories: include_directories('.'),
   dependencies: libjpeg_dep,
-  link_with: libjpegutils
+  link_with: libjpegutils,
 )
diff --git a/meson.build b/meson.build
index 46104936..3a529917 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   version: '3.33.3',
   license: 'GPL2+',
   default_options: 'buildtype=debugoptimized',
-  meson_version: '>= 0.50.0'
+  meson_version: '>= 0.50.0',
 )
 
 eog_version = meson.project_version()
@@ -38,7 +38,7 @@ set_defines = [
   ['PACKAGE', meson.project_name()],
   ['VERSION', eog_version],
   # i18n
-  ['GETTEXT_PACKAGE', meson.project_name()]
+  ['GETTEXT_PACKAGE', meson.project_name()],
 ]
 
 foreach define: set_defines
@@ -73,7 +73,7 @@ if get_option('buildtype').contains('debug')
     '-Werror=pointer-arith',
     '-Werror=return-type',
     '-Wnested-externs',
-    '-Wstrict-prototypes'
+    '-Wstrict-prototypes',
   ]
 
   compiler_flags += cc.get_supported_arguments(test_cflags)
@@ -100,7 +100,7 @@ common_deps = [
   dependency('gio-2.0', version: glib_req_version),
   dependency('glib-2.0', version: glib_req_version),
   dependency('gtk+-3.0', version: '>= 3.22.0'),
-  dependency('libpeas-1.0', version: peas_req_version)
+  dependency('libpeas-1.0', version: peas_req_version),
 ]
 
 # ZLIB support (required)
@@ -212,12 +212,12 @@ endif
 
 configure_file(
   output: 'config.h',
-  configuration: config_h
+  configuration: config_h,
 )
 
 meson.add_install_script(
   'meson_post_install.py',
-  eog_datadir
+  eog_datadir,
 )
 
 output = 'Configure summary:\n\n'
diff --git a/plugins/meson.build b/plugins/meson.build
index 73cffb68..a4d6912d 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -5,12 +5,12 @@ msgfmt_plugin_cmd = [
   '--keyword=Description',
   '--template=@INPUT@',
   '-d', po_dir,
-  '--output=@OUTPUT@'
+  '--output=@OUTPUT@',
 ]
 
 plugins = [
   'fullscreen',
-  'reload'
+  'reload',
 ]
 
 if enable_libexif
@@ -24,7 +24,7 @@ foreach plugin: plugins
     include_directories: top_inc,
     dependencies: libeog_dep,
     install: true,
-    install_dir: eog_pluginsdir
+    install_dir: eog_pluginsdir,
   )
 
   plugin_data = plugin + '.plugin'
@@ -37,6 +37,6 @@ foreach plugin: plugins
     output: plugin_data,
     command: msgfmt_plugin_cmd,
     install: true,
-    install_dir: eog_pluginsdir
+    install_dir: eog_pluginsdir,
   )
 endforeach
diff --git a/src/meson.build b/src/meson.build
index 956de4b6..12645470 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,7 +2,7 @@ src_inc = include_directories('.')
 
 enum_headers = files(
   'eog-scroll-view.h',
-  'eog-window.h'
+  'eog-window.h',
 )
 
 gnome.mkenums(
@@ -15,7 +15,7 @@ gnome.mkenums(
   vtail: '  </@type@>',
   ftail: '</schemalist>',
   install_header: true,
-  install_dir: eog_schemadir
+  install_dir: eog_schemadir,
 )
 
 headers = enum_headers + files(
@@ -38,7 +38,7 @@ headers = enum_headers + files(
   'eog-thumb-view.h',
   'eog-transform.h',
   'eog-uri-converter.h',
-  'eog-window-activatable.h'
+  'eog-window-activatable.h',
 )
 
 sources = files(
@@ -80,7 +80,7 @@ sources = files(
   'eog-window-activatable.c',
   'eog-window.c',
   'eog-zoom-entry.c',
-  'zoom.c'
+  'zoom.c',
 )
 
 if enable_libexif
@@ -94,7 +94,7 @@ endif
 
 install_headers(
   headers,
-  subdir: eog_api_name / meson.project_name()
+  subdir: eog_api_name / meson.project_name(),
 )
 
 sources += gnome.compile_resources(
@@ -103,7 +103,7 @@ sources += gnome.compile_resources(
   source_dir: data_dir,
   c_name: '_eog',
   dependencies: resource_data,
-  export: true
+  export: true,
 )
 
 enum = 'eog-enum-types'
@@ -112,7 +112,7 @@ sources += gnome.mkenums(
   enum,
   sources: headers,
   c_template: enum + '.c.template',
-  h_template: enum + '.h.template'
+  h_template: enum + '.h.template',
 )
 
 marshal = 'eog-marshal'
@@ -121,7 +121,7 @@ sources += gnome.genmarshal(
   marshal,
   sources: marshal + '.list',
   prefix: 'eog_marshal',
-  internal: true
+  internal: true,
 )
 
 deps = common_deps + [
@@ -129,14 +129,14 @@ deps = common_deps + [
   gnome_desktop_dep,
   libpeas_gtk_dep,
   zlib_dep,
-  cc.find_library('m')
+  cc.find_library('m'),
 ]
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
   '-DEOG_DATA_DIR="@0@"'.format(eog_pkgdatadir),
   '-DEOG_PLUGIN_DIR="@0@"'.format(eog_pluginsdir),
-  '-DLIBDIR="@0@"'.format(eog_libdir)
+  '-DLIBDIR="@0@"'.format(eog_libdir),
 ]
 
 symbol_map = meson.current_source_dir() / 'symbol.map'
@@ -167,13 +167,13 @@ libeog = shared_library(
   link_args: ldflags,
   link_depends: symbol_map,
   install: true,
-  install_dir: eog_pkglibdir
+  install_dir: eog_pkglibdir,
 )
 
 libeog_dep = declare_dependency(
   link_with: libeog,
   include_directories: src_inc,
-  dependencies: common_deps
+  dependencies: common_deps,
 )
 
 pkg.generate(
@@ -186,15 +186,15 @@ pkg.generate(
   requires: 'gtk+-3.0',
   variables: [
     'exec_prefix=' + eog_prefix,
-    'pluginsdir=' + eog_pluginsdir
-  ]
+    'pluginsdir=' + eog_pluginsdir,
+  ],
 )
 
 deps = [libeog_dep]
 
 cflags = [
   '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
-  '-DEOG_LOCALE_DIR="@0@"'.format(eog_localedir)
+  '-DEOG_LOCALE_DIR="@0@"'.format(eog_localedir),
 ]
 
 if enable_introspection
@@ -208,7 +208,7 @@ eog = executable(
   dependencies: deps,
   c_args: cflags,
   install: true,
-  install_rpath: eog_pkglibdir
+  install_rpath: eog_pkglibdir,
 )
 
 if enable_introspection
@@ -225,6 +225,6 @@ if enable_introspection
     includes: 'Gtk-3.0',
     install: true,
     install_dir_gir: gir_dir,
-    install_dir_typelib: typelib_dir
+    install_dir_typelib: typelib_dir,
   )
 endif
diff --git a/tests/meson.build b/tests/meson.build
index 5d0e4f59..875fdcd3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,17 +6,17 @@ tests_data = files(
   'common_steps.py',
   'environment.py',
   'gnome-logo.png',
-  'screenshot_tour.feature'
+  'screenshot_tour.feature',
 )
 
 install_data(
   tests_data,
-  install_dir: tests_execdir
+  install_dir: tests_execdir,
 )
 
 install_subdir(
   'steps',
-  install_dir: tests_execdir
+  install_dir: tests_execdir,
 )
 
 test_names = [
@@ -26,7 +26,7 @@ test_names = [
   'fullscreen',
   'wallpaper',
   'screenshot_tour1',
-  'screenshot_tour2'
+  'screenshot_tour2',
 ]
 
 foreach test_name: test_names
@@ -39,6 +39,6 @@ foreach test_name: test_names
     output: test_name + '.test',
     install: true,
     install_dir: tests_metadir,
-    configuration: tests_conf
+    configuration: tests_conf,
   )
 endforeach
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]