WIP: cargo: Support building multiple versions of the same crate #12363
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xclaesse
force-pushed
the
cargo-multiver
branch
from
30904b9 to
d9c664a
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
xclaesse
force-pushed
the
cargo-multiver
branch
2 times, most recently
from
de93962 to
7900636
Compare
xclaesse
force-pushed
the
cargo-multiver
branch
2 times, most recently
from
55f111e to
b068532
Compare
xclaesse
changed the title
alyssais
reviewed
Feb 27, 2024
xclaesse
force-pushed
the
cargo-multiver
branch
from
b068532 to
b4a2169
Compare
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.
xclaesse
force-pushed
the
cargo-multiver
branch
from
b4a2169 to
7ab8559
Compare
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.
xclaesse
force-pushed
the
cargo-multiver
branch
from
7ab8559 to
600d1e6
Compare
| @@ -188,6 +188,8 @@ | |||
|
|
|||
| members: T.List[str] | |||
| exclude: T.List[str] | |||
| package: Package | |||
| dependencies: T.Dict[str, DependencyV], | |||
Check failure
Code scanning / CodeQL
Syntax error Error
| @@ -20,8 +20,12 @@ | |||
| import collections | |||
| import typing as T | |||
|
|
|||
| from functools import lru_cache | |||
Check notice
Code scanning / CodeQL
Unused import Note
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
sdroege
added a commit
to sdroege/mandelbrot
that referenced
this pull request
Mar 4, 2024
|
FTR, the latest changes here make it possible to build a GTK4 Rust application successfully: sdroege/mandelbrot@3ea3548 |
sdroege
added a commit
to sdroege/mandelbrot
that referenced
this pull request
Mar 4, 2024
|
I started to split this PR in smaller parts to make it easier to review. |
That makes a lot of sense. Could you please link them here? 🙏 |
Ah nm, I didn't see the edit of the description. 🤦 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cargo: Add support for
system-depsdependenciesrust: 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: