Simplify build-system further
Remove Fragile from the list of dependencies It is not necessary for building 'gio' anymore, since the upgrade to 'glib v2_58'. Remove "online" and "reset_lock" Meson-options Building Squeekboard should work offline. Use a single "Cargo.toml"-file instead of splitting it into parts and putting it back together when building. Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/623>
This commit is contained in:
@ -52,7 +52,6 @@ deps = [
|
||||
cc.find_library('rt'),
|
||||
cc.find_library('dl'),
|
||||
cc.find_library('pthread'),
|
||||
# dependency('libxklavier'), # FIXME remove
|
||||
]
|
||||
|
||||
rslibs = custom_target(
|
||||
@ -63,7 +62,6 @@ rslibs = custom_target(
|
||||
install: false,
|
||||
console: true,
|
||||
command: [cargo_build] + ['@OUTPUT@', '--lib'] + cargo_build_flags,
|
||||
depends: cargo_deps,
|
||||
)
|
||||
|
||||
build_rstests = custom_target(
|
||||
@ -78,7 +76,7 @@ build_rstests = custom_target(
|
||||
install: false,
|
||||
console: true,
|
||||
command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
|
||||
depends: [rslibs, cargo_deps], # no point building tests if the code itself fails
|
||||
depends: [rslibs], # no point building tests if the code itself fails
|
||||
)
|
||||
|
||||
test(
|
||||
@ -86,9 +84,9 @@ test(
|
||||
cargo_script,
|
||||
args: ['test'] + cargo_build_flags,
|
||||
env: ['SOURCE_DIR=' + meson.source_root()],
|
||||
# this is a whole Carg-based test suite, let it run for a while
|
||||
# This is a whole Cargo-based test suite, let it run for a while
|
||||
timeout: 900,
|
||||
depends: [build_rstests, cargo_deps],
|
||||
depends: [build_rstests],
|
||||
)
|
||||
|
||||
libsqueekboard = static_library('libsqueekboard',
|
||||
|
||||
Reference in New Issue
Block a user