[gnome-clocks] build: use 2-space indent as specified by the meson style guidelines



commit 84d39a4a28517ac47365f038fb8bded789700fd9
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Apr 25 14:30:26 2017 +0200

    build: use 2-space indent as specified by the meson style guidelines

 data/meson.build |   55 +++++++++++++++----------------
 help/meson.build |   62 ++++++++++++++++++------------------
 meson.build      |   12 +++---
 src/meson.build  |   94 +++++++++++++++++++++++++++---------------------------
 4 files changed, 111 insertions(+), 112 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index d6793bf..90dafc2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,56 +1,55 @@
 iconsdir = join_paths(get_option('datadir'), 'icons/hicolor')
 foreach size: ['16x16', '22x22', '32x32', '48x48', '256x256', 'scalable']
-    install_subdir('icons/' + size, install_dir: iconsdir)
+  install_subdir('icons/' + size, install_dir: iconsdir)
 endforeach
 
 install_subdir('images/', install_dir: join_paths(get_option('datadir'), meson.project_name()))
 
 resource_files = files('gnome-clocks.gresource.xml')
 resources = gnome.compile_resources('org.gnome.clocks', resource_files,
-    c_name: 'resources'
+  c_name: 'resources'
 )
 
 custom_target('desktop-file',
-    input: 'org.gnome.clocks.desktop.in',
-    output: 'org.gnome.clocks.desktop',
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'applications'),
-    command: [msgfmt, '--desktop',
-        '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@',
-        '--keyword=X-GNOME-FullName', '--keyword=X-Geoclue-Reason',
-        '--keyword=Name', '--keyword=GenericName', '--keyword=Comment', '--keyword=Keywords'
-    ]
+  input: 'org.gnome.clocks.desktop.in',
+  output: 'org.gnome.clocks.desktop',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'applications'),
+  command: [msgfmt, '--desktop',
+    '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@',
+    '--keyword=X-GNOME-FullName', '--keyword=X-Geoclue-Reason',
+    '--keyword=Name', '--keyword=GenericName', '--keyword=Comment', '--keyword=Keywords'
+  ]
 )
 
 dbusconf = configuration_data()
 dbusconf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 configure_file(
-    input: 'org.gnome.clocks.service.in',
-    output: 'org.gnome.clocks.service',
-    configuration: dbusconf,
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'),
+  input: 'org.gnome.clocks.service.in',
+  output: 'org.gnome.clocks.service',
+  configuration: dbusconf,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services'),
 )
 
 custom_target('appdata-file',
-    input: 'org.gnome.clocks.appdata.xml.in',
-    output: 'org.gnome.clocks.appdata.xml',
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'appdata'),
-    command: [msgfmt, '--xml',
-        '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@'],
+  input: 'org.gnome.clocks.appdata.xml.in',
+  output: 'org.gnome.clocks.appdata.xml',
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'appdata'),
+  command: [msgfmt, '--xml', '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@'],
 )
 
 install_data('org.gnome.clocks.search-provider.ini',
-    install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers'),
+  install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers'),
 )
 
 gsettingsconf = configuration_data()
 gsettingsconf.set('GETTEXT_PACKAGE', meson.project_name())
 configure_file(
-    input: 'org.gnome.clocks.gschema.xml.in',
-    output: 'org.gnome.clocks.gschema.xml',
-    configuration: gsettingsconf,
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas'),
+  input: 'org.gnome.clocks.gschema.xml.in',
+  output: 'org.gnome.clocks.gschema.xml',
+  configuration: gsettingsconf,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas'),
 )
diff --git a/help/meson.build b/help/meson.build
index dd5bd83..49b8b80 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,42 +1,42 @@
 help_files = [
-    'alarm-add.page',
-    'alarm-edit.page',
-    'alarm-remove.page',
-    'alarm-snooze-stop.page',
-    'stopwatch.page',
-    'timer.page',
-    'world-add.page',
-    'world-check.page',
-    'world-remove.page',
-    'index.page',
-    'legal.xml'
+  'alarm-add.page',
+  'alarm-edit.page',
+  'alarm-remove.page',
+  'alarm-snooze-stop.page',
+  'stopwatch.page',
+  'timer.page',
+  'world-add.page',
+  'world-check.page',
+  'world-remove.page',
+  'index.page',
+  'legal.xml'
 ]
 
 help_media = [
-    'figures/gnome-clocks.png'
+  'figures/gnome-clocks.png'
 ]
 
 help_linguas = [
-    'ca',
-    'cs',
-    'da',
-    'de',
-    'el',
-    'es',
-    'fi',
-    'fr',
-    'gl',
-    'hu',
-    'id',
-    'ko',
-    'nl',
-    'pt_BR',
-    'ru',
-    'sv'
+  'ca',
+  'cs',
+  'da',
+  'de',
+  'el',
+  'es',
+  'fi',
+  'fr',
+  'gl',
+  'hu',
+  'id',
+  'ko',
+  'nl',
+  'pt_BR',
+  'ru',
+  'sv'
 ]
 
 gnome.yelp(meson.project_version(),
-    sources: help_files,
-    media: help_media,
-    languages: help_linguas,
+  sources: help_files,
+  media: help_media,
+  languages: help_linguas,
 )
diff --git a/meson.build b/meson.build
index 09c8fd7..905873f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('gnome-clocks', ['vala', 'c'],
-    version: '3.24.0',
-    license: 'GPL2+',
-    meson_version: '>= 0.37',
+  version: '3.24.0',
+  license: 'GPL2+',
+  meson_version: '>= 0.37',
 )
 
 gnome = import('gnome')
@@ -23,10 +23,10 @@ math = cc.find_library('m', required: false)
 have_first_weekday = cc.compiles('''
 #include <langinfo.h>
 int main() {
-    nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
+  nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
 }
 ''',
-    name: '_NL_TIME_FIRST_WEEKDAY check program'
+  name: '_NL_TIME_FIRST_WEEKDAY check program'
 )
 
 msgfmt = find_program('msgfmt')
@@ -41,7 +41,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
 conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('datadir'), '/locale'))
 if have_first_weekday
-    conf.set('HAVE__NL_TIME_FIRST_WEEKDAY', '1')
+  conf.set('HAVE__NL_TIME_FIRST_WEEKDAY', '1')
 endif
 configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
diff --git a/src/meson.build b/src/meson.build
index 6d1525e..42e59e5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,62 +1,62 @@
-vala_sources = [
-    'alarm.vala',
-    'application.vala',
-    'clock.vala',
-    'geocoding.vala',
-    'main.vala',
-    'search-provider.vala',
-    'stopwatch.vala',
-    'timer.vala',
-    'utils.vala',
-    'widgets.vala',
-    'window.vala',
-    'world.vala'
+vapi_sources = [
+  'config.vapi',
 ]
 
-vapi_sources = [
-    'config.vapi',
+clocks_vala_sources = [
+  'alarm.vala',
+  'application.vala',
+  'clock.vala',
+  'geocoding.vala',
+  'main.vala',
+  'search-provider.vala',
+  'stopwatch.vala',
+  'timer.vala',
+  'utils.vala',
+  'widgets.vala',
+  'window.vala',
+  'world.vala'
 ]
 
-c_sources = [
-    'cutils.c'
+clocks_c_sources = [
+  'cutils.c'
 ]
 
-sources = [
-    vala_sources,
-    vapi_sources,
-    c_sources,
-    resources
+clocks_sources = [
+  vapi_sources,
+  clocks_vala_sources,
+  clocks_c_sources,
+  resources
 ]
 
-vala_args = [
-    '--target-glib', '2.44',
-    '--vapidir', meson.current_source_dir(),
-    '--gresources', resource_files,
+clocks_vala_args = [
+  '--target-glib', '2.44',
+  '--vapidir', meson.current_source_dir(),
+  '--gresources', resource_files,
 ]
 
-c_args = [
-    '-include', 'config.h',
-    '-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE',
-    '-DGNOME_DESKTOP_USE_UNSTABLE_API'
+clocks_c_args = [
+  '-include', 'config.h',
+  '-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE',
+  '-DGNOME_DESKTOP_USE_UNSTABLE_API'
 ]
 
-dependencies = [
-    glib,
-    gio,
-    gobject,
-    gtk,
-    gsound,
-    gweather,
-    gnomedesktop,
-    geocodeglib,
-    libgeoclue,
-    math
+clocks_dependencies = [
+  glib,
+  gio,
+  gobject,
+  gtk,
+  gsound,
+  gweather,
+  gnomedesktop,
+  geocodeglib,
+  libgeoclue,
+  math
 ]
 
-executable('gnome-clocks', sources,
-    include_directories: config_h_dir,
-    vala_args: vala_args,
-    c_args: c_args,
-    install: true,
-    dependencies: dependencies
+executable('gnome-clocks', clocks_sources,
+  include_directories: config_h_dir,
+  vala_args: clocks_vala_args,
+  c_args: clocks_c_args,
+  dependencies: clocks_dependencies,
+  install: true
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]