[devhelp] build: 2 spaces for the indentation
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] build: 2 spaces for the indentation
- Date: Mon, 11 Nov 2019 09:23:40 +0000 (UTC)
commit 77c031f55425ce582a243ddaeede174cec36b1d8
Author: Sébastien Wilmet <swilmet gnome org>
Date: Mon Nov 11 10:10:29 2019 +0100
build: 2 spaces for the indentation
To follow the upstream Meson style.
data/icons/meson.build | 24 ++---
data/meson.build | 58 ++++++------
devhelp/meson.build | 200 +++++++++++++++++++--------------------
docs/reference/meson.build | 50 +++++-----
docs/reference/xml/meson.build | 6 +-
help/meson.build | 8 +-
meson.build | 154 +++++++++++++++---------------
plugins/gedit-plugin/meson.build | 18 ++--
po/meson.build | 4 +-
src/meson.build | 28 +++---
unit-tests/meson.build | 22 ++---
11 files changed, 286 insertions(+), 286 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 2d009920..45200a53 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,18 +1,18 @@
install_data(
- 'scalable/org.gnome.Devhelp.svg',
- install_dir : join_paths(
- get_option('prefix'),
- get_option('datadir'),
- 'icons/hicolor/scalable/apps'
- )
+ 'scalable/org.gnome.Devhelp.svg',
+ install_dir : join_paths(
+ get_option('prefix'),
+ get_option('datadir'),
+ 'icons/hicolor/scalable/apps'
+ )
)
install_data(
- 'symbolic/org.gnome.Devhelp-symbolic.svg',
- install_dir : join_paths(
- get_option('prefix'),
- get_option('datadir'),
- 'icons/hicolor/symbolic/apps'
- )
+ 'symbolic/org.gnome.Devhelp-symbolic.svg',
+ install_dir : join_paths(
+ get_option('prefix'),
+ get_option('datadir'),
+ 'icons/hicolor/symbolic/apps'
+ )
)
diff --git a/data/meson.build b/data/meson.build
index d32ec8c4..ad2bb5bb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,58 +1,58 @@
subdir('icons')
install_data(
- 'org.gnome.devhelp.gschema.xml',
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
+ 'org.gnome.devhelp.gschema.xml',
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
)
libdevhelp_gschema_conf = configuration_data()
libdevhelp_gschema_conf.set('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)
configure_file(
- input : 'org.gnome.libdevhelp.gschema.xml.in',
- output : 'org.gnome.libdevhelp-@0 gschema xml'.format(LIBDEVHELP_API_VERSION),
- configuration : libdevhelp_gschema_conf,
- install : true,
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
+ input : 'org.gnome.libdevhelp.gschema.xml.in',
+ output : 'org.gnome.libdevhelp-@0 gschema xml'.format(LIBDEVHELP_API_VERSION),
+ configuration : libdevhelp_gschema_conf,
+ install : true,
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0/schemas')
)
appdata = 'org.gnome.Devhelp.appdata.xml'
I18N.merge_file(
- appdata,
- input : appdata + '.in',
- output : appdata,
- po_dir : '../po/',
- install : true,
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
+ appdata,
+ input : appdata + '.in',
+ output : appdata,
+ po_dir : '../po/',
+ install : true,
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
)
desktop_file = 'org.gnome.Devhelp.desktop'
I18N.merge_file(
- desktop_file,
- type : 'desktop',
- input : desktop_file + '.in',
- output : desktop_file,
- po_dir : '../po/',
- install : true,
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'applications')
+ desktop_file,
+ type : 'desktop',
+ input : desktop_file + '.in',
+ output : desktop_file,
+ po_dir : '../po/',
+ install : true,
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'applications')
)
service_file = 'org.gnome.Devhelp.service'
service_conf = configuration_data()
service_conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
configure_file(
- input : service_file + '.in',
- output : service_file,
- configuration : service_conf,
- install : true,
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services')
+ input : service_file + '.in',
+ output : service_file,
+ configuration : service_conf,
+ install : true,
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services')
)
install_data(
- ['assistant.css', 'assistant.js'],
- install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'devhelp/assistant')
+ ['assistant.css', 'assistant.js'],
+ install_dir : join_paths(get_option('prefix'), get_option('datadir'), 'devhelp/assistant')
)
install_data(
- 'devhelp.1',
- install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
+ 'devhelp.1',
+ install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
)
diff --git a/devhelp/meson.build b/devhelp/meson.build
index ea217895..b6a0d0a2 100644
--- a/devhelp/meson.build
+++ b/devhelp/meson.build
@@ -1,141 +1,141 @@
libdevhelp_public_headers = [
- 'devhelp.h',
- 'dh-application-window.h',
- 'dh-assistant-view.h',
- 'dh-book.h',
- 'dh-book-list.h',
- 'dh-book-list-builder.h',
- 'dh-book-list-directory.h',
- 'dh-book-manager.h',
- 'dh-book-tree.h',
- 'dh-completion.h',
- 'dh-init.h',
- 'dh-keyword-model.h',
- 'dh-link.h',
- 'dh-notebook.h',
- 'dh-profile.h',
- 'dh-profile-builder.h',
- 'dh-search-bar.h',
- 'dh-settings.h',
- 'dh-settings-builder.h',
- 'dh-sidebar.h',
- 'dh-tab.h',
- 'dh-tab-label.h',
- 'dh-web-view.h'
+ 'devhelp.h',
+ 'dh-application-window.h',
+ 'dh-assistant-view.h',
+ 'dh-book.h',
+ 'dh-book-list.h',
+ 'dh-book-list-builder.h',
+ 'dh-book-list-directory.h',
+ 'dh-book-manager.h',
+ 'dh-book-tree.h',
+ 'dh-completion.h',
+ 'dh-init.h',
+ 'dh-keyword-model.h',
+ 'dh-link.h',
+ 'dh-notebook.h',
+ 'dh-profile.h',
+ 'dh-profile-builder.h',
+ 'dh-search-bar.h',
+ 'dh-settings.h',
+ 'dh-settings-builder.h',
+ 'dh-sidebar.h',
+ 'dh-tab.h',
+ 'dh-tab-label.h',
+ 'dh-web-view.h'
]
libdevhelp_public_c_files = [
- 'dh-application-window.c',
- 'dh-assistant-view.c',
- 'dh-book.c',
- 'dh-book-list.c',
- 'dh-book-list-builder.c',
- 'dh-book-list-directory.c',
- 'dh-book-manager.c',
- 'dh-book-tree.c',
- 'dh-completion.c',
- 'dh-init.c',
- 'dh-keyword-model.c',
- 'dh-link.c',
- 'dh-notebook.c',
- 'dh-profile.c',
- 'dh-profile-builder.c',
- 'dh-search-bar.c',
- 'dh-settings.c',
- 'dh-settings-builder.c',
- 'dh-sidebar.c',
- 'dh-tab.c',
- 'dh-tab-label.c',
- 'dh-web-view.c'
+ 'dh-application-window.c',
+ 'dh-assistant-view.c',
+ 'dh-book.c',
+ 'dh-book-list.c',
+ 'dh-book-list-builder.c',
+ 'dh-book-list-directory.c',
+ 'dh-book-manager.c',
+ 'dh-book-tree.c',
+ 'dh-completion.c',
+ 'dh-init.c',
+ 'dh-keyword-model.c',
+ 'dh-link.c',
+ 'dh-notebook.c',
+ 'dh-profile.c',
+ 'dh-profile-builder.c',
+ 'dh-search-bar.c',
+ 'dh-settings.c',
+ 'dh-settings-builder.c',
+ 'dh-sidebar.c',
+ 'dh-tab.c',
+ 'dh-tab-label.c',
+ 'dh-web-view.c'
]
libdevhelp_private_c_files = [
- 'dh-book-list-simple.c',
- 'dh-error.c',
- 'dh-parser.c',
- 'dh-search-context.c',
- 'dh-util-lib.c'
+ 'dh-book-list-simple.c',
+ 'dh-error.c',
+ 'dh-parser.c',
+ 'dh-search-context.c',
+ 'dh-util-lib.c'
]
install_headers_first_subdir = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
install_headers_subdir = join_paths(install_headers_first_subdir, 'devhelp')
install_headers_fulldir = join_paths(
- get_option('prefix'),
- get_option('includedir'),
- install_headers_subdir
+ get_option('prefix'),
+ get_option('includedir'),
+ install_headers_subdir
)
libdevhelp_enums = GNOME.mkenums_simple(
- 'dh-enum-types',
- sources : libdevhelp_public_headers,
- install_header : true,
- install_dir : install_headers_fulldir
+ 'dh-enum-types',
+ sources : libdevhelp_public_headers,
+ install_header : true,
+ install_dir : install_headers_fulldir
)
libdevhelp_enum_header = libdevhelp_enums[1]
libdevhelp_static = static_library(
- 'devhelp-static',
- [libdevhelp_public_c_files,
- libdevhelp_private_c_files,
- libdevhelp_enums],
- include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
- dependencies : LIBDEVHELP_DEPS
+ 'devhelp-static',
+ [libdevhelp_public_c_files,
+ libdevhelp_private_c_files,
+ libdevhelp_enums],
+ include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+ dependencies : LIBDEVHELP_DEPS
)
# For unit tests, to be able to test private functions.
STATIC_LIBDEVHELP_DECLARED_DEP = declare_dependency(
- sources : libdevhelp_enum_header,
- link_with : libdevhelp_static,
- include_directories : [ROOT_INCLUDE_DIR],
- dependencies : LIBDEVHELP_DEPS
+ sources : libdevhelp_enum_header,
+ link_with : libdevhelp_static,
+ include_directories : [ROOT_INCLUDE_DIR],
+ dependencies : LIBDEVHELP_DEPS
)
symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
libdevhelp = shared_library(
- 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
- link_whole : libdevhelp_static,
- link_args : '-Wl,--version-script,' + symbol_map,
- link_depends : symbol_map,
- version : LIBDEVHELP_LT_VERSION,
- install : true
+ 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
+ link_whole : libdevhelp_static,
+ link_args : '-Wl,--version-script,' + symbol_map,
+ link_depends : symbol_map,
+ version : LIBDEVHELP_LT_VERSION,
+ install : true
)
SHARED_LIBDEVHELP_DECLARED_DEP = declare_dependency(
- sources : libdevhelp_enum_header,
- link_with : libdevhelp,
- include_directories : [ROOT_INCLUDE_DIR, include_directories('.')],
- dependencies : LIBDEVHELP_DEPS
+ sources : libdevhelp_enum_header,
+ link_with : libdevhelp,
+ include_directories : [ROOT_INCLUDE_DIR, include_directories('.')],
+ dependencies : LIBDEVHELP_DEPS
)
install_headers(
- libdevhelp_public_headers,
- subdir : install_headers_subdir
+ libdevhelp_public_headers,
+ subdir : install_headers_subdir
)
PKG_CONFIG.generate(
- filebase : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
- name : meson.project_name(),
- description : meson.project_name(),
- version : meson.project_version(),
- libraries : libdevhelp,
- subdirs : install_headers_first_subdir,
- requires : LIBDEVHELP_DEPS_STR
+ filebase : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+ name : meson.project_name(),
+ description : meson.project_name(),
+ version : meson.project_version(),
+ libraries : libdevhelp,
+ subdirs : install_headers_first_subdir,
+ requires : LIBDEVHELP_DEPS_STR
)
GNOME.generate_gir(
- libdevhelp,
- export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
- sources : [
- libdevhelp_public_headers,
- libdevhelp_public_c_files,
- libdevhelp_enums
- ],
- namespace : 'Devhelp',
- nsversion : LIBDEVHELP_API_VERSION_FULL,
- identifier_prefix : 'Dh',
- includes : ['Gtk-3.0', 'WebKit2-4.0'],
- header : 'devhelp/devhelp.h',
- include_directories : ROOT_INCLUDE_DIR,
- install : true
+ libdevhelp,
+ export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+ sources : [
+ libdevhelp_public_headers,
+ libdevhelp_public_c_files,
+ libdevhelp_enums
+ ],
+ namespace : 'Devhelp',
+ nsversion : LIBDEVHELP_API_VERSION_FULL,
+ identifier_prefix : 'Dh',
+ includes : ['Gtk-3.0', 'WebKit2-4.0'],
+ header : 'devhelp/devhelp.h',
+ include_directories : ROOT_INCLUDE_DIR,
+ install : true
)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 2a60cb20..6034dcb7 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,9 +1,9 @@
subdir('xml')
configure_file(
- input : 'devhelp-sections.txt',
- output : 'devhelp-@0 -sections txt'.format(LIBDEVHELP_API_VERSION),
- copy : true
+ input : 'devhelp-sections.txt',
+ output : 'devhelp-@0 -sections txt'.format(LIBDEVHELP_API_VERSION),
+ copy : true
)
gtkdoc_module_name = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
@@ -13,26 +13,26 @@ webkitgtk_dep = dependency(WEBKITGTK_DEP_STR)
webkitgtk_prefix = webkitgtk_dep.get_pkgconfig_variable('prefix')
GNOME.gtkdoc(
- gtkdoc_module_name,
- main_xml : 'devhelp-docs.xml',
- src_dir : include_directories('../../devhelp/'),
- dependencies : SHARED_LIBDEVHELP_DECLARED_DEP,
- scan_args : ['--rebuild-types'],
- gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
- fixxref_args : [
- '--html-dir=@0@'.format(html_dir),
- '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
- ],
- content_files : [
- 'api-breaks.xml'
- ],
- ignore_headers : [
- 'dh-book-list-simple.h',
- 'dh-dconf-migration.h',
- 'dh-error.h',
- 'dh-parser.h',
- 'dh-search-context.h',
- 'dh-util-lib.h'
- ],
- install : true
+ gtkdoc_module_name,
+ main_xml : 'devhelp-docs.xml',
+ src_dir : include_directories('../../devhelp/'),
+ dependencies : SHARED_LIBDEVHELP_DECLARED_DEP,
+ scan_args : ['--rebuild-types'],
+ gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
+ fixxref_args : [
+ '--html-dir=@0@'.format(html_dir),
+ '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
+ ],
+ content_files : [
+ 'api-breaks.xml'
+ ],
+ ignore_headers : [
+ 'dh-book-list-simple.h',
+ 'dh-dconf-migration.h',
+ 'dh-error.h',
+ 'dh-parser.h',
+ 'dh-search-context.h',
+ 'dh-util-lib.h'
+ ],
+ install : true
)
diff --git a/docs/reference/xml/meson.build b/docs/reference/xml/meson.build
index 008ce7a6..5424cf67 100644
--- a/docs/reference/xml/meson.build
+++ b/docs/reference/xml/meson.build
@@ -6,7 +6,7 @@ gtkdocentities_conf_data.set('PACKAGE_API_VERSION', LIBDEVHELP_API_VERSION)
gtkdocentities_filename = 'gtkdocentities.ent'
configure_file(
- input : gtkdocentities_filename + '.in',
- output : gtkdocentities_filename,
- configuration : gtkdocentities_conf_data
+ input : gtkdocentities_filename + '.in',
+ output : gtkdocentities_filename,
+ configuration : gtkdocentities_conf_data
)
diff --git a/help/meson.build b/help/meson.build
index 99391d3a..3eb9049b 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,9 +1,9 @@
pages = [
- 'index.page',
- 'search.page'
+ 'index.page',
+ 'search.page'
]
GNOME.yelp(
- 'devhelp',
- sources : pages
+ 'devhelp',
+ sources : pages
)
diff --git a/meson.build b/meson.build
index ebfad625..8f0dd788 100644
--- a/meson.build
+++ b/meson.build
@@ -4,9 +4,9 @@
# See: https://github.com/mesonbuild/meson/issues/2607
project(
- 'devhelp', 'c',
- meson_version : '>= 0.47',
- version : '3.34.0'
+ 'devhelp', 'c',
+ meson_version : '>= 0.47',
+ version : '3.34.0'
)
GNOME = import('gnome')
@@ -33,32 +33,32 @@ LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
WEBKITGTK_DEP_STR = 'webkit2gtk-4.0'
libdevhelp_deps_array = [
- ['gio-2.0', '>= 2.56'],
- ['gtk+-3.0', '>= 3.22'],
- [WEBKITGTK_DEP_STR, '>= 2.20']
+ ['gio-2.0', '>= 2.56'],
+ ['gtk+-3.0', '>= 3.22'],
+ [WEBKITGTK_DEP_STR, '>= 2.20']
]
LIBDEVHELP_DEPS_STR = []
LIBDEVHELP_DEPS = [meson.get_compiler('c').find_library('m')]
foreach dep : libdevhelp_deps_array
- dep_name = dep[0]
- dep_version = dep[1]
- LIBDEVHELP_DEPS_STR += '@0@ @1@'.format(dep_name, dep_version)
- LIBDEVHELP_DEPS += dependency(dep_name, version : dep_version)
+ dep_name = dep[0]
+ dep_version = dep[1]
+ LIBDEVHELP_DEPS_STR += '@0@ @1@'.format(dep_name, dep_version)
+ LIBDEVHELP_DEPS += dependency(dep_name, version : dep_version)
endforeach
DEVHELP_APP_DEPS = [
- LIBDEVHELP_DEPS,
- dependency('amtk-5', version : '>= 5.0'),
- # TODO: move gsettings-desktop-schemas dep for the libdevhelp, in the
- # *.pc file it must be a private dep. With meson 0.47 there is no clean
- # and generic way to do it :-( Clean: no information duplication (to
- # create both the list of dependency objects plus creating the *.pc
- # file). Generic: declare the dependencies public/private, with/without
- # version requirements. Without the need to copy/paste a chunk of build
- # code from one project to another (i.e. have something short and
- # simple, like with the AX_PKG_CHECK_MODULES Autotools macro).
- dependency('gsettings-desktop-schemas'),
+ LIBDEVHELP_DEPS,
+ dependency('amtk-5', version : '>= 5.0'),
+ # TODO: move gsettings-desktop-schemas dep for the libdevhelp, in the
+ # *.pc file it must be a private dep. With meson 0.47 there is no clean
+ # and generic way to do it :-( Clean: no information duplication (to
+ # create both the list of dependency objects plus creating the *.pc
+ # file). Generic: declare the dependencies public/private, with/without
+ # version requirements. Without the need to copy/paste a chunk of build
+ # code from one project to another (i.e. have something short and
+ # simple, like with the AX_PKG_CHECK_MODULES Autotools macro).
+ dependency('gsettings-desktop-schemas'),
]
# config.h
@@ -66,25 +66,25 @@ DEVHELP_APP_DEPS = [
config_data = configuration_data()
GETTEXT_PACKAGE_NAME = meson.project_name()
config_data.set_quoted(
- 'GETTEXT_PACKAGE',
- GETTEXT_PACKAGE_NAME,
- description : 'Define to the gettext package name.'
+ 'GETTEXT_PACKAGE',
+ GETTEXT_PACKAGE_NAME,
+ description : 'Define to the gettext package name.'
)
config_data.set_quoted(
- 'DATADIR',
- join_paths(get_option('prefix'), get_option('datadir'))
+ 'DATADIR',
+ join_paths(get_option('prefix'), get_option('datadir'))
)
config_data.set_quoted(
- 'LOCALEDIR',
- join_paths(get_option('prefix'), get_option('localedir'))
+ 'LOCALEDIR',
+ join_paths(get_option('prefix'), get_option('localedir'))
)
config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
config_data.set_quoted('LIBDEVHELP_API_VERSION', LIBDEVHELP_API_VERSION)
config_data.set('FLATPAK_BUILD', get_option('flatpak_build'))
configure_file(
- output : 'config.h',
- configuration : config_data
+ output : 'config.h',
+ configuration : config_data
)
CONFIG_H_INCLUDE_DIR = include_directories('.')
@@ -95,8 +95,8 @@ CONFIG_H_INCLUDE_DIR = include_directories('.')
ROOT_INCLUDE_DIR = include_directories('.')
add_global_arguments(
- '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
- language : 'c'
+ '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
+ language : 'c'
)
#####
@@ -105,48 +105,48 @@ add_global_arguments(
# The same as the AX_COMPILER_FLAGS Autotools macro.
warning_cflags = [
- '-fno-strict-aliasing',
- '-Wall',
- '-Wextra',
- '-Wundef',
- '-Wnested-externs',
- '-Wwrite-strings',
- '-Wpointer-arith',
- '-Wmissing-declarations',
- '-Wmissing-prototypes',
- '-Wstrict-prototypes',
- '-Wredundant-decls',
- '-Wno-unused-parameter',
- '-Wno-missing-field-initializers',
- '-Wdeclaration-after-statement',
- '-Wformat=2',
- '-Wold-style-definition',
- '-Wcast-align',
- '-Wformat-nonliteral',
- '-Wformat-security',
- '-Wsign-compare',
- '-Wstrict-aliasing',
- '-Wshadow',
- '-Winline',
- '-Wpacked',
- '-Wmissing-format-attribute',
- '-Wmissing-noreturn',
- '-Winit-self',
- '-Wredundant-decls',
- '-Wmissing-include-dirs',
- '-Wunused-but-set-variable',
- '-Warray-bounds',
- '-Wimplicit-function-declaration',
- '-Wreturn-type',
- '-Wswitch-enum',
- '-Wswitch-default',
- '-Wduplicated-cond',
- '-Wduplicated-branches',
- '-Wlogical-op',
- '-Wrestrict',
- '-Wnull-dereference',
- '-Wjump-misses-init',
- '-Wdouble-promotion'
+ '-fno-strict-aliasing',
+ '-Wall',
+ '-Wextra',
+ '-Wundef',
+ '-Wnested-externs',
+ '-Wwrite-strings',
+ '-Wpointer-arith',
+ '-Wmissing-declarations',
+ '-Wmissing-prototypes',
+ '-Wstrict-prototypes',
+ '-Wredundant-decls',
+ '-Wno-unused-parameter',
+ '-Wno-missing-field-initializers',
+ '-Wdeclaration-after-statement',
+ '-Wformat=2',
+ '-Wold-style-definition',
+ '-Wcast-align',
+ '-Wformat-nonliteral',
+ '-Wformat-security',
+ '-Wsign-compare',
+ '-Wstrict-aliasing',
+ '-Wshadow',
+ '-Winline',
+ '-Wpacked',
+ '-Wmissing-format-attribute',
+ '-Wmissing-noreturn',
+ '-Winit-self',
+ '-Wredundant-decls',
+ '-Wmissing-include-dirs',
+ '-Wunused-but-set-variable',
+ '-Warray-bounds',
+ '-Wimplicit-function-declaration',
+ '-Wreturn-type',
+ '-Wswitch-enum',
+ '-Wswitch-default',
+ '-Wduplicated-cond',
+ '-Wduplicated-branches',
+ '-Wlogical-op',
+ '-Wrestrict',
+ '-Wnull-dereference',
+ '-Wjump-misses-init',
+ '-Wdouble-promotion'
]
c_compiler = meson.get_compiler('c')
@@ -163,12 +163,12 @@ subdir('src')
subdir('unit-tests')
if get_option('gtk_doc')
- subdir('docs/reference')
+ subdir('docs/reference')
endif
meson.add_install_script(
- 'meson_post_install.py',
- join_paths(get_option('prefix'), get_option('datadir'))
+ 'meson_post_install.py',
+ join_paths(get_option('prefix'), get_option('datadir'))
)
# Print a summary of the configuration
diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
index e5b35823..f40e1cd2 100644
--- a/plugins/gedit-plugin/meson.build
+++ b/plugins/gedit-plugin/meson.build
@@ -1,17 +1,17 @@
gedit_plugin_dir = join_paths(get_option('prefix'), get_option('libdir'), 'gedit/plugins')
install_data(
- 'devhelp.py',
- install_dir : gedit_plugin_dir
+ 'devhelp.py',
+ install_dir : gedit_plugin_dir
)
plugin_info_file = 'devhelp.plugin'
I18N.merge_file(
- plugin_info_file,
- type : 'desktop',
- input : plugin_info_file + '.desktop.in',
- output : plugin_info_file,
- po_dir : '../../po/',
- install : true,
- install_dir : gedit_plugin_dir
+ plugin_info_file,
+ type : 'desktop',
+ input : plugin_info_file + '.desktop.in',
+ output : plugin_info_file,
+ po_dir : '../../po/',
+ install : true,
+ install_dir : gedit_plugin_dir
)
diff --git a/po/meson.build b/po/meson.build
index de52c7d5..4ce0340c 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,4 +1,4 @@
I18N.gettext(
- GETTEXT_PACKAGE_NAME,
- preset : 'glib'
+ GETTEXT_PACKAGE_NAME,
+ preset : 'glib'
)
diff --git a/src/meson.build b/src/meson.build
index 220ee35c..d8b58179 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,22 +1,22 @@
devhelp_app_sources = [
- 'dh-app.c',
- 'dh-assistant.c',
- 'dh-main.c',
- 'dh-preferences.c',
- 'dh-settings-app.c',
- 'dh-util-app.c',
- 'dh-window.c'
+ 'dh-app.c',
+ 'dh-assistant.c',
+ 'dh-main.c',
+ 'dh-preferences.c',
+ 'dh-settings-app.c',
+ 'dh-util-app.c',
+ 'dh-window.c'
]
devhelp_app_sources += GNOME.compile_resources(
- 'dh-resources',
- 'dh.gresource.xml'
+ 'dh-resources',
+ 'dh.gresource.xml'
)
executable(
- 'devhelp',
- devhelp_app_sources,
- include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
- dependencies : [DEVHELP_APP_DEPS, SHARED_LIBDEVHELP_DECLARED_DEP],
- install : true
+ 'devhelp',
+ devhelp_app_sources,
+ include_directories : [CONFIG_H_INCLUDE_DIR, ROOT_INCLUDE_DIR],
+ dependencies : [DEVHELP_APP_DEPS, SHARED_LIBDEVHELP_DECLARED_DEP],
+ install : true
)
diff --git a/unit-tests/meson.build b/unit-tests/meson.build
index 85f5f677..13195181 100644
--- a/unit-tests/meson.build
+++ b/unit-tests/meson.build
@@ -1,17 +1,17 @@
unit_tests = [
- 'test-completion',
- 'test-link',
- 'test-search-context',
- 'test-util'
+ 'test-completion',
+ 'test-link',
+ 'test-search-context',
+ 'test-util'
]
foreach unit_test : unit_tests
- exe = executable(
- unit_test,
- unit_test + '.c',
- include_directories : ROOT_INCLUDE_DIR,
- dependencies : [LIBDEVHELP_DEPS, STATIC_LIBDEVHELP_DECLARED_DEP]
- )
+ exe = executable(
+ unit_test,
+ unit_test + '.c',
+ include_directories : ROOT_INCLUDE_DIR,
+ dependencies : [LIBDEVHELP_DEPS, STATIC_LIBDEVHELP_DECLARED_DEP]
+ )
- test(unit_test, exe)
+ test(unit_test, exe)
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
