[gnome-weather] meson: standardize spacing to 2 spaces



commit cfc72f6a4c36f9ea3fa5ff286808f39551392f7b
Author: Christopher Davis <brainblasted disroot org>
Date:   Tue Mar 5 22:20:35 2019 -0500

    meson: standardize spacing to 2 spaces
    
    There were places where we were using tab characters or
    4 spaces. Common spacing for meson is 2 spaces.

 data/icons/meson.build | 20 ++++++------
 data/meson.build       | 86 +++++++++++++++++++++++++-------------------------
 meson.build            | 20 ++++++------
 src/meson.build        | 40 +++++++++++------------
 4 files changed, 83 insertions(+), 83 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 67dea9e..9412fac 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -2,27 +2,27 @@ datadir = join_paths(get_option('datadir'), 'icons')
 icondir = join_paths('hicolor', 'scalable', 'apps')
 if get_option('profile') == 'development'
 install_data (
-       join_paths(icondir, 'org.gnome.Weather.svg'),
-       install_dir: join_paths(datadir, icondir),
-       rename: 'org.gnome.WeatherDevel.svg'
+  join_paths(icondir, 'org.gnome.Weather.svg'),
+  install_dir: join_paths(datadir, icondir),
+  rename: 'org.gnome.WeatherDevel.svg'
 )
 else
 install_data (
-       join_paths(icondir, 'org.gnome.Weather.svg'),
-       install_dir: join_paths(datadir, icondir)
+  join_paths(icondir, 'org.gnome.Weather.svg'),
+  install_dir: join_paths(datadir, icondir)
 )
 endif
 
 icondir = join_paths('hicolor', 'symbolic', 'apps')
 if get_option('profile') == 'development'
 install_data (
-       join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
-       install_dir: join_paths(datadir, icondir),
-       rename: 'org.gnome.WeatherDevel-symbolic.svg'
+  join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
+  install_dir: join_paths(datadir, icondir),
+  rename: 'org.gnome.WeatherDevel-symbolic.svg'
 )
 else
 install_data (
-       join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
-       install_dir: join_paths(datadir, icondir)
+  join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
+  install_dir: join_paths(datadir, icondir)
 )
 endif
diff --git a/data/meson.build b/data/meson.build
index 1257914..1273550 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,27 +8,27 @@ data_conf.set('DATA_DIR', DATA_DIR)
 message('Compiling resources')
 
 gnome.compile_resources(
-       application_id_stable + '.data',
-       application_id_stable + '.data.gresource.xml',
-       gresource_bundle: true,
-       source_dir: '.',
-       install_dir: DATA_DIR,
-       install: true
+  application_id_stable + '.data',
+  application_id_stable + '.data.gresource.xml',
+  gresource_bundle: true,
+  source_dir: '.',
+  install_dir: DATA_DIR,
+  install: true
 )
 
 gnome.compile_resources(
-       application_id_stable + '.BackgroundService.data',
-       application_id_stable + '.BackgroundService.data.gresource.xml',
-       gresource_bundle: true,
-       source_dir: '.',
-       install_dir: DATA_DIR,
-       install: true
+  application_id_stable + '.BackgroundService.data',
+  application_id_stable + '.BackgroundService.data.gresource.xml',
+  gresource_bundle: true,
+  source_dir: '.',
+  install_dir: DATA_DIR,
+  install: true
 )
 
 # Installing the schema file
 install_data(
-       application_id_stable + '.gschema.xml',
-       install_dir: 'share/glib-2.0/schemas'
+  application_id_stable + '.gschema.xml',
+  install_dir: 'share/glib-2.0/schemas'
 )
 
 # Building desktop file
@@ -55,55 +55,55 @@ desktop = custom_target(
 # Validating desktop file
 desktop_file_validate = find_program('desktop-file-validate', required:false)
 if desktop_file_validate.found()
-       test (
-               'Validate desktop file',
-               desktop_file_validate,
-               args: join_paths(meson.current_build_dir(), application_id + '.desktop')
-       )
+  test (
+    'Validate desktop file',
+    desktop_file_validate,
+    args: join_paths(meson.current_build_dir(), application_id + '.desktop')
+  )
 endif
 
 # Building app data
 appdata_conf = configuration_data()
 appdata = i18n.merge_file(
-       'appdata',
-       input: application_id_stable + '.appdata.xml.in',
-       output: application_id + '.appdata.xml',
-       install: true,
-       install_dir: join_paths(join_paths('share'), 'metainfo'),
-       po_dir: join_paths(meson.source_root(), 'po')
+  'appdata',
+  input: application_id_stable + '.appdata.xml.in',
+  output: application_id + '.appdata.xml',
+  install: true,
+  install_dir: join_paths(join_paths('share'), 'metainfo'),
+  po_dir: join_paths(meson.source_root(), 'po')
 )
 
 # Validating app data
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
-       test(
-               'validate-appdata', appstream_util,
-               args: [
-                       'validate-relax', '--nonet', appdata.full_path()
-               ]
-       )
+  test(
+    'validate-appdata', appstream_util,
+    args: [
+      'validate-relax', '--nonet', appdata.full_path()
+    ]
+  )
 endif
 
 configure_file(
-       input: application_id_stable + '.service.in',
-       output: application_id + '.service',
-       configuration: data_conf,
-       install: true,
-       install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
+  input: application_id_stable + '.service.in',
+  output: application_id + '.service',
+  configuration: data_conf,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
 )
 
 configure_file(
-       input: application_id_stable + '.BackgroundService.service.in',
-       output: application_id + '.BackgroundService.service',
-       configuration: data_conf,
-       install: true,
-       install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
+  input: application_id_stable + '.BackgroundService.service.in',
+  output: application_id + '.BackgroundService.service',
+  configuration: data_conf,
+  install: true,
+  install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
 )
 
 # Search Provider
 install_data(
-       application_id_stable + '.search-provider.ini',
-       install_dir: 'share/gnome-shell/search-providers'
+  application_id_stable + '.search-provider.ini',
+  install_dir: 'share/gnome-shell/search-providers'
 )
 
 subdir('icons')
diff --git a/meson.build b/meson.build
index f6e1bd6..c3a7928 100644
--- a/meson.build
+++ b/meson.build
@@ -26,11 +26,11 @@ BIN_DIR = join_paths(get_option('prefix'), get_option('bindir'))
 
 # Profiles
 if get_option('profile') == 'development'
-    profile = 'Devel'
-    name_suffix = ' (Development)'
+  profile = 'Devel'
+  name_suffix = ' (Development)'
 else
-    profile = ''
-    name_suffix = ''
+  profile = ''
+  name_suffix = ''
 endif
 
 conf = configuration_data()
@@ -38,9 +38,9 @@ conf.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/gnome-weather')
 conf.set('DATA_DIR', DATA_DIR)
 
 if get_option('profile') == 'development'
-    conf.set('VERSION', ''.join([run_command(['git', 'describe', '--long', '--tags']).stdout(), 
get_option('profile')]))
+  conf.set('VERSION', ''.join([run_command(['git', 'describe', '--long', '--tags']).stdout(), 
get_option('profile')]))
 else
-    conf.set('VERSION', meson.project_version())
+  conf.set('VERSION', meson.project_version())
 endif
 
 conf.set_quoted('PROFILE', profile)
@@ -56,8 +56,8 @@ subdir('src')
 subdir('tests')
 
 meson.add_install_script(
-    'meson_post_install.py',
-    join_paths(get_option('prefix'), get_option('datadir')),
-    DATA_DIR,
-    BIN_DIR,
+  'meson_post_install.py',
+  join_paths(get_option('prefix'), get_option('datadir')),
+  DATA_DIR,
+  BIN_DIR,
 )
diff --git a/src/meson.build b/src/meson.build
index 8d64aa8..b63ea62 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,35 +6,35 @@ source_conf.set('libdir', EXTENSION_DIR)
 source_conf.set('prefix', prefix)
 
 application = configure_file(
-       input: application_id_stable + '.in',
-       output: application_id,
-       configuration: source_conf,
-       install: true,
-       install_dir: DATA_DIR
+  input: application_id_stable + '.in',
+  output: application_id,
+  configuration: source_conf,
+  install: true,
+  install_dir: DATA_DIR
 )
 
 configure_file(
-       input: application_id_stable + '.BackgroundService.in',
-       output: application_id + '.BackgroundService',
-       configuration: source_conf,
-       install: true,
-       install_dir: DATA_DIR
+  input: application_id_stable + '.BackgroundService.in',
+  output: application_id + '.BackgroundService',
+  configuration: source_conf,
+  install: true,
+  install_dir: DATA_DIR
 )
 
 application_sources = gnome.compile_resources(
-       application_id_stable + '.src',
-       application_id_stable + '.src.gresource.xml',
-       gresource_bundle: true,
-       install: true,
-       install_dir: DATA_DIR
+  application_id_stable + '.src',
+  application_id_stable + '.src.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: DATA_DIR
 )
 
 gnome.compile_resources(
-       application_id_stable + '.BackgroundService.src',
-       application_id_stable + '.BackgroundService.src.gresource.xml',
-       gresource_bundle: true,
-       install: true,
-       install_dir: DATA_DIR
+  application_id_stable + '.BackgroundService.src',
+  application_id_stable + '.BackgroundService.src.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: DATA_DIR
 )
 
 run_target('run',


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