Merge branch 'make-rust-analyzer-work' into 'main'
Build: Use meson_Cargo.toml.in for setting up the build See merge request World/Phosh/squeekboard!657
This commit is contained in:
11
.gitignore
vendored
11
.gitignore
vendored
@ -1,9 +1,20 @@
|
|||||||
_build/
|
_build/
|
||||||
|
debian/.debhelper/
|
||||||
|
debian/cargo/registry/
|
||||||
|
debian/cargo/.*cache*
|
||||||
|
debian/debhelper-build-stamp
|
||||||
|
debian/files
|
||||||
|
debian/*.substvars
|
||||||
|
debian/squeekboard/
|
||||||
|
debian/squeekboard-devel/
|
||||||
|
debian/tmp/
|
||||||
|
meson_Cargo.toml.in
|
||||||
po/squeekboard.pot
|
po/squeekboard.pot
|
||||||
po/*.mo
|
po/*.mo
|
||||||
TAGS
|
TAGS
|
||||||
tags
|
tags
|
||||||
target/
|
target/
|
||||||
|
vendor/
|
||||||
vgdump
|
vgdump
|
||||||
*.swp
|
*.swp
|
||||||
*~
|
*~
|
||||||
|
|||||||
@ -5,21 +5,21 @@ edition = "2021"
|
|||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "rs"
|
name = "rs"
|
||||||
path = "@path@/src/lib.rs"
|
path = "src/lib.rs"
|
||||||
crate-type = ["staticlib", "rlib"]
|
crate-type = ["staticlib", "rlib"]
|
||||||
|
|
||||||
# Cargo can't do autodiscovery if Cargo.toml is not in the root.
|
# Cargo can't do autodiscovery if Cargo.toml is not in the root.
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "test_layout"
|
name = "test_layout"
|
||||||
path = "@path@/src/bin/test_layout.rs"
|
path = "src/bin/test_layout.rs"
|
||||||
|
|
||||||
[[example]]
|
[[example]]
|
||||||
name = "test_layout"
|
name = "test_layout"
|
||||||
path = "@path@/examples/test_layout.rs"
|
path = "examples/test_layout.rs"
|
||||||
|
|
||||||
[[example]]
|
[[example]]
|
||||||
name = "find_orphan_layouts"
|
name = "find_orphan_layouts"
|
||||||
path = "@path@/examples/find_orphan_layouts.rs"
|
path = "examples/find_orphan_layouts.rs"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
zbus_v1_5 = []
|
zbus_v1_5 = []
|
||||||
|
|||||||
@ -85,10 +85,16 @@ summary = [
|
|||||||
]
|
]
|
||||||
message('\n'.join(summary))
|
message('\n'.join(summary))
|
||||||
|
|
||||||
|
# 'rust-analyzer' does not work correctly, when the paths in 'Cargo.toml' have '@path@' in them.
|
||||||
|
cp = find_program('cp')
|
||||||
|
sed = find_program('sed')
|
||||||
|
copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in')
|
||||||
|
prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_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())
|
||||||
cargo_toml = configure_file(
|
cargo_toml = configure_file(
|
||||||
input: 'Cargo.toml',
|
input: 'meson_Cargo.toml.in',
|
||||||
output: 'Cargo.toml',
|
output: 'Cargo.toml',
|
||||||
configuration: path_data,
|
configuration: path_data,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user