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

Add versions to link properties in manifest #1104

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add versions to link properties in manifest #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib-extras/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license.workspace = true
description = "Extra Qt types for integrating `cxx-qt` crate with `cxx` that are not available in `cxx-qt-lib`"
repository.workspace = true
BenFordTytherington marked this conversation as resolved.
Show resolved Hide resolved

links = "cxx-qt-lib-extras"
links = "cxx-qt-lib-extras-0-6-1"

[dependencies]
cxx.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib-extras/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn main() {
// Disable exporting the standard include directory, as we are exporting custom headers
.export_include_prefixes([])
.export_include_directory(header_dir(), "cxx-qt-lib-extras")
.reexport_dependency("cxx-qt-lib");
.reexport_dependency("cxx-qt-lib-0-6-1");
Copy link
Collaborator

@LeonMatthesKDAB LeonMatthesKDAB Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ah, this is a problem!
With Cargos dependency resolver, we may end up with cxx-qt-lib 0.6.2 as the actual dependency here, as it can choose another compatible version.
In which case, reexport_dependency would no longer work!

And we have the same issue with future minor versions, where Cargo may choose a newer version...
So maybe we only include the part of the version in the links key that actually includes a "breaking change".
E.g. cxx-qt-lib-0.6.
However, that will lead to issues if two downstream dependencies enforce exact minor versions that then will have conflicting links keys...

The other route in which we could solve this issue is to use another name in the reexport_dependency.
I guess we could use the name from the manifest instead 🤔

Any opinions @BenFordTytherington @ahayzen-kdab ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@LeonMatthesKDAB Hmm so maybe we reexplore this with the build system refactor in 0.8?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, we still don't have a firm answer on what takes care of exporting dependencies anyway.
Maybe that will need to be its own build step...


let mut builder = CxxQtBuilder::library(interface)
.qt_module("Gui")
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exclude = [ "**/generate.sh" ]
# to make sure the build scripts are run in the correct order and the build scripts
# can pass metadata from library to dependent.
# See also: https://doc.rust-lang.org/cargo/reference/build-scripts.html#the-links-manifest-key
links = "cxx-qt-lib"
links = "cxx-qt-lib-0-6-1"

[dependencies]
cxx.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ fn main() {
.initializer("src/core/init.cpp")
.export_include_prefixes([])
.export_include_directory(header_dir(), "cxx-qt-lib")
.reexport_dependency("cxx-qt");
.reexport_dependency("cxx-qt-0-6-1");

if qt_gui_enabled() {
interface = interface
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ categories = ["api-bindings", "gui"]
# to make sure the build scripts are run in the correct order and the build scripts
# can pass metadata from library to dependent.
# See also: https://doc.rust-lang.org/cargo/reference/build-scripts.html#the-links-manifest-key
links = "cxx-qt"
links = "cxx-qt-0-6-1"

[dependencies]
cxx.workspace = true
Expand Down
Loading