s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'themes' into 'master'

Browse Source 
Use appropriate styling for layouts

See merge request Librem5/squeekboard!253
This commit is contained in:
Dorota Czaplejewicz
2019-11-30 11:08:08 +00:00
parent fdbbe8f126 4ee8a91dfe
commit a901c85bcb
12 changed files with 222 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/meson.build
View File

@ -97,20 +97,7 @@ libsqueekboard = static_library('libsqueekboard',
'-DEEK_COMPILATION=1'],
)
# the straight binary needs to be demoted in favor of the wrapper script
# due to styling being inconsistent
bindir = join_paths(prefix, get_option('bindir'))
wrapper_conf = configuration_data()
wrapper_conf.set('bindir', bindir)
configure_file(
input: '../tools/squeekboard.in',
output: 'squeekboard',
install_dir: bindir,
configuration: wrapper_conf,
install: true,
)
squeekboard = executable('squeekboard-real',
squeekboard = executable('squeekboard',
'server-main.c',
wl_proto_sources,
squeekboard_resources,
@ -125,6 +112,8 @@ squeekboard = executable('squeekboard-real',
'-DEEK_COMPILATION=1'],
)
bindir = join_paths(prefix, get_option('bindir'))
test_layout = custom_target('squeekboard-test-layout',
build_by_default: true,
# meson doesn't track all inputs, cargo does