project(
'libxkbcommon',
'c',
- version: '1.4.1',
+ version: '1.5.0',
default_options: [
'c_std=c11',
'warning_level=2',
'b_lundef=true',
],
- meson_version : '>= 0.49.0',
+ meson_version : '>= 0.52.0',
)
pkgconfig = import('pkgconfig')
cc = meson.get_compiler('c')
# Compiler flags.
cflags = [
'-fno-strict-aliasing',
- '-fsanitize-undefined-trap-on-error',
'-Wno-unused-parameter',
'-Wno-missing-field-initializers',
'-Wpointer-arith',
if XKBCONFIGROOT == ''
xkeyboard_config_dep = dependency('xkeyboard-config', required: false)
if xkeyboard_config_dep.found()
- XKBCONFIGROOT = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
+ XKBCONFIGROOT = xkeyboard_config_dep.get_variable(pkgconfig: 'xkb_base')
else
XKBCONFIGROOT = get_option('prefix')/get_option('datadir')/'X11'/'xkb'
endif
# Supports -Wl,--version-script?
have_version_script = cc.links(
'int main(){}',
- args: '-Wl,--version-script=' + meson.source_root()/'xkbcommon.map',
+ args: '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map',
name: '-Wl,--version-script',
)
# libxkbcommon.
# Note: we use some yacc extensions, which work with either GNU bison
# (preferred) or byacc (with backtracking enabled).
-bison = find_program('bison', 'win_bison', required: false)
+bison = find_program('bison', 'win_bison', required: false, version: '>= 2.3a')
if bison.found()
+ yacc = bison
yacc_gen = generator(
bison,
output: ['@BASENAME@.c', '@BASENAME@.h'],
else
byacc = find_program('byacc', required: false)
if byacc.found()
+ yacc = byacc
yacc_gen = generator(
byacc,
output: ['@BASENAME@.c', '@BASENAME@.h'],
'src/keymap.c',
'src/keymap.h',
'src/keymap-priv.c',
+ 'src/messages-codes.h',
'src/scanner-utils.h',
'src/state.c',
'src/text.c',
libxkbcommon_link_args = []
libxkbcommon_link_deps = []
if have_version_script
- libxkbcommon_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbcommon.map'
+ libxkbcommon_link_args += '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map'
libxkbcommon_link_deps += 'xkbcommon.map'
elif cc.get_argument_syntax() == 'msvc'
libxkbcommon_def = custom_target('xkbcommon.def',
link_with: libxkbcommon,
include_directories: include_directories('include'),
)
+if meson.version().version_compare('>= 0.54.0')
+ meson.override_dependency('xkbcommon', dep_libxkbcommon)
+endif
pkgconfig.generate(
libxkbcommon,
name: 'xkbcommon',
libxkbcommon_x11_link_args = []
libxkbcommon_x11_link_deps = []
if have_version_script
- libxkbcommon_x11_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbcommon-x11.map'
+ libxkbcommon_x11_link_args += '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon-x11.map'
libxkbcommon_x11_link_deps += 'xkbcommon-x11.map'
elif cc.get_argument_syntax() == 'msvc'
libxkbcommon_x11_def = custom_target('xkbcommon-x11.def',
link_with: libxkbcommon_x11,
include_directories: include_directories('include'),
)
+ if meson.version().version_compare('>= 0.54.0')
+ meson.override_dependency('xkbcommon-x11', dep_libxkbcommon_x11)
+ endif
pkgconfig.generate(
libxkbcommon_x11,
name: 'xkbcommon-x11',
libxkbregistry_link_args = []
libxkbregistry_link_deps = []
if have_version_script
- libxkbregistry_link_args += '-Wl,--version-script=' + meson.source_root()/'xkbregistry.map'
+ libxkbregistry_link_args += '-Wl,--version-script=' + meson.current_source_dir()/'xkbregistry.map'
libxkbregistry_link_deps += 'xkbregistry.map'
elif cc.get_argument_syntax() == 'msvc'
libxkbregistry_def = custom_target('xkbregistry.def',
link_with: libxkbregistry,
include_directories: include_directories('include'),
)
+ if meson.version().version_compare('>= 0.54.0')
+ meson.override_dependency('xkbregistry', dep_libxkbregistry)
+ endif
endif
man_pages = []
# Tools
build_tools = get_option('enable-tools') and cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE')
if build_tools
- libxkbcommon_tools_internal = static_library(
- 'tools-internal',
+ libxkbcommon_tools_internal_sources = [
'tools/tools-common.h',
'tools/tools-common.c',
+ ]
+ libxkbcommon_tools_internal = static_library(
+ 'tools-internal',
+ libxkbcommon_tools_internal_sources,
dependencies: dep_libxkbcommon,
)
tools_dep = declare_dependency(
include_directories: [include_directories('tools', 'include')],
link_with: libxkbcommon_tools_internal,
+ dependencies: dep_libxkbcommon,
)
executable('xkbcli', 'tools/xkbcli.c',
install_dir: dir_libexec)
configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true)
install_man('tools/xkbcli-interactive-evdev.1')
+ # The same tool again, but with access to some private APIs.
+ executable('interactive-evdev',
+ 'tools/interactive-evdev.c',
+ libxkbcommon_sources,
+ libxkbcommon_tools_internal_sources,
+ dependencies: [tools_dep],
+ c_args: ['-DENABLE_PRIVATE_APIS'],
+ include_directories: [include_directories('src', 'include')],
+ install: false)
endif
if get_option('enable-x11')
x11_tools_dep = declare_dependency(
You can disable the Wayland xkbcli programs with -Denable-wayland=false.''')
endif
- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'))
+ wayland_scanner = find_program(wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'))
wayland_scanner_code_gen = generator(
wayland_scanner,
output: '@BASENAME@-protocol.c',
- arguments: ['code', '@INPUT@', '@OUTPUT@'],
+ arguments: ['private-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')
+ wayland_protocols_datadir = wayland_protocols_dep.get_variable(pkgconfig: 'pkgdatadir')
xdg_shell_xml = wayland_protocols_datadir/'stable/xdg-shell/xdg-shell.xml'
xdg_shell_sources = [
wayland_scanner_code_gen.process(xdg_shell_xml),
install_dir: dir_libexec)
install_man('tools/xkbcli-list.1')
endif
+
+ executable('xkb-check-messages',
+ 'tools/check-messages.c',
+ 'tools/messages.c',
+ 'tools/messages.h',
+ 'src/messages-codes.h',
+ dependencies: [tools_dep],
+ include_directories: [include_directories('src', 'include', 'tools')],
+ install: false)
endif
# xkeyboard-config "verifier"
xkct_config = configuration_data()
-xkct_config.set('MESON_BUILD_ROOT', meson.build_root())
+xkct_config.set('MESON_BUILD_ROOT', meson.current_build_dir())
xkct_config.set('XKB_CONFIG_ROOT', XKBCONFIGROOT)
configure_file(input: 'test/xkeyboard-config-test.py.in',
output: 'xkeyboard-config-test',
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('top_builddir', meson.build_root())
+test_env.set('top_srcdir', meson.current_source_dir())
+test_env.set('top_builddir', meson.current_build_dir())
test_env.set('HAVE_XKBCLI_INTERACTIVE_EVDEV', configh_data.get('HAVE_XKBCLI_INTERACTIVE_EVDEV', 0).to_string())
test_env.set('HAVE_XKBCLI_INTERACTIVE_WAYLAND', configh_data.get('HAVE_XKBCLI_INTERACTIVE_WAYLAND', 0).to_string())
test_env.set('HAVE_XKBCLI_INTERACTIVE_X11', configh_data.get('HAVE_XKBCLI_INTERACTIVE_X11', 0).to_string())
test_env.set('HAVE_XKBCLI_LIST', configh_data.get('HAVE_XKBCLI_LIST', 0).to_string())
test_configh_data = configuration_data()
-test_configh_data.set_quoted('TEST_XKB_CONFIG_ROOT', meson.source_root()/'test'/'data')
+test_configh_data.set_quoted('TEST_XKB_CONFIG_ROOT', meson.current_source_dir()/'test'/'data')
configure_file(output: 'test-config.h', configuration: test_configh_data)
# Some tests need to use unexported symbols, so we link them against
link_with: libxkbcommon_test_internal,
)
if get_option('enable-x11')
- libxkbcommon_x11_internal = static_library(
+ libxkbcommon_x11_test_internal = static_library(
'xkbcommon-x11-internal',
libxkbcommon_x11_sources,
+ 'test/xvfb-wrapper.c',
+ 'test/xvfb-wrapper.h',
include_directories: include_directories('src', 'include'),
link_with: libxkbcommon_test_internal,
dependencies: [
],
)
x11_test_dep = declare_dependency(
- link_with: libxkbcommon_x11_internal,
+ link_with: libxkbcommon_x11_test_internal,
dependencies: [
test_dep,
xcb_dep,
env: test_env,
suite: ['python-tests'],
)
+test(
+ 'modifiers',
+ executable('test-modifiers', 'test/modifiers.c', dependencies: test_dep),
+ env: test_env,
+)
+test(
+ 'messages',
+ executable(
+ 'test-messages',
+ 'test/messages.c',
+ 'tools/messages.c',
+ 'tools/messages.h',
+ include_directories: include_directories('src', 'include', 'tools'),
+ dependencies: test_dep),
+ env: test_env,
+)
if get_option('enable-x11')
test(
'x11',
executable('test-x11', 'test/x11.c', dependencies: x11_test_dep),
env: test_env,
)
- # test/x11comp is meant to be run, but it is (temporarily?) disabled.
- # See: https://github.com/xkbcommon/libxkbcommon/issues/30
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+ test(
+ 'x11comp',
+ executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep),
+ env: test_env,
+ )
endif
if get_option('enable-xkbregistry')
test(
]
env = environment()
- env.set('XKB_CONFIG_ROOT', meson.source_root()/'test'/'data')
+ env.set('XKB_CONFIG_ROOT', meson.current_source_dir()/'test'/'data')
foreach keysym: keysyms_to_test
test('keysym-test-@0@'.format(keysym),
find_program('test/test-keysym.py'),
# Benchmarks.
bench_env = environment()
-bench_env.set('top_srcdir', meson.source_root())
+bench_env.set('top_srcdir', meson.current_source_dir())
benchmark(
'key-proc',
executable('bench-key-proc', 'bench/key-proc.c', dependencies: test_dep),
env: bench_env,
)
benchmark(
+ 'compose-traversal',
+ executable('bench-compose-traversal', 'bench/compose-traversal.c', dependencies: test_dep),
+ env: bench_env,
+)
+benchmark(
'atom',
executable('bench-atom', 'bench/atom.c', dependencies: test_dep),
env: bench_env,
doxygen_input = [
'README.md',
+ 'doc/diagrams/xkb-configuration.dot',
'doc/doxygen-extra.css',
+ 'doc/introduction-to-xkb.md',
'doc/quick-guide.md',
- 'doc/compat.md',
+ 'doc/compatibility.md',
'doc/user-configuration.md',
'doc/rules-format.md',
'doc/keymap-format-text-v1.md',
+ 'doc/message-registry.md',
'include/xkbcommon/xkbcommon.h',
+ 'include/xkbcommon/xkbcommon-compose.h',
+ 'include/xkbcommon/xkbcommon-keysyms.h',
'include/xkbcommon/xkbcommon-names.h',
'include/xkbcommon/xkbcommon-x11.h',
- 'include/xkbcommon/xkbcommon-compose.h',
'include/xkbcommon/xkbregistry.h',
]
doxygen_data = configuration_data()
doxygen_data.set('PACKAGE_NAME', meson.project_name())
doxygen_data.set('PACKAGE_VERSION', meson.project_version())
doxygen_data.set('INPUT', ' '.join(doxygen_input))
- doxygen_data.set('OUTPUT_DIRECTORY', meson.build_root())
+ doxygen_data.set('OUTPUT_DIRECTORY', meson.current_build_dir())
doxyfile = configure_file(
input: 'doc/Doxyfile.in',
output: 'Doxyfile',
)
# TODO: Meson should provide this.
docdir = get_option('datadir')/'doc'/meson.project_name()
- custom_target(
+ doc_gen = custom_target(
'doc',
input: [doxyfile] + doxygen_input,
output: 'html',
- command: [doxygen_wrapper, doxygen.path(), meson.build_root()/'Doxyfile', meson.source_root()],
+ command: [
+ doxygen_wrapper,
+ doxygen,
+ meson.current_build_dir()/'Doxyfile',
+ meson.current_source_dir(),
+ ],
install: true,
install_dir: docdir,
build_by_default: true,
)
+ if get_option('enable-cool-uris')
+ ensure_stable_urls = find_program('scripts'/'ensure-stable-doc-urls.py')
+ custom_target(
+ 'doc-cool-uris',
+ input: [doc_gen, 'doc'/'cool-uris.yaml'],
+ output: 'html-xtra',
+ command: [
+ ensure_stable_urls,
+ 'generate-redirections',
+ meson.current_source_dir()/'doc'/'cool-uris.yaml',
+ meson.current_build_dir()/'html'
+ ],
+ install: false,
+ build_by_default: true,
+ )
+ endif
endif
configure_file(output: 'config.h', configuration: configh_data)
if get_option('enable-xkbregistry')
libxkbregistry_dep = dep_libxkbregistry
endif
+
+if meson.version().version_compare('>=0.62.0')
+ summary({
+ 'backend': meson.backend(),
+ 'buildtype': get_option('buildtype'),
+ 'c_args': get_option('c_args'),
+ 'c_link_args': get_option('c_link_args'),
+ 'yacc': yacc.full_path() + ' ' + yacc.version(),
+ }, section: 'Compiler')
+ summary({
+ 'prefix': get_option('prefix'),
+ 'bindir': get_option('bindir'),
+ 'libdir': get_option('libdir'),
+ 'datadir': get_option('datadir'),
+ 'xkb-config-root': XKBCONFIGROOT,
+ 'xkb-config-extra-path': XKBCONFIGEXTRAPATH,
+ 'xlocaledir': XLOCALEDIR,
+ }, section: 'Directories')
+ summary({
+ 'docs': get_option('enable-docs'),
+ 'tools': get_option('enable-tools'),
+ 'wayland': get_option('enable-wayland'),
+ 'x11': get_option('enable-x11'),
+ }, section: 'Features')
+ summary({
+ 'layout': get_option('default-layout'),
+ 'model': get_option('default-model'),
+ 'options': get_option('default-options'),
+ 'rules': get_option('default-rules'),
+ 'variant': get_option('default-variant'),
+ }, section: 'Defaults')
+endif
projects / platform / upstream / libxkbcommon.git / blobdiff