GNOME.org
 

[gnome-disk-utility] build: Add trailing commas

commit 4f60b686cbe7542b6ce67c60fa5b762ae12a0568
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Jul 3 23:07: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             |  2 +-
 data/meson.build                   | 10 +++++-----
 doc/man/meson.build                |  6 +++---
 meson.build                        |  8 ++++----
 src/disk-image-mounter/meson.build |  6 +++---
 src/disks/meson.build              | 14 +++++++-------
 src/libgdu/meson.build             | 10 +++++-----
 src/notify/meson.build             |  8 ++++----
 8 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 13e98b33..6e8dab60 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,4 +1,4 @@
 install_subdir(
   'hicolor',
-  install_dir: join_paths(gdu_datadir, 'icons')
+  install_dir: join_paths(gdu_datadir, 'icons'),
 )
diff --git a/data/meson.build b/data/meson.build
index c512c750..1fd0f3da 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,7 +3,7 @@ subdir('icons')
 desktops = [
   'org.gnome.DiskUtility.desktop',
   'gnome-disk-image-mounter.desktop',
-  'gnome-disk-image-writer.desktop'
+  'gnome-disk-image-writer.desktop',
 ]
 
 foreach desktop: desktops
@@ -14,7 +14,7 @@ foreach desktop: desktops
     output: desktop,
     po_dir: po_dir,
     install: true,
-    install_dir: join_paths(gdu_datadir, 'applications')
+    install_dir: join_paths(gdu_datadir, 'applications'),
   )
 endforeach
 
@@ -28,12 +28,12 @@ configure_file(
   output: service,
   install: true,
   install_dir: join_paths(gdu_datadir, 'dbus-1', 'services'),
-  configuration: service_conf
+  configuration: service_conf,
 )
 
 install_data(
   'org.gnome.Disks.gschema.xml',
-  install_dir: join_paths(gdu_datadir, 'glib-2.0', 'schemas')
+  install_dir: join_paths(gdu_datadir, 'glib-2.0', 'schemas'),
 )
 
 info = 'org.gnome.DiskUtility.appdata.xml'
@@ -44,5 +44,5 @@ i18n.merge_file(
   output: info,
   po_dir: po_dir,
   install: true,
-  install_dir: join_paths(gdu_datadir, 'metainfo')
+  install_dir: join_paths(gdu_datadir, 'metainfo'),
 )
diff --git a/doc/man/meson.build b/doc/man/meson.build
index 1a16fa0b..1e481622 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -3,12 +3,12 @@ xsltproc_cmd = [
   '--output', '@OUTPUT@',
   '--nonet',
   'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-  '@INPUT@'
+  '@INPUT@',
 ]
 
 mans = [
   'gnome-disks',
-  'gnome-disk-image-mounter'
+  'gnome-disk-image-mounter',
 ]
 
 foreach man: mans
@@ -20,6 +20,6 @@ foreach man: mans
     output: output,
     command: xsltproc_cmd,
     install: true,
-    install_dir: join_paths(gdu_mandir, 'man1')
+    install_dir: join_paths(gdu_mandir, 'man1'),
   )
 endforeach
diff --git a/meson.build b/meson.build
index 6be18834..e071b023 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   version: '3.33.3',
   license: 'GPL2.0',
   default_options: 'buildtype=debugoptimized',
-  meson_version: '>= 0.50.0'
+  meson_version: '>= 0.50.0',
 )
 
 gdu_name = 'gnome-disk-utility'
@@ -55,7 +55,7 @@ if get_option('buildtype').contains('debug')
     '-Wswitch-enum',
     '-Wundef',
     '-Wunused-but-set-variable',
-    '-Wwrite-strings'
+    '-Wwrite-strings',
   ]
 
   compiler_flags += cc.get_supported_arguments(test_cflags)
@@ -109,12 +109,12 @@ subdir('doc/man')
 
 configure_file(
   output: 'config.h',
-  configuration: config_h
+  configuration: config_h,
 )
 
 meson.add_install_script(
   'meson_post_install.py',
-  gdu_datadir
+  gdu_datadir,
 )
 
 output = '\n        gnome-disk-utility ' + gdu_version + '\n'
diff --git a/src/disk-image-mounter/meson.build b/src/disk-image-mounter/meson.build
index eb40e9e6..de2ce907 100644
--- a/src/disk-image-mounter/meson.build
+++ b/src/disk-image-mounter/meson.build
@@ -5,13 +5,13 @@ deps = [
   gio_unix_dep,
   udisk_dep,
   gtk_dep,
-  libgdu_dep
+  libgdu_dep,
 ]
 
 cflags = [
   '-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir),
   '-DG_LOG_DOMAIN="@0@"'.format(name),
-  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir)
+  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir),
 ]
 
 executable(
@@ -20,5 +20,5 @@ executable(
   include_directories: top_inc,
   dependencies: deps,
   c_args: cflags,
-  install: true
+  install: true,
 )
diff --git a/src/disks/meson.build b/src/disks/meson.build
index 3015332c..db39358b 100644
--- a/src/disks/meson.build
+++ b/src/disks/meson.build
@@ -32,7 +32,7 @@ sources = files(
   'gduvolumegrid.c',
   'gduwindow.c',
   'gduxzdecompressor.c',
-  'main.c'
+  'main.c',
 )
 
 resource_data = files(
@@ -62,7 +62,7 @@ resource_data = files(
   'ui/resize-dialog.ui',
   'ui/restore-disk-image-dialog.ui',
   'ui/smart-dialog.ui',
-  'ui/unlock-device-dialog.ui'
+  'ui/unlock-device-dialog.ui',
 )
 
 sources += gnome.compile_resources(
@@ -70,7 +70,7 @@ sources += gnome.compile_resources(
   'gnome-disks.gresource.xml',
   source_dir: '.',
   dependencies: resource_data,
-  export: true
+  export: true,
 )
 
 enum = 'gduenumtypes'
@@ -79,7 +79,7 @@ sources += gnome.mkenums(
   enum,
   sources: enum_headers,
   c_template: enum + '.c.template',
-  h_template: enum + '.h.template'
+  h_template: enum + '.h.template',
 )
 
 deps = [
@@ -93,13 +93,13 @@ deps = [
   dvdread_dep,
   liblzma_dep,
   libgdu_dep,
-  m_dep
+  m_dep,
 ]
 
 cflags = [
   '-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir),
   '-DG_LOG_DOMAIN="@0@"'.format(name),
-  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir)
+  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir),
 ]
 
 executable(
@@ -108,5 +108,5 @@ executable(
   include_directories: top_inc,
   dependencies: deps,
   c_args: cflags,
-  install: true
+  install: true,
 )
diff --git a/src/libgdu/meson.build b/src/libgdu/meson.build
index 6ebe5744..2121fa6c 100644
--- a/src/libgdu/meson.build
+++ b/src/libgdu/meson.build
@@ -8,7 +8,7 @@ libgduenumtypes = gnome.mkenums(
   enum,
   sources: enum_headers,
   c_template: enum + '.c.template',
-  h_template: enum + '.h.template'
+  h_template: enum + '.h.template',
 )
 
 deps = [
@@ -18,7 +18,7 @@ deps = [
   gtk_dep,
   libsecret_dep,
   pwquality_dep,
-  m_dep
+  m_dep,
 ]
 
 if enable_logind
@@ -28,7 +28,7 @@ endif
 cflags = [
   '-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir),
   '-DG_LOG_DOMAIN="libgdu"',
-  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir)
+  '-DGNOMELOCALEDIR="@0@"'.format(gdu_localedir),
 ]
 
 libgdu = static_library(
@@ -36,11 +36,11 @@ libgdu = static_library(
   sources: sources + libgduenumtypes,
   include_directories: top_inc,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 libgdu_dep = declare_dependency(
   link_with: libgdu,
   include_directories: include_directories('.'),
-  dependencies: deps
+  dependencies: deps,
 )
diff --git a/src/notify/meson.build b/src/notify/meson.build
index 5a22a478..d16a197a 100644
--- a/src/notify/meson.build
+++ b/src/notify/meson.build
@@ -1,6 +1,6 @@
 sources = files(
   'gdusdmonitor.c',
-  'main.c'
+  'main.c',
 )
 
 deps = [
@@ -8,7 +8,7 @@ deps = [
   gio_unix_dep,
   udisk_dep,
   gtk_dep,
-  libnotify_dep
+  libnotify_dep,
 ]
 
 executable(
@@ -17,7 +17,7 @@ executable(
   include_directories: top_inc,
   dependencies: deps,
   install: true,
-  install_dir: gdu_libexecdir
+  install_dir: gdu_libexecdir,
 )
 
 desktop_conf = configuration_data()
@@ -30,5 +30,5 @@ configure_file(
   output: desktop,
   configuration: desktop_conf,
   install: true,
-  install_dir: join_paths(gdu_sysconfdir, 'xdg', 'autostart')
+  install_dir: join_paths(gdu_sysconfdir, 'xdg', 'autostart'),
 )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]