diff options
author | David Robillard <d@drobilla.net> | 2023-05-02 11:58:52 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2023-05-02 11:58:52 -0400 |
commit | 8987e2ab771b8494269387e57e670866307fe1bc (patch) | |
tree | 2871fd0d665db90ed5ae6969564315043f7b15a9 | |
parent | c4b3918391392a33ef7e4202351437ac2892e633 (diff) | |
download | patchage-8987e2ab771b8494269387e57e670866307fe1bc.tar.gz patchage-8987e2ab771b8494269387e57e670866307fe1bc.tar.bz2 patchage-8987e2ab771b8494269387e57e670866307fe1bc.zip |
Replace strict option with new meson warning level
-rw-r--r-- | meson.build | 17 | ||||
-rw-r--r-- | meson/suppressions/meson.build | 6 | ||||
-rw-r--r-- | meson/warnings/meson.build | 188 | ||||
-rw-r--r-- | meson_options.txt | 7 |
4 files changed, 17 insertions, 201 deletions
diff --git a/meson.build b/meson.build index 6ecfad9..81b5a54 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later project('patchage', ['c', 'cpp'], @@ -22,11 +22,6 @@ version_suffix = '@0@-@1@'.format(meson.project_name(), major_version) # Required tools cpp = meson.get_compiler('cpp') -# Set global warning flags -if get_option('strict') and not meson.is_subproject() - subdir('meson/warnings') -endif - # Set global warning suppressions subdir('meson/suppressions') add_project_arguments(cpp_suppressions, language: ['cpp']) @@ -49,7 +44,11 @@ if host_machine.system() in ['gnu', 'linux'] platform_defines += ['-D_GNU_SOURCE'] endif -if get_option('checks') +if get_option('checks').disabled() + # Generic build without platform-specific features + platform_defines += ['-DPATCHAGE_NO_DEFAULT_CONFIG'] +elif get_option('checks').enabled() + # Only use the features detected by the build system platform_defines += ['-DPATCHAGE_NO_DEFAULT_CONFIG'] dladdr_code = '''#include <dlfcn.h> @@ -252,8 +251,8 @@ install_man(files('doc/patchage.1')) # Tests # ######### -if not get_option('tests').disabled() and not meson.is_subproject() - if get_option('strict') +if get_option('lint') + if not meson.is_subproject() # Check release metadata autoship = find_program('autoship', required: false) if autoship.found() diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index c2e4a8d..9cd1641 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,4 +1,4 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later # Project-specific warning suppressions. @@ -14,11 +14,13 @@ if is_variable('cpp') cpp_suppressions = [] - if get_option('strict') + if get_option('warning_level') == 'everything' if cpp.get_id() == 'clang' cpp_suppressions += [ '-Wno-alloca', '-Wno-c++20-compat', + '-Wno-c++98-compat', + '-Wno-c++98-compat-pedantic', '-Wno-cast-qual', '-Wno-double-promotion', '-Wno-float-conversion', diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build deleted file mode 100644 index a28d2a2..0000000 --- a/meson/warnings/meson.build +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: 0BSD OR GPL-3.0-or-later - -# General code to enable approximately all warnings in GCC 12, clang, and MSVC. -# -# This is trivial for clang and MSVC, but GCC doesn't have an "everything" -# option, so we need to enable everything we want explicitly. Wall is assumed, -# but Wextra is not, for stability. -# -# These are collected from common.opt and c.opt in the GCC source, and manually -# curated with the help of the GCC documentation. Warnings that are -# application-specific, historical, or about compatibility between specific -# language revisions are omitted. The intent here is to have roughly the same -# meaning as clang's Weverything: extremely strict, but general. Specifically -# omitted are: -# -# General: -# -# Wabi= -# Waggregate-return -# Walloc-size-larger-than=BYTES -# Walloca-larger-than=BYTES -# Wframe-larger-than=BYTES -# Wlarger-than=BYTES -# Wstack-usage=BYTES -# Wsystem-headers -# Wtraditional -# Wtraditional-conversion -# Wtrampolines -# Wvla-larger-than=BYTES -# -# Build specific: -# -# Wpoison-system-directories -# -# C++ Specific: -# -# Wc++0x-compat -# Wc++1z-compat -# Wc++2a-compat -# Wctad-maybe-unsupported -# Wnamespaces -# Wtemplates - -gcc_common_warnings = [ - '-Walloc-zero', - '-Walloca', - '-Wanalyzer-too-complex', - '-Warith-conversion', - '-Warray-bounds=2', - '-Wattribute-alias=2', - '-Wbidi-chars=ucn', - '-Wcast-align=strict', - '-Wcast-function-type', - '-Wcast-qual', - '-Wclobbered', - '-Wconversion', - '-Wdate-time', - '-Wdisabled-optimization', - '-Wdouble-promotion', - '-Wduplicated-branches', - '-Wduplicated-cond', - '-Wempty-body', - '-Wendif-labels', - '-Wfloat-equal', - '-Wformat-overflow=2', - '-Wformat-signedness', - '-Wformat-truncation=2', - '-Wformat=2', - '-Wignored-qualifiers', - '-Wimplicit-fallthrough=3', - '-Winit-self', - '-Winline', - '-Winvalid-pch', - '-Wlogical-op', - '-Wmissing-declarations', - '-Wmissing-field-initializers', - '-Wmissing-include-dirs', - '-Wmultichar', - '-Wnormalized=nfc', - '-Wnull-dereference', - '-Wopenacc-parallelism', - '-Woverlength-strings', - '-Wpacked', - '-Wpacked-bitfield-compat', - '-Wpadded', - '-Wpointer-arith', - '-Wredundant-decls', - '-Wshadow', - '-Wshift-negative-value', - '-Wshift-overflow=2', - '-Wstack-protector', - '-Wstrict-aliasing=3', - '-Wstrict-overflow=5', - '-Wstring-compare', - '-Wstringop-overflow=3', - '-Wsuggest-attribute=cold', - '-Wsuggest-attribute=const', - '-Wsuggest-attribute=format', - '-Wsuggest-attribute=malloc', - '-Wsuggest-attribute=noreturn', - '-Wsuggest-attribute=pure', - '-Wswitch-default', - '-Wswitch-enum', - '-Wtrampolines', - '-Wtrivial-auto-var-init', - '-Wtype-limits', - '-Wundef', - '-Wuninitialized', - '-Wunsafe-loop-optimizations', - '-Wunused', - '-Wunused-const-variable=2', - '-Wunused-macros', - '-Wvector-operation-performance', - '-Wvla', - '-Wwrite-strings', -] - -####### -# C++ # -####### - -if is_variable('cpp') - all_cpp_warnings = [] - - if cpp.get_id() == 'clang' - all_cpp_warnings += [ - '-Weverything', - '-Wno-c++98-compat', - '-Wno-c++98-compat-pedantic' - ] - - if not meson.is_cross_build() - all_cpp_warnings += [ - '-Wno-poison-system-directories', - ] - endif - - elif cpp.get_id() == 'gcc' - all_cpp_warnings += gcc_common_warnings + [ - '-Wabi-tag', - '-Waligned-new=all', - '-Wcatch-value=3', - '-Wcomma-subscript', - '-Wconditionally-supported', - '-Wctor-dtor-privacy', - '-Wdelete-non-virtual-dtor', - '-Wdeprecated', - '-Wdeprecated-copy', - '-Wdeprecated-copy-dtor', - '-Wdeprecated-enum-enum-conversion', - '-Wdeprecated-enum-float-conversion', - '-Weffc++', - '-Wexpansion-to-defined', - '-Wextra-semi', - '-Wimport', - '-Winvalid-imported-macros', - '-Wmismatched-tags', - '-Wmultiple-inheritance', - '-Wnoexcept', - '-Wnoexcept-type', - '-Wnon-virtual-dtor', - '-Wold-style-cast', - '-Woverloaded-virtual', - '-Wplacement-new=2', - '-Wredundant-move', - '-Wredundant-tags', - '-Wregister', - '-Wsign-compare', - '-Wsign-promo', - '-Wsized-deallocation', - '-Wstrict-null-sentinel', - '-Wsuggest-final-methods', - '-Wsuggest-final-types', - '-Wsuggest-override', - '-Wuseless-cast', - '-Wvirtual-inheritance', - '-Wvolatile', - '-Wzero-as-null-pointer-constant', - ] - - elif cpp.get_id() == 'msvc' - all_cpp_warnings += ['/Wall'] - endif - - all_cpp_warnings = cpp.get_supported_arguments(all_cpp_warnings) - add_global_arguments(all_cpp_warnings, language: ['cpp']) -endif diff --git a/meson_options.txt b/meson_options.txt index 2dbb431..edc88cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,8 +4,8 @@ option('alsa', type: 'feature', value: 'auto', yield: true, description: 'Build ALSA sequencer support') -option('checks', type: 'boolean', value: true, yield: true, - description: 'Check for features with the build system') +option('checks', type: 'feature', value: 'enabled', yield: true, + description: 'Check for platform-specific features') option('jack', type: 'feature', value: 'auto', yield: true, description: 'Build JACK audio and MIDI support') @@ -13,6 +13,9 @@ option('jack', type: 'feature', value: 'auto', yield: true, option('jack_dbus', type: 'feature', value: 'auto', yield: true, description: 'Use JACK via D-Bus') +option('lint', type: 'boolean', value: false, yield: true, + description: 'Run code quality checks') + option('strict', type: 'boolean', value: false, yield: true, description: 'Enable ultra-strict warnings') |