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

Merge branch 'cargo' into 'master'

Browse Source 
docs: Correct Cargo update instructions

See merge request Librem5/squeekboard!398
This commit is contained in:
Dorota Czaplejewicz
2020-11-23 09:16:59 +00:00
parent 81041b8035 5d81cf78f8
commit c9f9a3b577
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/hacking.md
View File

@ -179,7 +179,10 @@ Dependencies must be specified in `Cargo.toml` with 2 numbers: "major.minor". Si
``` ```
cd build_dir cd build_dir
ninja build src/Cargo.toml ninja ./Cargo.toml
sh /source_path/cargo.sh update sh /source_path/cargo.sh update
ninja test ninja test
cp ./Cargo.lock /source_path/
``` ```
Since version 1.9.3, `Cargo.lock` is not actually used by the build system, due to `Cargo.toml` being generated at every build.

1
meson.build
View File

@ -72,6 +72,7 @@ summary = [
message('\n'.join(summary)) message('\n'.join(summary))
# Rust deps are changing, depending on compile flags. Cargo can't handle it alone. # Rust deps are changing, depending on compile flags. Cargo can't handle it alone.
# As a side effect, Cargo.toml never gets used.
cargo_toml_in = files('Cargo.toml.in') cargo_toml_in = files('Cargo.toml.in')
path_data = configuration_data() path_data = configuration_data()
path_data.set('path', meson.source_root()) path_data.set('path', meson.source_root())