project(
'libxkbcommon',
'c',
- version: '0.8.2',
+ version: '0.10.0',
default_options: [
'c_std=c99',
'warning_level=2',
'b_lundef=true',
],
- meson_version : '>= 0.41.0',
+ meson_version : '>= 0.49.0',
)
pkgconfig = import('pkgconfig')
cc = meson.get_compiler('c')
+dir_libexec = join_paths(get_option('prefix'), get_option('libexecdir'), 'xkbcommon')
+dir_man = join_paths(get_option('prefix'), get_option('mandir'))
# Compiler flags.
foreach cflag: [
'-fvisibility=hidden',
+ '-fno-strict-aliasing',
+ '-fsanitize-undefined-trap-on-error',
'-Wextra',
'-Wno-unused-parameter',
'-Wno-missing-field-initializers',
# config.h.
configh_data = configuration_data()
-configh_data.set('_GNU_SOURCE', 1)
+configh_data.set('EXIT_INVALID_USAGE', '2')
+configh_data.set_quoted('LIBXKBCOMMON_VERSION', meson.project_version())
+configh_data.set_quoted('LIBXKBCOMMON_TOOL_PATH', dir_libexec)
+# Like AC_USE_SYSTEM_EXTENSIONS, what #define to use to get extensions
+# beyond the base POSIX function set.
+if host_machine.system() == 'sunos'
+ system_extensions = '__EXTENSIONS__'
+else
+ system_extensions = '_GNU_SOURCE'
+endif
+configh_data.set(system_extensions, 1)
+system_ext_define = '#define ' + system_extensions
configh_data.set_quoted('DFLT_XKB_CONFIG_ROOT', XKBCONFIGROOT)
configh_data.set_quoted('XLOCALEDIR', XLOCALEDIR)
configh_data.set_quoted('DEFAULT_XKB_RULES', get_option('default-rules'))
configh_data.set_quoted('DEFAULT_XKB_LAYOUT', get_option('default-layout'))
if get_option('default-variant') != ''
configh_data.set_quoted('DEFAULT_XKB_VARIANT', get_option('default-variant'))
+else
+ configh_data.set('DEFAULT_XKB_VARIANT', 'NULL')
endif
if get_option('default-options') != ''
configh_data.set_quoted('DEFAULT_XKB_OPTIONS', get_option('default-options'))
+else
+ configh_data.set('DEFAULT_XKB_OPTIONS', 'NULL')
endif
if cc.links('int main(){if(__builtin_expect(1<0,0)){}}', name: '__builtin_expect')
configh_data.set('HAVE___BUILTIN_EXPECT', 1)
endif
-if cc.links('int main(){__builtin_popcount(1);}', name: '__builtin_popcount')
- configh_data.set('HAVE___BUILTIN_POPCOUNT', 1)
-endif
-if cc.has_header_symbol('unistd.h', 'eaccess', prefix: '#define _GNU_SOURCE')
+if cc.has_header_symbol('unistd.h', 'eaccess', prefix: system_ext_define)
configh_data.set('HAVE_EACCESS', 1)
endif
-if cc.has_header_symbol('unistd.h', 'euidaccess', prefix: '#define _GNU_SOURCE')
+if cc.has_header_symbol('unistd.h', 'euidaccess', prefix: system_ext_define)
configh_data.set('HAVE_EUIDACCESS', 1)
endif
if cc.has_header_symbol('sys/mman.h', 'mmap')
configh_data.set('HAVE_MMAP', 1)
endif
-if cc.has_header_symbol('stdlib.h', 'mkostemp', prefix: '#define _GNU_SOURCE')
+if cc.has_header_symbol('stdlib.h', 'mkostemp', prefix: system_ext_define)
configh_data.set('HAVE_MKOSTEMP', 1)
endif
-if cc.has_header_symbol('fcntl.h', 'posix_fallocate', prefix: '#define _GNU_SOURCE')
+if cc.has_header_symbol('fcntl.h', 'posix_fallocate', prefix: system_ext_define)
configh_data.set('HAVE_POSIX_FALLOCATE', 1)
endif
-if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix: '#define _GNU_SOURCE')
+if cc.has_header_symbol('string.h', 'strndup', prefix: system_ext_define)
+ configh_data.set('HAVE_STRNDUP', 1)
+endif
+if cc.has_header_symbol('stdio.h', 'asprintf', prefix: system_ext_define)
+ configh_data.set('HAVE_ASPRINTF', 1)
+elif cc.has_header_symbol('stdio.h', 'vasprintf', prefix: system_ext_define)
+ configh_data.set('HAVE_VASPRINTF', 1)
+endif
+if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix: system_ext_define)
configh_data.set('HAVE_SECURE_GETENV', 1)
-elif cc.has_header_symbol('stdlib.h', '__secure_getenv', prefix: '#define _GNU_SOURCE')
+elif cc.has_header_symbol('stdlib.h', '__secure_getenv', prefix: system_ext_define)
configh_data.set('HAVE___SECURE_GETENV', 1)
else
message('C library does not support secure_getenv, using getenv instead')
endif
-configure_file(output: 'config.h', configuration: configh_data)
-add_project_arguments('-include', 'config.h', language: 'c')
+have_getopt_long = cc.has_header_symbol('getopt.h', 'getopt_long',
+ prefix: '#define _GNU_SOURCE')
+# Silence some security & deprecation warnings on MSVC
+# for some unix/C functions we use.
+# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=vs-2019
+configh_data.set('_CRT_SECURE_NO_WARNINGS', 1)
+configh_data.set('_CRT_NONSTDC_NO_WARNINGS', 1)
+configh_data.set('_CRT_NONSTDC_NO_DEPRECATE', 1)
+# Reduce unnecessary includes on MSVC.
+configh_data.set('WIN32_LEAN_AND_MEAN', 1)
# Supports -Wl,--version-script?
have_version_script = cc.links(
# libxkbcommon.
# Note: we use some yacc extensions, which work with either GNU bison
-# (preferred) or byacc. Other yacc's may or may not work.
-yacc = find_program('bison', 'byacc')
-yacc_gen = generator(
- yacc,
- output: ['@BASENAME@.c', '@BASENAME@.h'],
- arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@', '-p _xkbcommon_'],
-)
-libxkbcommon_internal = static_library(
- 'xkbcommon-internal',
+# (preferred) or byacc (with backtracking enabled).
+bison = find_program('bison', 'win_bison', required: false)
+if bison.found()
+ yacc_gen = generator(
+ bison,
+ output: ['@BASENAME@.c', '@BASENAME@.h'],
+ arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@', '-p _xkbcommon_'],
+ )
+else
+ byacc = find_program('byacc', required: false)
+ if byacc.found()
+ yacc_gen = generator(
+ byacc,
+ output: ['@BASENAME@.c', '@BASENAME@.h'],
+ arguments: ['@INPUT@', '-H', '@OUTPUT1@', '-o', '@OUTPUT0@', '-p _xkbcommon_'],
+ )
+ else
+ error('Could not find a compatible YACC program (bison or byacc)')
+ endif
+endif
+libxkbcommon_sources = [
'src/compose/parser.c',
'src/compose/parser.h',
'src/compose/paths.c',
'src/utf8.h',
'src/utils.c',
'src/utils.h',
- include_directories: include_directories('src'),
-)
+]
libxkbcommon_link_args = []
if have_version_script
libxkbcommon_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon.map')
libxkbcommon = library(
'xkbcommon',
'xkbcommon/xkbcommon.h',
- link_whole: libxkbcommon_internal,
+ libxkbcommon_sources,
link_args: libxkbcommon_link_args,
link_depends: 'xkbcommon.map',
version: '0.0.0',
install: true,
+ include_directories: include_directories('src'),
)
install_headers(
'xkbcommon/xkbcommon.h',
subdir: 'xkbcommon',
)
pkgconfig.generate(
+ libxkbcommon,
name: 'xkbcommon',
filebase: 'xkbcommon',
- libraries: libxkbcommon,
version: meson.project_version(),
description: 'XKB API common to servers and clients',
)
You can disable X11 support with -Denable-x11=false.''')
endif
- libxkbcommon_x11_internal = static_library(
- 'xkbcommon-x11-internal',
+ libxkbcommon_x11_sources = [
'src/x11/keymap.c',
'src/x11/state.c',
'src/x11/util.c',
'src/keymap-priv.c',
'src/atom.h',
'src/atom.c',
- include_directories: include_directories('src'),
- link_with: libxkbcommon,
- dependencies: [
- xcb_dep,
- xcb_xkb_dep,
- ],
- )
+ ]
libxkbcommon_x11_link_args = []
if have_version_script
libxkbcommon_x11_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon-x11.map')
libxkbcommon_x11 = library(
'xkbcommon-x11',
'xkbcommon/xkbcommon-x11.h',
- link_whole: libxkbcommon_x11_internal,
+ libxkbcommon_x11_sources,
link_args: libxkbcommon_x11_link_args,
link_depends: 'xkbcommon-x11.map',
version: '0.0.0',
install: true,
+ include_directories: include_directories('src'),
+ link_with: libxkbcommon,
+ dependencies: [
+ xcb_dep,
+ xcb_xkb_dep,
+ ],
)
install_headers(
'xkbcommon/xkbcommon-x11.h',
subdir: 'xkbcommon',
)
pkgconfig.generate(
+ libxkbcommon_x11,
name: 'xkbcommon-x11',
filebase: 'xkbcommon-x11',
- libraries: libxkbcommon_x11,
version: meson.project_version(),
description: 'XKB API common to servers and clients - X11 support',
requires: ['xkbcommon'],
)
endif
+man_pages = []
+
+# libxkbregistry
+if get_option('enable-xkbregistry')
+ dep_libxml = dependency('libxml-2.0')
+ deps_libxkbregistry = [dep_libxml]
+ libxkbregistry_sources = [
+ 'src/registry.c',
+ 'src/utils.h',
+ 'src/utils.c',
+ 'src/util-list.h',
+ 'src/util-list.c',
+ ]
+ libxkbregistry_link_args = []
+ if have_version_script
+ libxkbregistry_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbregistry.map')
+ endif
+ libxkbregistry = library(
+ 'xkbregistry',
+ 'xkbcommon/xkbregistry.h',
+ libxkbregistry_sources,
+ link_args: libxkbregistry_link_args,
+ link_depends: 'xkbregistry.map',
+ dependencies: deps_libxkbregistry,
+ version: '0.0.0',
+ install: true,
+ include_directories: include_directories('src'),
+ )
+ install_headers(
+ 'xkbcommon/xkbregistry.h',
+ subdir: 'xkbcommon',
+ )
+ pkgconfig.generate(
+ libxkbregistry,
+ name: 'xkbregistry',
+ filebase: 'xkbregistry',
+ version: meson.project_version(),
+ description: 'XKB API to query available rules, models, layouts, variants and options',
+ )
+
+ dep_libxkbregistry = declare_dependency(
+ include_directories: include_directories('xkbcommon'),
+ link_with: libxkbregistry
+ )
+endif
# Tests
test_env = environment()
test_env.set('XKB_LOG_LEVEL', 'debug')
test_env.set('XKB_LOG_VERBOSITY', '10')
test_env.set('top_srcdir', meson.source_root())
-test_env.set('MALLOC_PERTURB_', '15')
-test_env.set('MallocPreScribble', '1')
-test_env.set('MallocScribble', '1')
+test_env.set('top_builddir', meson.build_root())
+
+test_configh_data = configuration_data()
+test_configh_data.set_quoted('TEST_XKB_CONFIG_ROOT', join_paths(meson.source_root(), 'test', 'data'))
+configure_file(output: 'test-config.h', configuration: test_configh_data)
+
# Some tests need to use unexported symbols, so we link them against
-# the internal copy of libxkbcommon with all symbols exposed.
+# an internal copy of libxkbcommon with all symbols exposed.
libxkbcommon_test_internal = static_library(
'xkbcommon-test-internal',
'test/common.c',
'test/test.h',
'test/evdev-scancodes.h',
+ libxkbcommon_sources,
include_directories: include_directories('src'),
- link_with: libxkbcommon_internal,
)
test_dep = declare_dependency(
include_directories: include_directories('src'),
link_with: libxkbcommon_test_internal,
)
if get_option('enable-x11')
+ libxkbcommon_x11_internal = static_library(
+ 'xkbcommon-x11-internal',
+ libxkbcommon_x11_sources,
+ include_directories: include_directories('src'),
+ link_with: libxkbcommon_test_internal,
+ dependencies: [
+ xcb_dep,
+ xcb_xkb_dep,
+ ],
+ )
x11_test_dep = declare_dependency(
link_with: libxkbcommon_x11_internal,
dependencies: [
executable('test-filecomp', 'test/filecomp.c', dependencies: test_dep),
env: test_env,
)
+# TODO: This test currently uses some functions that don't exist on Windows.
+if cc.get_id() != 'msvc'
+ test(
+ 'context',
+ executable('test-context', 'test/context.c', dependencies: test_dep),
+ env: test_env,
+ )
+endif
test(
- 'context',
- executable('test-context', 'test/context.c', dependencies: test_dep),
+ 'rules-file',
+ executable('test-rules-file', 'test/rules-file.c', dependencies: test_dep),
env: test_env,
)
test(
- 'rules-file',
- executable('test-rules-file', 'test/rules-file.c', dependencies: test_dep),
+ 'rules-file-includes',
+ executable('test-rules-file-includes', 'test/rules-file-includes.c', dependencies: test_dep),
env: test_env,
)
test(
env: test_env,
)
test(
+ 'utils',
+ executable('test-utils', 'test/utils.c', dependencies: test_dep),
+ env: test_env,
+)
+test(
'symbols-leak-test',
- find_program('test/symbols-leak-test.bash'),
+ find_program('test/symbols-leak-test.py'),
env: test_env,
+ suite: ['python-tests'],
)
if get_option('enable-x11')
test(
# See: https://github.com/xkbcommon/libxkbcommon/issues/30
executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
endif
+if get_option('enable-xkbregistry')
+ test(
+ 'registry',
+ executable('test-registry', 'test/registry.c',
+ include_directories: include_directories('src'),
+ dependencies: dep_libxkbregistry),
+ env: test_env,
+ )
+endif
+
+valgrind = find_program('valgrind', required: false)
+if valgrind.found()
+ add_test_setup('valgrind',
+ exe_wrapper: [valgrind,
+ '--leak-check=full',
+ '--track-origins=yes',
+ '--gen-suppressions=all',
+ '--error-exitcode=99'],
+ timeout_multiplier : 10)
+else
+ message('valgrind not found, disabling valgrind test setup')
+endif
# Fuzzing target programs.
executable('fuzz-keymap', 'fuzz/keymap/target.c', dependencies: test_dep)
executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
+man_pages = []
-# Demo programs.
-executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
-executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)
-executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
-if cc.has_header('linux/input.h')
- executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: test_dep)
-endif
-if get_option('enable-x11')
- executable('interactive-x11', 'test/interactive-x11.c', dependencies: x11_test_dep)
-endif
-if get_option('enable-wayland')
- wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false)
- wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.7', required: false)
- wayland_scanner_dep = dependency('wayland-scanner', required: false)
- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found()
- error('''The Wayland demo programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found.
-You can disable the Wayland demo programs with -Denable-wayland=false.''')
- endif
-
- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'))
- wayland_scanner_code_gen = generator(
- wayland_scanner,
- output: '@BASENAME@-protocol.c',
- arguments: ['code', '@INPUT@', '@OUTPUT@'],
+# Tools
+build_tools = have_getopt_long
+if build_tools
+ libxkbcommon_tools_internal = static_library(
+ 'tools-internal',
+ 'tools/tools-common.h',
+ 'tools/tools-common.c',
+ libxkbcommon_sources,
+ include_directories: include_directories('src'),
)
- wayland_scanner_client_header_gen = generator(
- wayland_scanner,
- output: '@BASENAME@-client-protocol.h',
- arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
+ tools_dep = declare_dependency(
+ include_directories: [include_directories('src'), include_directories('tools')],
+ link_with: libxkbcommon_tools_internal,
)
- wayland_protocols_datadir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
- xdg_shell_xml = join_paths(wayland_protocols_datadir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml')
- xdg_shell_sources = [
- wayland_scanner_code_gen.process(xdg_shell_xml),
- wayland_scanner_client_header_gen.process(xdg_shell_xml),
- ]
- executable('interactive-wayland', 'test/interactive-wayland.c', xdg_shell_sources, dependencies: [test_dep, wayland_client_dep])
+
+ executable('xkbcli', 'tools/xkbcli.c',
+ dependencies: tools_dep, install: true)
+ man_pages += 'tools/xkbcli.1.ronn'
+
+ executable('xkbcli-compile-keymap',
+ 'tools/compile-keymap.c',
+ dependencies: tools_dep,
+ install: true,
+ install_dir: dir_libexec)
+ man_pages += 'tools/xkbcli-compile-keymap.1.ronn'
+ configh_data.set10('HAVE_XKBCLI_COMPILE_KEYMAP', true)
+ executable('xkbcli-how-to-type',
+ 'tools/how-to-type.c',
+ dependencies: tools_dep,
+ install: true,
+ install_dir: dir_libexec)
+ man_pages += 'tools/xkbcli-how-to-type.1.ronn'
+ configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true)
+ if cc.has_header('linux/input.h')
+ executable('xkbcli-interactive-evdev',
+ 'tools/interactive-evdev.c',
+ dependencies: tools_dep,
+ install: true,
+ install_dir: dir_libexec)
+ configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true)
+ man_pages += 'tools/xkbcli-interactive-evdev.1.ronn'
+ endif
+ if get_option('enable-x11')
+ x11_tools_dep = declare_dependency(
+ link_with: libxkbcommon_x11_internal,
+ dependencies: [
+ tools_dep,
+ xcb_dep,
+ xcb_xkb_dep,
+ ],
+ )
+ executable('xkbcli-interactive-x11',
+ 'tools/interactive-x11.c',
+ dependencies: x11_tools_dep,
+ install: true,
+ install_dir: dir_libexec)
+ man_pages += 'tools/xkbcli-interactive-x11.1.ronn'
+ configh_data.set10('HAVE_XKBCLI_INTERACTIVE_X11', true)
+ endif
+ if get_option('enable-wayland')
+ wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false)
+ wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false)
+ wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
+ if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found()
+ error('''The Wayland demo programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found.
+ You can disable the Wayland demo programs with -Denable-wayland=false.''')
+ endif
+
+ wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'))
+ wayland_scanner_code_gen = generator(
+ wayland_scanner,
+ output: '@BASENAME@-protocol.c',
+ arguments: ['code', '@INPUT@', '@OUTPUT@'],
+ )
+ wayland_scanner_client_header_gen = generator(
+ wayland_scanner,
+ output: '@BASENAME@-client-protocol.h',
+ arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
+ )
+ wayland_protocols_datadir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
+ xdg_shell_xml = join_paths(wayland_protocols_datadir, 'stable/xdg-shell/xdg-shell.xml')
+ xdg_shell_sources = [
+ wayland_scanner_code_gen.process(xdg_shell_xml),
+ wayland_scanner_client_header_gen.process(xdg_shell_xml),
+ ]
+ executable('xkbcli-interactive-wayland',
+ 'tools/interactive-wayland.c',
+ xdg_shell_sources,
+ dependencies: [tools_dep, wayland_client_dep],
+ install: true,
+ install_dir: dir_libexec)
+ man_pages += 'tools/xkbcli-interactive-wayland.1.ronn'
+ configh_data.set10('HAVE_XKBCLI_INTERACTIVE_WAYLAND', true)
+ endif
+
+ if get_option('enable-xkbregistry')
+ configh_data.set10('HAVE_XKBCLI_LIST', true)
+ executable('xkbcli-list',
+ 'tools/registry-list.c',
+ dependencies: dep_libxkbregistry,
+ install: true,
+ install_dir: dir_libexec)
+ man_pages += 'tools/xkbcli-list.1.ronn'
+ endif
+
+ # pytest finds files named test_foo_bar.py but not
+ # test-foo-bar.py, let's rename the source file so it only ever finds the
+ # built one.
+ config_tool_option_test = configuration_data()
+ config_tool_option_test.set('MESON_BUILD_ROOT', meson.current_build_dir())
+ tool_option_test = configure_file(input: 'tools/test-tool-option-parsing.py',
+ output: 'test_tool_option_parsing.py',
+ configuration : config_tool_option_test)
+ test('tool-option-parsing',
+ tool_option_test,
+ args: [tool_option_test, '-n', 'auto'])
+endif
+
+if get_option('enable-manpages')
+ prog_ronn = find_program('ronn', required: true)
+ foreach manpage : man_pages
+ # man page filenames adhere to directory/topic.section.ronn
+ topic = manpage.split('/')[-1].split('.')[-3]
+ section = manpage.split('.')[-2]
+ output = '@0@.@1@'.format(topic, section)
+ custom_target(output,
+ input: manpage,
+ output: output,
+ command: [prog_ronn, '--manual=libxkbcommon manual', '--pipe', '--roff', files(manpage)],
+ capture: true,
+ install: true,
+ install_dir: join_paths(dir_man, section))
+ endforeach
endif
# xkeyboard-config "verifier"
xkct_config.set('XKB_CONFIG_ROOT', XKBCONFIGROOT)
configure_file(input: 'test/xkeyboard-config-test.py.in',
output: 'xkeyboard-config-test',
- configuration: xkct_config,
- install: false)
+ configuration: xkct_config)
# Benchmarks.
'doc/doxygen-extra.css',
'doc/quick-guide.md',
'doc/compat.md',
+ 'doc/user-configuration.md',
+ 'doc/rules-format.md',
'xkbcommon/xkbcommon.h',
'xkbcommon/xkbcommon-names.h',
'xkbcommon/xkbcommon-x11.h',
'xkbcommon/xkbcommon-compose.h',
+ 'xkbcommon/xkbregistry.h',
]
doxygen_data = configuration_data()
doxygen_data.set('PACKAGE_NAME', meson.project_name())
build_by_default: true,
)
endif
+
+configure_file(output: 'config.h', configuration: configh_data)
projects / platform / upstream / libxkbcommon.git / blobdiff