diff options
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | .reuse/dep5 | 2 | ||||
| -rw-r--r-- | meson.build | 18 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 16 | ||||
| -rw-r--r-- | meson/warnings/meson.build | 174 | ||||
| -rw-r--r-- | meson_options.txt | 9 | ||||
| -rw-r--r-- | scripts/meson.build | 3 |
7 files changed, 40 insertions, 204 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f586654..ed6ba59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ default: dev: image: lv2plugin/debian-x64 script: - - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Db_coverage=true -Ddocs=enabled + - meson setup build -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true -Db_coverage=true -Ddocs=enabled -Dlint=true - ninja -C build test - ninja -C build coverage-html - meson configure -Dbuildtype=release -Db_coverage=false build @@ -24,13 +24,13 @@ dev: static: image: lv2plugin/debian-x64 script: - - meson setup build -Ddefault_library=static -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build -Ddefault_library=static -Dwarning_level=3 -Dwerror=true -Ddocs=disabled - ninja -C build test sanitize: image: lv2plugin/debian-x64-clang script: - - meson setup build -Db_lundef=false -Dbuildtype=plain -Dstrict=true -Dwerror=true -Dc_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=implicit-conversion -fsanitize=local-bounds -fsanitize=nullability" -Dc_link_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=implicit-conversion -fsanitize=local-bounds -fsanitize=nullability" -Dcpp_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero" -Dcpp_link_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero" -Ddocs=disabled + - meson setup build -Db_lundef=false -Dbuildtype=plain -Dwarning_level=3 -Dwerror=true -Dc_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=implicit-conversion -fsanitize=local-bounds -fsanitize=nullability" -Dc_link_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=implicit-conversion -fsanitize=local-bounds -fsanitize=nullability" -Dcpp_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero" -Dcpp_link_args="-fno-sanitize-recover=all -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero" -Ddocs=disabled - ninja -C build test - meson configure build -Dbuildtype=debugoptimized -Dc_args="" -Dc_link_args="" -Dcpp_args="" -Dcpp_link_args="" - meson configure build -Db_sanitize=thread @@ -45,7 +45,7 @@ sanitize: fedora: image: lv2plugin/fedora-big script: - - meson setup build -Dbuildtype=plain -Dstrict=true -Dwerror=true + - meson setup build -Dbuildtype=plain -Dwarning_level=3 -Dwerror=true - ninja -C build test variables: CFLAGS: -O2 -D_FORTIFY_SOURCE=2 @@ -55,7 +55,7 @@ fedora: arm32: image: lv2plugin/debian-arm32 script: - - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -63,7 +63,7 @@ arm32: arm64: image: lv2plugin/debian-arm64 script: - - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -71,7 +71,7 @@ arm64: mingw32: image: lv2plugin/debian-mingw32 script: - - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=debug -Dwarning_level=everything -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -81,7 +81,7 @@ mingw32: mingw64: image: lv2plugin/debian-mingw64 script: - - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=debug -Dwarning_level=everything -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -101,7 +101,7 @@ wasm: freebsd: tags: [freebsd,meson] script: - - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -109,7 +109,7 @@ freebsd: mac: tags: [macos] script: - - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true + - meson setup build -Dbuildtype=debug -Dwarning_level=3 -Dwerror=true - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test @@ -117,7 +117,7 @@ mac: win: tags: [windows,meson] script: - - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled + - meson setup build -Dbuildtype=debug -Dwarning_level=everything -Dwerror=true -Ddocs=disabled - ninja -C build test - meson configure -Dbuildtype=release build - ninja -C build test diff --git a/.reuse/dep5 b/.reuse/dep5 index 8366f20..ab2d669 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,6 +3,6 @@ Upstream-Name: zix Upstream-Contact: David Robillard <d@drobilla.net> Source: https://gitlab.com/drobilla/zix -Files: *.md NEWS meson_options.txt +Files: *.md NEWS Copyright: 2021 David Robillard <d@drobilla.net> License: 0BSD OR ISC diff --git a/meson.build b/meson.build index 545d759..5c51945 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 ISC project('zix', ['c'], @@ -26,14 +26,10 @@ pkg = import('pkgconfig') cc = meson.get_compiler('c') # Set global warning flags -if get_option('strict') and not meson.is_subproject() - subdir('meson/warnings') - add_project_arguments(all_c_warnings, language: ['c']) -endif subdir('meson/suppressions') +# Restrict Windows API usage to Vista and earlier if host_machine.system() == 'windows' - # Restrict Windows API usage to Vista and earlier if cc.get_id() == 'msvc' add_project_arguments('/D_WIN32_WINNT=0x0600', language: ['c', 'cpp']) else @@ -347,7 +343,7 @@ threaded_tests = [ ] if not get_option('tests').disabled() - if not meson.is_subproject() and get_option('strict') + if not meson.is_subproject() and get_option('lint') # Check release metadata autoship = find_program('autoship', required: get_option('tests')) if autoship.found() @@ -463,6 +459,10 @@ if not get_option('tests').disabled() elif cc.get_id() == 'msvc' header_suppressions += [ + '/experimental:external', + '/external:W0', + '/external:anglebrackets', + '/wd4820', # padding added after construct ] endif @@ -520,6 +520,10 @@ if not get_option('tests').disabled() elif cpp.get_id() == 'msvc' cpp_test_args = [ '/Wall', + '/experimental:external', + '/external:W0', + '/external:anglebrackets', + '/wd4514', # unreferenced inline function has been removed '/wd4710', # function not inlined '/wd4711', # function selected for automatic inline expansion diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index d4abd30..24fa320 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -1,11 +1,9 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> +# Copyright 2020-2023 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -# Project-specific warning suppressions. -# -# This should be used in conjunction with the generic "warnings" sibling that -# enables all reasonable warnings for the compiler. It lives here just to keep -# the top-level meson.build more readable. +# Project-specific warning suppressions + +warning_level = get_option('warning_level') ##### # C # @@ -14,7 +12,7 @@ if is_variable('cc') c_suppressions = [] - if get_option('strict') + if warning_level == 'everything' if cc.get_id() in ['clang', 'emscripten'] c_suppressions += [ '-Wno-bad-function-cast', @@ -81,6 +79,10 @@ if is_variable('cc') ] elif cc.get_id() == 'msvc' c_suppressions += [ + '/experimental:external', + '/external:W0', + '/external:anglebrackets', + '/wd4706', # assignment within conditional expression ] endif diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build deleted file mode 100644 index 616036c..0000000 --- a/meson/warnings/meson.build +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 2020-2022 David Robillard <d@drobilla.net> -# SPDX-License-Identifier: 0BSD OR ISC - -# 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: -# -# Wc11-c2x-compat -# Wc90-c99-compat -# Wc99-c11-compat -# Wdeclaration-after-statement -# Wtraditional -# Wtraditional-conversion -# -# C++ Specific: -# -# Wc++0x-compat -# Wc++1z-compat -# Wc++2a-compat -# Wctad-maybe-unsupported -# Wnamespaces -# Wtemplates - -# GCC warnings that apply to all C-family languages -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('cc') - # Set all_c_warnings for the current C compiler - all_c_warnings = [] - - if cc.get_id() == 'clang' - all_c_warnings += ['-Weverything'] - - if not meson.is_cross_build() - all_c_warnings += [ - '-Wno-poison-system-directories', - ] - endif - - elif cc.get_id() == 'gcc' - all_c_warnings += gcc_common_warnings + [ - '-Wabsolute-value', - '-Wbad-function-cast', - '-Wc++-compat', - '-Wenum-conversion', - '-Wjump-misses-init', - '-Wmissing-parameter-type', - '-Wmissing-prototypes', - '-Wnested-externs', - '-Wold-style-declaration', - '-Wold-style-definition', - '-Woverride-init', - '-Wsign-compare', - '-Wstrict-prototypes', - '-Wunsuffixed-float-constants', - ] - - elif cc.get_id() == 'msvc' - all_c_warnings += [ - '/Wall', - '/experimental:external', - '/external:W0', - '/external:anglebrackets', - ] - endif - - all_c_warnings = cc.get_supported_arguments(all_c_warnings) -endif diff --git a/meson_options.txt b/meson_options.txt index 0912856..1545314 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,6 @@ +# Copyright 2020-2023 David Robillard <d@drobilla.net> +# SPDX-License-Identifier: 0BSD OR ISC + option('benchmarks', type: 'feature', value: 'auto', yield: true, description: 'Build benchmarks') @@ -7,12 +10,12 @@ option('checks', type: 'feature', value: 'enabled', yield: true, option('docs', type: 'feature', value: 'auto', yield: true, description: 'Build documentation') +option('lint', type: 'boolean', value: false, yield: true, + description: 'Run code quality checks') + option('posix', type: 'feature', value: 'auto', yield: true, description: 'Use POSIX system facilities') -option('strict', type: 'boolean', value: false, yield: true, - description: 'Enable ultra-strict warnings') - option('threads', type: 'feature', value: 'auto', yield: true, description: 'Enable thread support') diff --git a/scripts/meson.build b/scripts/meson.build index 604db89..387fc1c 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -1,9 +1,10 @@ # Copyright 2020-2022 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -if get_option('strict') and not meson.is_subproject() +if not meson.is_subproject() and get_option('lint') simple_scripts = files('benchmark.py') plot_scripts = files('plot.py') + all_scripts = simple_scripts + plot_scripts # Check formatting with black black = find_program('black', required: get_option('tests')) |