[dia: 83/105] #19 formatting: Use 'arg: value' instead of 'arg : value'.



commit 4974d144c91f8381eb87c2e1aa4a221aa4c35aa2
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sat Jan 19 13:54:43 2019 +0000

    #19 formatting: Use 'arg: value' instead of 'arg : value'.

 app/meson.build     | 10 +++++-----
 doc/en/meson.build  | 28 ++++++++++++++--------------
 lib/meson.build     |  8 ++++----
 meson.build         | 18 +++++++++---------
 objects/meson.build | 10 +++++-----
 shapes/meson.build  |  2 +-
 sheets/meson.build  | 22 +++++++++++-----------
 7 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index c9e62d1e..4c5486d1 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -76,11 +76,11 @@ diaapp_inc = include_directories('.')
 
 diaapp = executable('dia',
     dia_sources + [dia_app_icons_h, diamarshal_h],
-    dependencies : [libgtk_dep, libxml_dep, libm_dep],
-    link_with : [libdia],
+    dependencies: [libgtk_dep, libxml_dep, libm_dep],
+    link_with: [libdia],
     link_args: dia_link_args,
     export_dynamic: true,  # some plugins require this.
-    include_directories : [configuration_inc, libdia_inc],
-    gui_app : true,
-    install : true,
+    include_directories: [configuration_inc, libdia_inc],
+    gui_app: true,
+    install: true,
 )
diff --git a/doc/en/meson.build b/doc/en/meson.build
index 4266ddf3..267a8271 100644
--- a/doc/en/meson.build
+++ b/doc/en/meson.build
@@ -70,12 +70,12 @@ html_output = [
 lang = 'en'
 
 custom_target(lang + '-dia.pdf',
-    output : 'dia.pdf',
-    input  : 'dia.xml',
-    depend_files : xml_deps,
-    command : [dblatex, '-t', 'pdf', '-q', '-o', '@OUTPUT@', '@INPUT@'],
-    install : true,
-    install_dir : join_paths(docdir, lang)
+    output: 'dia.pdf',
+    input: 'dia.xml',
+    depend_files: xml_deps,
+    command: [dblatex, '-t', 'pdf', '-q', '-o', '@OUTPUT@', '@INPUT@'],
+    install: true,
+    install_dir: join_paths(docdir, lang)
 )
 
 if xsltproc.found()
@@ -88,11 +88,11 @@ if xsltproc.found()
             DB2MAN,
             '@INPUT@'
         ],
-        install : true,
-        install_dir : join_paths(get_option('mandir'), 'man1')
+        install: true,
+        install_dir: join_paths(get_option('mandir'), 'man1')
     )
     # TODO: this should fixed in meson: https://github.com/mesonbuild/meson/issues/1550
-    #install_man(dia_man, language : lang)
+    #install_man(dia_man, language: lang)
 
     html_dir = join_paths(helpdir, lang)
 
@@ -106,18 +106,18 @@ if xsltproc.found()
             '@INPUT@'
         ],
         depend_files: xml_deps,
-        install : true,
-        install_dir : html_dir,
+        install: true,
+        install_dir: html_dir,
     )
 
     install_subdir(
         'graphics',
-        install_dir : html_dir
+        install_dir: html_dir
     )
 
     install_subdir(
         join_paths('..', 'html'),
-        install_dir : html_dir,
-        strip_directory : true
+        install_dir: html_dir,
+        strip_directory: true
     )
 endif
diff --git a/lib/meson.build b/lib/meson.build
index 4b522e50..4a5b4eb7 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -122,9 +122,9 @@ libdia_inc = include_directories('.')
 
 libdia = library('dia',
     libdia_sources + [diamarshal, dia_lib_icons_h],
-    dependencies : libdia_deps,
-    include_directories : configuration_inc,
-    c_args : ['-Wall'],
+    dependencies: libdia_deps,
+    include_directories: configuration_inc,
+    c_args: ['-Wall'],
     vs_module_defs: files('libdia.def')[0],
-    install : true,
+    install: true,
 )
diff --git a/meson.build b/meson.build
index 8e25c058..b88ae0d9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,16 +1,16 @@
 project('dia',
         ['c', 'cpp'],
-        version : '0.97.3',  # This is the base version, git suffix gets added to config.h.
-        meson_version : '>= 0.49',
-        default_options : []
+        version: '0.97.3',  # This is the base version, git suffix gets added to config.h.
+        meson_version: '>= 0.49',
+        default_options: []
 )
 
 cc = meson.get_compiler('c')
 conf = configuration_data()
 
-libglib_dep = dependency('glib-2.0', version : '>= 2.50.3')
-libgtk_dep  = dependency('gtk+-2.0', version : '>= 2.24.31')
-libxml_dep  = dependency('libxml-2.0', version : '>= 2.9.4')
+libglib_dep = dependency('glib-2.0',   version: '>= 2.50.3')
+libgtk_dep  = dependency('gtk+-2.0',   version: '>= 2.24.31')
+libxml_dep  = dependency('libxml-2.0', version: '>= 2.9.4')
 #TODO: what are the minimum versions?
 gmodule_dep = dependency('gmodule-2.0')
 libzlib_dep = dependency('zlib')
@@ -22,7 +22,7 @@ conf.set('HAVE_CAIRO', 1)
 libm_dep = cc.find_library('m')
 
 # This is needed for some platforms (eg. BSD).
-libc_dep = cc.find_library('c', required : false)
+libc_dep = cc.find_library('c', required: false)
 
 # Optional deps
 freetype_dep = dependency('freetype2', version: ['>= 11.0.5', '< 22.0.0'], required: false)
@@ -67,12 +67,12 @@ foreach f : ['select', 'strcspn', 'strdup', 'strtol']
 endforeach
 
 configuration_inc = include_directories('.')
-config_h_in = configure_file(output : 'config.h.in', configuration : conf)
+config_h_in = configure_file(output: 'config.h.in', configuration: conf)
 vcs_tag(input: config_h_in, output: 'config.h')
 
 # TODO: I don't think this should be defined.
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.
-add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
+add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
 
 subdir('po')
 subdir('lib')
diff --git a/objects/meson.build b/objects/meson.build
index 485872c6..c164dbd7 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -22,10 +22,10 @@ subdir('UML')
 foreach o : dia_object_desc
     library(o[0],
         o[1],
-        dependencies : [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o[2],
-        link_with : libdia,
-        include_directories : [configuration_inc, libdia_inc],
-        install : true,
-        install_dir : dialibdir
+        dependencies: [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o[2],
+        link_with: libdia,
+        include_directories: [configuration_inc, libdia_inc],
+        install: true,
+        install_dir: dialibdir
     )
 endforeach
diff --git a/shapes/meson.build b/shapes/meson.build
index d65afb9d..5bd4cf7d 100644
--- a/shapes/meson.build
+++ b/shapes/meson.build
@@ -28,6 +28,6 @@ subdir('sybase')
 foreach shape_info : shapes
     install_data(
         shape_info[0],
-        install_dir : join_paths(shapesdir, shape_info[1])
+        install_dir: join_paths(shapesdir, shape_info[1])
     )
 endforeach
diff --git a/sheets/meson.build b/sheets/meson.build
index c322cd31..6d2ce7f0 100644
--- a/sheets/meson.build
+++ b/sheets/meson.build
@@ -48,7 +48,7 @@ sheet_icons_sources = [
 
 foreach icon : sheet_icons_sources
     rel_path = icon.split('/')
-    install_data(icon, install_dir : join_paths(sheetsdir, rel_path[0]))
+    install_data(icon, install_dir: join_paths(sheetsdir, rel_path[0]))
 endforeach
 
 sheet_files = [
@@ -106,11 +106,11 @@ sheet_files_targets = []
 foreach sheet : sheet_files
     sheet_files_targets += custom_target(
         sheet,
-        input : sheet + '.in',
-        output : sheet,
-        command : intltool_command,
-        install : true,
-        install_dir : sheetsdir
+        input: sheet + '.in',
+        output: sheet,
+        command: intltool_command,
+        install: true,
+        install_dir: sheetsdir
     )
 endforeach
 
@@ -118,9 +118,9 @@ checktrans_py = find_program('checktrans.py')
 
 custom_target(
     'sheet-translation-report',
-    build_by_default :  false,  # Currently broken anyway.
-    input : sheet_files_targets,
-    output : 'sheet-translation-report',
-    command : [checktrans_py, '@INPUT@'],
-    capture : true
+    build_by_default:  false,  # TODO: Currently broken anyway.
+    input: sheet_files_targets,
+    output: 'sheet-translation-report',
+    command: [checktrans_py, '@INPUT@'],
+    capture: true
 )


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