WIP: cargo: Support building multiple versions of the same crate #12363

xclaesse · 2023-10-11T21:22:42Z

cargo: Add support for system-deps dependencies
rust: recursively pull proc-macro dependencies as well
cargo: Abort if project has build-dependencies
cargo: Set CARGO_PKG_* in env when building and running build.rs
cargo: Only build one crate type at a time
cargo: Fix error when defining options on build-dependencies
rust: Add rust.cargo_cfg() module method
rust: Add get_target_triplet() method
cargo: Split function that adds a single dependency
cargo: builder: Add elseblock support
cargo: Fix cfg() parsing
cargo: Add patch_directory into generated wrap if available
cargo: Generate .wrap file from crates.io dependencies
cargo: Add API version into dependency name
cargo: Ensure Dependency.package always has a value
modules: Add helper to add project/global arguments
compilers: Allow setting env and workdir for run checks
compilers: Do not dump File content in log for compiler checks.
compilers: Every compiler can run code
build: Warning message was not telling which target it links to.

I've split this PR into smaller ones:

mesonbuild/modules/rust.py

alyssais

Cargo forces the build.rs to be panic=unwind. It would probably make sense to do the same here?

Compiling and linking code is part of the Compiler base class, there is no reason it cannot also run executables.

When doing a compiler check with a File object, there is no need to dump the file into logs, we can just print the path. The file could potentially be big.

This is not exposed in API, but will be used internally.

Add cfg token to be able to parse the top level cfg() function. Fix parser which was creating a new iterator when recursing which causer the caller function's iterator to not have advanced when recursing function returns.

That function will be reused to add target dependencies as well.

This returns --target value from rustc command line, or the native target.

It compiles and run build.rs to return a list of a configs for cargo projects.

We are not using them yet, but we should already at least declare its options dictionary. This avoid crashing when generated code adds features into that dict that was not yet declared.

In that case build.rs cannot be used and must be ported manually.

When the proc-macro rlib is in a different subdir, it would miss the needed -L argument and rustc would not find it. Meson was assuming that proc-macros are only needed when building libraries that uses it, but it turns out that was wrong, as show by the unit test.

mesonbuild/cargo/manifest.py

@@ -188,6 +188,8 @@

    members: T.List[str]
    exclude: T.List[str]
+    package: Package
+    dependencies: T.Dict[str, DependencyV],


mesonbuild/cargo/interpreter.py

@@ -20,8 +20,12 @@
 import collections
 import typing as T

+from functools import lru_cache


If dependency name does not match the package name, we have to rename the crate name to the dependency name. Yes, that makes 3 different names for the same dependency, good job cargo! For example: - package name: cairo-sys-rs - crate name: cairo-sys - dependency name: ffi

Depends on * mesonbuild/meson#12363 * mesonbuild/meson#12936

sdroege · 2024-03-04T21:17:04Z

FTR, the latest changes here make it possible to build a GTK4 Rust application successfully: sdroege/mandelbrot@3ea3548

Depends on * mesonbuild/meson#12363 * mesonbuild/meson#12936

xclaesse · 2024-03-06T19:52:05Z

I started to split this PR in smaller parts to make it easier to review.

xclaesse requested review from mensinda and jpakkane as code owners October 11, 2023 21:22

xclaesse force-pushed the cargo-multiver branch from 30904b9 to d9c664a Compare November 23, 2023 14:53

xclaesse requested a review from dcbaker as a code owner November 23, 2023 14:53

github-advanced-security bot found potential problems Nov 23, 2023

View reviewed changes

mesonbuild/modules/rust.py Fixed Show fixed Hide fixed

eli-schwartz mentioned this pull request Nov 24, 2023

Rust: Support external crates #2173

Open

xclaesse force-pushed the cargo-multiver branch 2 times, most recently from de93962 to 7900636 Compare November 24, 2023 20:58

xclaesse force-pushed the cargo-multiver branch 2 times, most recently from 55f111e to b068532 Compare February 26, 2024 19:48

xclaesse changed the title ~~WIP: cargo: Add API version into dependency name and generate .wrap files automatically~~ WIP: cargo: Support building multiple versions of the same crate Feb 26, 2024

alyssais reviewed Feb 27, 2024

View reviewed changes

xclaesse force-pushed the cargo-multiver branch from b068532 to b4a2169 Compare February 28, 2024 14:58

xclaesse added 17 commits February 28, 2024 10:04

build: Warning message was not telling which target it links to.

4e03af5

compilers: Every compiler can run code

b30f6e3

Compiling and linking code is part of the Compiler base class, there is no reason it cannot also run executables.

compilers: Do not dump File content in log for compiler checks.

e48ba1c

When doing a compiler check with a File object, there is no need to dump the file into logs, we can just print the path. The file could potentially be big.

compilers: Allow setting env and workdir for run checks

84e2002

This is not exposed in API, but will be used internally.

modules: Add helper to add project/global arguments

f7c9b9a

cargo: Ensure Dependency.package always has a value

6ede467

cargo: Add API version into dependency name

fd1cd06

cargo: Generate .wrap file from crates.io dependencies

2455524

cargo: Add patch_directory into generated wrap if available

11d0f66

cargo: Fix cfg() parsing

4372383

Add cfg token to be able to parse the top level cfg() function. Fix parser which was creating a new iterator when recursing which causer the caller function's iterator to not have advanced when recursing function returns.

cargo: builder: Add elseblock support

8ffa42d

cargo: Split function that adds a single dependency

ffa0a19

That function will be reused to add target dependencies as well.

rust: Add get_target_triplet() method

b22d37c

This returns --target value from rustc command line, or the native target.

rust: Add rust.cargo_cfg() module method

06ba9b7

It compiles and run build.rs to return a list of a configs for cargo projects.

cargo: Fix error when defining options on build-dependencies

65a079f

We are not using them yet, but we should already at least declare its options dictionary. This avoid crashing when generated code adds features into that dict that was not yet declared.

cargo: Only build one crate type at a time

2137f45

cargo: Set CARGO_PKG_* in env when building and running build.rs

37df695

xclaesse force-pushed the cargo-multiver branch from b4a2169 to 7ab8559 Compare February 28, 2024 15:06

xclaesse and others added 3 commits February 28, 2024 10:20

cargo: Warn if project has build-dependencies

a6dd090

In that case build.rs cannot be used and must be ported manually.

cargo: Add support for system-deps dependencies

600d1e6

xclaesse force-pushed the cargo-multiver branch from 7ab8559 to 600d1e6 Compare February 28, 2024 15:20

WIP: workspace support and fixes

18bd1ec

github-advanced-security bot found potential problems Mar 4, 2024

View reviewed changes

xclaesse added 3 commits March 4, 2024 12:28

cargo: Override cargo provided dependencies with latest version

f7621ee

cargo: A dependency is required if a feature with same name is enabled

cf0224b

xclaesse force-pushed the cargo-multiver branch from a009bc9 to 6a3f030 Compare March 4, 2024 20:26

sdroege added a commit to sdroege/mandelbrot that referenced this pull request Mar 4, 2024

Add initial meson build system

3ea3548

Depends on * mesonbuild/meson#12363 * mesonbuild/meson#12936

sdroege added a commit to sdroege/mandelbrot that referenced this pull request Mar 4, 2024

Add initial meson build system

cebe55a

Depends on * mesonbuild/meson#12363 * mesonbuild/meson#12936

eli-schwartz added the language:rust label Mar 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: cargo: Support building multiple versions of the same crate #12363

WIP: cargo: Support building multiple versions of the same crate #12363

xclaesse commented Oct 11, 2023 •

edited

Loading

alyssais left a comment

sdroege commented Mar 4, 2024

xclaesse commented Mar 6, 2024 •

edited

Loading

WIP: cargo: Support building multiple versions of the same crate #12363

Are you sure you want to change the base?

WIP: cargo: Support building multiple versions of the same crate #12363

Conversation

xclaesse commented Oct 11, 2023 • edited Loading

alyssais left a comment

Choose a reason for hiding this comment

sdroege commented Mar 4, 2024

xclaesse commented Mar 6, 2024 • edited Loading

xclaesse commented Oct 11, 2023 •

edited

Loading

xclaesse commented Mar 6, 2024 •

edited

Loading