Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cargo features #11867

Merged
merged 10 commits into from
Feb 26, 2024
Merged

Cargo features #11867

merged 10 commits into from
Feb 26, 2024

Conversation

xclaesse
Copy link
Member

@xclaesse xclaesse commented Jun 12, 2023 •
edited
Loading

  • cargo: Call into meson subdir if it exists
  • cargo: Abort if features are missing
  • cargo: Expose features as Meson boolean options
  • cargo: Use coredata.stable_version
  • cargo: Builder: method() object can be any BaseNode
  • cargo: Builder: Add support for "!=", "in" and "not in" operators
  • cargo: Builder: Add support for "+", "+=", "if" and "foreach"
  • printer: Add a newline after "else"
  • printer: notin operator should be printed as "not in"
  • interpreter: Dependency variables can be empty string

@xclaesse xclaesse force-pushed the cargo-features branch 4 times, most recently from a5310c9 to 5a7ba80 Compare June 13, 2023 18:47
@xclaesse xclaesse changed the title WIP: Cargo features Cargo features Oct 10, 2023
@xclaesse xclaesse force-pushed the cargo-features branch 2 times, most recently from 7ec22e2 to 34f7b88 Compare October 10, 2023 17:24
@xclaesse xclaesse added this to the 1.3.0 milestone Oct 10, 2023
@xclaesse xclaesse mentioned this pull request Oct 11, 2023
Open
@xclaesse xclaesse modified the milestones: 1.3.0, 1.4.0 Oct 17, 2023
@xclaesse xclaesse mentioned this pull request Oct 17, 2023
Merged
@xclaesse xclaesse force-pushed the cargo-features branch 2 times, most recently from 3d02f9e to 26d3165 Compare November 23, 2023 21:32
dcbaker
dcbaker reviewed Feb 15, 2024
View reviewed changes
Copy link
Member

@dcbaker dcbaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't gotten through the actual meaty patches yet, but I'm out of time for the moment.

mesonbuild/ast/printer.py Show resolved Hide resolved
mesonbuild/cargo/interpreter.py Show resolved Hide resolved
mesonbuild/cargo/interpreter.py Show resolved Hide resolved
mesonbuild/cargo/interpreter.py Outdated Show resolved Hide resolved
ystreet added a commit to ystreet/librice that referenced this pull request Feb 18, 2024
@ystreet
Use new meson cargo dependency
49ffb7b 
mesonbuild/meson#11867
ystreet added a commit to ystreet/librice that referenced this pull request Feb 18, 2024
@ystreet
Use new meson cargo dependency
dea6b4e 
mesonbuild/meson#11867
eli-schwartz
eli-schwartz reviewed Feb 18, 2024
View reviewed changes
Copy link
Member

@eli-schwartz eli-schwartz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New features are documented in the wrap documentation but not as a release notes snippet.

docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
docs/markdown/Wrap-dependency-system-manual.md Outdated Show resolved Hide resolved
mesonbuild/cargo/interpreter.py Outdated Show resolved Hide resolved
@xclaesse xclaesse force-pushed the cargo-features branch 3 times, most recently from 862ac10 to 48459e9 Compare February 23, 2024 20:40
@xclaesse
interpreter: Dependency variables can be empty string
5654f03 
There is no reason to forbid empty variables, PkgConfigCLI.variable()
even has code specifically for handling that case.
@xclaesse
printer: notin operator should be printed as "not in"
c25f0b1
@xclaesse
printer: Add a newline after "else"
cbf23f5
@xclaesse
cargo: Builder: Add support for "+", "+=", "if" and "foreach"
6cce6c5
@xclaesse
cargo: Builder: Add support for "!=", "in" and "not in" operators
53ba719
@xclaesse
cargo: Builder: method() object can be any BaseNode
8ca5977 
StringNode for example also have methods.
@xclaesse
cargo: Use coredata.stable_version
d075bdb 
This avoids generated code print warnings when using features introduced
in current dev cycle.
@xclaesse
cargo: Expose features as Meson boolean options
114e032
@xclaesse
cargo: Abort if features are missing
4d55645
@xclaesse
cargo: Call into meson subdir if it exists
435e881 
This allows projects to manually add extra rust args and deps. This is
intended to replace build.rs logic.
@jpakkane jpakkane merged commit fa2ab69 into mesonbuild:master Feb 26, 2024
35 of 36 checks passed
@xclaesse
Copy link
Member Author

CI failure is unrelated, and this PR only touch experimental Cargo code, let's merge.

@xclaesse
Copy link
Member Author

ah @jpakkane did it already :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eli-schwartz eli-schwartz eli-schwartz requested changes

@dcbaker dcbaker dcbaker approved these changes

@mensinda mensinda Awaiting requested review from mensinda mensinda is a code owner

@jpakkane jpakkane Awaiting requested review from jpakkane jpakkane is a code owner

Assignees
No one assigned
Labels
language:rust
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@xclaesse @dcbaker @eli-schwartz @jpakkane