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.

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

Update sys cargo #755

Merged
merged 3 commits into from May 10, 2019

Conversation

Projects
None yet
3 participants
@GuillaumeGomez
Copy link
Member

commented May 9, 2019

Generated Cargo.toml now looks like this (for sourceview-sys):

[package]
name = "gtk-source-sys"
version = "0.0.1"
links = "gtk_source"
build = "build.rs"

[lib]
name = "gtk_source_sys"

[dependencies]
libc = "0.2"

[dependencies.cairo-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.gdk-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.gdk_pixbuf-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.gio-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.glib-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.gobject-sys]
git = "https://github.com/gtk-rs/sys"

[dependencies.gtk-sys]
git = "https://github.com/gtk-rs/sys"

[build-dependencies]
pkg-config = "0.3.7"

[dev-dependencies]
shell-words = "0.1.0"
tempdir = "0.3"

[features]
v2_0 = []
v2_2 = ["v2_0"]
v2_4 = ["v2_2"]
v2_8 = ["v2_4"]
v2_10 = ["v2_8"]
v2_12 = ["v2_10"]
v3_0 = ["v2_12"]
v3_4 = ["v3_0"]
v3_8 = ["v3_4"]
v3_10 = ["v3_8"]
v3_12 = ["v3_10"]
v3_14 = ["v3_12"]
v3_16 = ["v3_14"]
v3_18 = ["v3_16"]
v3_20 = ["v3_18"]
v3_22 = ["v3_20"]
v3_24 = ["v3_22"]
dox = []

cc @EPashkin @sdroege

@sdroege

This comment has been minimized.

Copy link
Member

commented May 9, 2019

What exactly does it change?

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

commented May 9, 2019

It forces to keep the order of the different toml sections (used in our case to generate the Cargo.toml file) and improve a bit the different dependencies.

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:update-sys-cargo branch from 58d082f to 86bc8bf May 9, 2019

@sdroege

This comment has been minimized.

Copy link
Member

commented May 9, 2019

Sounds good

@EPashkin

This comment has been minimized.

Copy link
Member

commented May 9, 2019

IMHO in fill_empty fixing package names unneeded as it called only for new packages,
it better done manually when needed.
better only leave version change

@GuillaumeGomez GuillaumeGomez referenced this pull request May 10, 2019

Merged

Gir tutorial #108

format!("gdk-pixbuf-sys")
} else {
format!("{}-sys", ext_lib.crate_name)
};

This comment has been minimized.

Copy link
@EPashkin

EPashkin May 10, 2019

Member

@GuillaumeGomez You still want this and next parts?

This comment has been minimized.

Copy link
@GuillaumeGomez

GuillaumeGomez May 10, 2019

Author Member

Yes. You see an issue with them?

This comment has been minimized.

Copy link
@EPashkin

EPashkin May 10, 2019

Member

This function called only for new crates,
it too linked with gtk-rs,
and IMHO will be changed manually in most cases.
So it not bad but just unneeded.

This comment has been minimized.

Copy link
@GuillaumeGomez

GuillaumeGomez May 10, 2019

Author Member

Those crates are specific to gtk-rs anyway. I prefer having them generated nicely instead of the current output.

This comment has been minimized.

Copy link
@EPashkin

EPashkin May 10, 2019

Member

Then I merge

This comment has been minimized.

Copy link
@GuillaumeGomez

GuillaumeGomez May 10, 2019

Author Member

Thanks! :)

@EPashkin EPashkin merged commit 461bb81 into gtk-rs:master May 10, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:update-sys-cargo branch May 10, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.