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

build: Do away with older and newer deps

Browse Source 
We copy the 'newer' variant to the canonical locations.
No need to implement manual branching, we have git since decades.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/620>
This commit is contained in:
Guido Günther
2024-03-10 11:16:39 +01:00
committed by Marge Bot
parent 9c302a9131
commit 8ebb9cd592
7 changed files with 744 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meson.build
View File

@ -98,19 +98,12 @@ cargo_toml_base = configure_file(
cargo_patch = []
if get_option('newer') == true
cargo_build_flags += ['--features', 'glib_v0_14,zbus_v1_5,clap_v4']
cargo_deps = files('Cargo.deps.newer')
cargo_lock = files('Cargo.lock.newer')
else
cargo_deps = files('Cargo.deps')
cargo_lock = []
if get_option('online') == true
cargo_patch = [files('Cargo.deps.online')]
if get_option('reset_lock') == true
cargo_lock = files('Cargo.lock')
endif
endif
cargo_build_flags += ['--features', 'glib_v0_14,zbus_v1_5,clap_v4']
cargo_deps = files('Cargo.deps')
cargo_lock = files('Cargo.lock')
if get_option('online') == true
cargo_patch = [files('Cargo.deps.online')]
endif
cat = find_program('cat')