X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=meson.build;h=a8650c12c47da53a2a0ce860258bfb0a488bd8d5;hb=c6f9a14854790213f3956c14a5d55f89386f1559;hp=7b941d0c0c884718d5ce1da6fb8fcd58abf24f87;hpb=fe9cd66fcacb1ffa364a1bcaccdc0ec906575652;p=platform%2Fupstream%2Flibxkbcommon.git diff --git a/meson.build b/meson.build index 7b941d0..a8650c1 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'libxkbcommon', 'c', - version: '1.5.0', + version: '1.6.0', default_options: [ 'c_std=c11', 'warning_level=2', @@ -221,6 +221,7 @@ libxkbcommon_sources = [ 'src/keymap.c', 'src/keymap.h', 'src/keymap-priv.c', + 'src/messages-codes.h', 'src/scanner-utils.h', 'src/state.c', 'src/text.c', @@ -244,6 +245,7 @@ elif cc.get_argument_syntax() == 'msvc' libxkbcommon_link_deps += libxkbcommon_def libxkbcommon_link_args += '/DEF:' + libxkbcommon_def.full_path() endif + libxkbcommon = library( 'xkbcommon', 'include/xkbcommon/xkbcommon.h', @@ -414,12 +416,21 @@ endif man_pages = [] # Tools +if get_option('enable-tools') build_tools = get_option('enable-tools') and cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE') +else +build_tools = false +endif + if build_tools - libxkbcommon_tools_internal = static_library( - 'tools-internal', + # Common resources + 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( @@ -428,10 +439,27 @@ if build_tools dependencies: dep_libxkbcommon, ) + # Tool: xkbcli executable('xkbcli', 'tools/xkbcli.c', dependencies: tools_dep, install: true) install_man('tools/xkbcli.1') + if get_option('enable-bash-completion') + bash_completion_path = get_option('bash-completion-path') + if bash_completion_path == '' + bash_completion = dependency('bash-completion', required: false) + if bash_completion.found() + bash_completion_path = bash_completion.get_variable(pkgconfig: 'completionsdir') + else + bash_completion_path = get_option('datadir') / 'bash-completion/completions' + endif + endif + install_data('tools/xkbcli-bash-completion.sh', + rename: 'xkbcli', + install_dir: bash_completion_path) + endif + + # Tool: compile-keymap xkbcli_compile_keymap = executable('xkbcli-compile-keymap', 'tools/compile-keymap.c', dependencies: tools_dep, @@ -446,12 +474,16 @@ if build_tools c_args: ['-DENABLE_PRIVATE_APIS'], include_directories: [include_directories('src', 'include')], install: false) + + # Tool: compose executable('compose', 'tools/compose.c', dependencies: tools_dep, include_directories: [include_directories('src', 'include')], install: false) configh_data.set10('HAVE_XKBCLI_COMPILE_KEYMAP', true) + + # Tool: how-to-type executable('xkbcli-how-to-type', 'tools/how-to-type.c', dependencies: tools_dep, @@ -459,6 +491,8 @@ if build_tools install_dir: dir_libexec) install_man('tools/xkbcli-how-to-type.1') configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true) + + # Tool: interactive-evdev if cc.has_header('linux/input.h') executable('xkbcli-interactive-evdev', 'tools/interactive-evdev.c', @@ -467,7 +501,18 @@ if build_tools 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 + + # Tool: interactive-x11 if get_option('enable-x11') x11_tools_dep = declare_dependency( link_with: libxkbcommon_x11, @@ -485,6 +530,8 @@ if build_tools install_man('tools/xkbcli-interactive-x11.1') configh_data.set10('HAVE_XKBCLI_INTERACTIVE_X11', true) endif + + # Tool: interactive-wayland 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) @@ -521,6 +568,7 @@ You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') configh_data.set10('HAVE_XKBCLI_INTERACTIVE_WAYLAND', true) endif + # Tool: list if get_option('enable-xkbregistry') configh_data.set10('HAVE_XKBCLI_LIST', true) executable('xkbcli-list', @@ -530,6 +578,16 @@ You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') install_dir: dir_libexec) install_man('tools/xkbcli-list.1') endif + + # Tool: check-messages + 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 @@ -685,6 +743,17 @@ test( 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', @@ -772,6 +841,11 @@ benchmark( 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, @@ -804,6 +878,7 @@ You can disable the documentation with -Denable-docs=false.''') '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',