Skip to content

Commit 578e945

Browse files
committed
Use gdextension_api single crate
1 parent 4c8ea83 commit 578e945

File tree

2 files changed

+32
-51
lines changed

2 files changed

+32
-51
lines changed

godot-bindings/Cargo.toml

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,29 @@ homepage = "https://godot-rust.github.io"
1616
# The artifact generator explicitly excludes that though (to avoid a quasi-circular dependency back to its repo).
1717
[features]
1818
# [version-sync] [[
19-
# [line] api-$kebabVersion = ["dep:prebuilt-$kebabVersion"]
20-
api-4-0 = ["dep:prebuilt-4-0"]
21-
api-4-0-1 = ["dep:prebuilt-4-0-1"]
22-
api-4-0-2 = ["dep:prebuilt-4-0-2"]
23-
api-4-0-3 = ["dep:prebuilt-4-0-3"]
24-
api-4-0-4 = ["dep:prebuilt-4-0-4"]
25-
api-4-1 = ["dep:prebuilt-4-1"]
26-
api-4-1-1 = ["dep:prebuilt-4-1-1"]
27-
api-4-1-2 = ["dep:prebuilt-4-1-2"]
28-
api-4-1-3 = ["dep:prebuilt-4-1-3"]
29-
api-4-1-4 = ["dep:prebuilt-4-1-4"]
30-
api-4-2 = ["dep:prebuilt-4-2"]
31-
api-4-2-1 = ["dep:prebuilt-4-2-1"]
32-
api-4-2-2 = ["dep:prebuilt-4-2-2"]
19+
# [line] api-$kebabVersion = []
20+
api-4-0 = []
21+
api-4-0-1 = []
22+
api-4-0-2 = []
23+
api-4-0-3 = []
24+
api-4-0-4 = []
25+
api-4-1 = []
26+
api-4-1-1 = []
27+
api-4-1-2 = []
28+
api-4-1-3 = []
29+
api-4-1-4 = []
30+
api-4-2 = []
31+
api-4-2-1 = []
32+
api-4-2-2 = []
3333
# ]]
3434

35-
# [version-sync] [[
36-
# [include] current.minor
37-
# [line] default = ["dep:prebuilt-$kebabVersion"]
38-
default = ["dep:prebuilt-4-2"]
39-
# ]]
35+
default = []
4036

4137
api-custom = ["dep:bindgen", "dep:regex", "dep:which"]
4238
api-custom-extheader = []
4339

4440
[dependencies]
45-
# [version-sync] [[
46-
# [line] prebuilt-$kebabVersion = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "$dotVersion" }
47-
prebuilt-4-0 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0" }
48-
prebuilt-4-0-1 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.1" }
49-
prebuilt-4-0-2 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.2" }
50-
prebuilt-4-0-3 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.3" }
51-
prebuilt-4-0-4 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.0.4" }
52-
prebuilt-4-1 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.1" }
53-
prebuilt-4-1-1 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.1.1" }
54-
prebuilt-4-1-2 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.1.2" }
55-
prebuilt-4-1-3 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.1.3" }
56-
prebuilt-4-1-4 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.1.4" }
57-
prebuilt-4-2 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.2" }
58-
prebuilt-4-2-1 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.2.1" }
59-
prebuilt-4-2-2 = { optional = true, package = "gdextension-api", git = "https://github.com/godot-rust/godot4-prebuilt", branch = "4.2.2" }
60-
# ]]
41+
gdextension-api = { git = "https://github.com/godot-rust/godot4-prebuilt", branch = "releases" }
6142

6243
# Do not use bindgen 0.69, it contains regression that forces recompilation of code.
6344
bindgen = { optional = true, version = "0.68", default-features = false, features = ["runtime"] }

godot-bindings/src/import.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,45 +33,45 @@ pub const ALL_VERSIONS: &[(u8, u8, u8)] = &[
3333
];
3434

3535
// [version-sync] [[
36-
// [line] #[cfg(feature = "api-$kebabVersion")]\npub use prebuilt_$snakeVersion as prebuilt;\n
36+
// [line] #[cfg(feature = "api-$kebabVersion")]\npub use gdextension_api::version_$snakeVersion as prebuilt;\n
3737
#[cfg(feature = "api-4-0")]
38-
pub use prebuilt_4_0 as prebuilt;
38+
pub use gdextension_api::version_4_0 as prebuilt;
3939

4040
#[cfg(feature = "api-4-0-1")]
41-
pub use prebuilt_4_0_1 as prebuilt;
41+
pub use gdextension_api::version_4_0_1 as prebuilt;
4242

4343
#[cfg(feature = "api-4-0-2")]
44-
pub use prebuilt_4_0_2 as prebuilt;
44+
pub use gdextension_api::version_4_0_2 as prebuilt;
4545

4646
#[cfg(feature = "api-4-0-3")]
47-
pub use prebuilt_4_0_3 as prebuilt;
47+
pub use gdextension_api::version_4_0_3 as prebuilt;
4848

4949
#[cfg(feature = "api-4-0-4")]
50-
pub use prebuilt_4_0_4 as prebuilt;
50+
pub use gdextension_api::version_4_0_4 as prebuilt;
5151

5252
#[cfg(feature = "api-4-1")]
53-
pub use prebuilt_4_1 as prebuilt;
53+
pub use gdextension_api::version_4_1 as prebuilt;
5454

5555
#[cfg(feature = "api-4-1-1")]
56-
pub use prebuilt_4_1_1 as prebuilt;
56+
pub use gdextension_api::version_4_1_1 as prebuilt;
5757

5858
#[cfg(feature = "api-4-1-2")]
59-
pub use prebuilt_4_1_2 as prebuilt;
59+
pub use gdextension_api::version_4_1_2 as prebuilt;
6060

6161
#[cfg(feature = "api-4-1-3")]
62-
pub use prebuilt_4_1_3 as prebuilt;
62+
pub use gdextension_api::version_4_1_3 as prebuilt;
6363

6464
#[cfg(feature = "api-4-1-4")]
65-
pub use prebuilt_4_1_4 as prebuilt;
65+
pub use gdextension_api::version_4_1_4 as prebuilt;
6666

6767
#[cfg(feature = "api-4-2")]
68-
pub use prebuilt_4_2 as prebuilt;
68+
pub use gdextension_api::version_4_2 as prebuilt;
6969

7070
#[cfg(feature = "api-4-2-1")]
71-
pub use prebuilt_4_2_1 as prebuilt;
71+
pub use gdextension_api::version_4_2_1 as prebuilt;
7272

7373
#[cfg(feature = "api-4-2-2")]
74-
pub use prebuilt_4_2_2 as prebuilt;
74+
pub use gdextension_api::version_4_2_2 as prebuilt;
7575

7676
// ]]
7777

@@ -101,6 +101,6 @@ pub use prebuilt_4_2_2 as prebuilt;
101101

102102
// [version-sync] [[
103103
// [include] current.minor
104-
// [line] pub use prebuilt_$snakeVersion as prebuilt;
105-
pub use prebuilt_4_2 as prebuilt;
104+
// [line] pub use gdextension_api::version_$snakeVersion as prebuilt;
105+
pub use gdextension_api::version_4_2 as prebuilt;
106106
// ]]

0 commit comments

Comments
 (0)