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

build: Use Cargo.lock included with the repo by default

Browse Source 
This should fix some future problems with dependencies getting updated in a way that's unsupported by the build tools targeted by Squeekboard.
This commit is contained in:
Dorota Czaplejewicz
2022-09-01 14:00:40 +00:00
parent a3f6349376
commit 51f8217646
5 changed files with 694 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/meson.build
View File

@ -63,7 +63,7 @@ rslibs = custom_target(
install: false,
console: true,
command: [cargo_build] + ['@OUTPUT@', '--lib'] + cargo_build_flags,
depends: cargo_toml,
depends: cargo_deps,
)
build_rstests = custom_target(
@ -78,7 +78,7 @@ build_rstests = custom_target(
install: false,
console: true,
command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
depends: [rslibs, cargo_deps], # no point building tests if the code itself fails
)
test(
@ -88,7 +88,7 @@ test(
env: ['SOURCE_DIR=' + meson.source_root()],
# this is a whole Carg-based test suite, let it run for a while
timeout: 900,
depends: [build_rstests, cargo_toml],
depends: [build_rstests, cargo_deps],
)
libsqueekboard = static_library('libsqueekboard',