shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Remove version constants to fix build with different libostree versions

Browse Source
This commit is contained in:
Felix Krull 2019-05-16 19:44:58 +02:00 committed by Colin Walters
parent 16709027e1
commit 57645e91cb
8 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust-bindings/rust/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "libostree"
version = "0.1.1"
version = "0.2.0"
authors = ["Felix Krull"]
license = "MIT"
@ -36,7 +36,7 @@ gio = "0.5"
glib-sys = "0.7"
gobject-sys = "0.7"
gio-sys = "0.7"
libostree-sys = { version = "0.1", path = "sys" }
libostree-sys = { version = "0.2", path = "sys" }
[dev-dependencies]
tempfile = "3"

4
rust-bindings/rust/conf/libostree-sys.toml
View File

@ -19,6 +19,10 @@ ignore = [
"OSTree.LzmaDecompressorClass",
"OSTree.RepoFileEnumeratorClass",
"OSTree.RollsumMatches",
"OSTree.RELEASE_VERSION",
"OSTree.VERSION",
"OSTree.VERSION_S",
"OSTree.YEAR_VERSION",
]
girs_dir = "../gir-files"

4
rust-bindings/rust/conf/libostree.toml
View File

@ -99,3 +99,7 @@ status = "generate"
[[object.function]]
pattern = "cmp_checksum_bytes|checksum_inplace_to_bytes"
ignore = true
[[object.constant]]
pattern = "VERSION|VERSION_S|YEAR_VERSION|RELEASE_VERSION"
ignore = true

4
rust-bindings/rust/src/auto/constants.rs
View File

@ -55,7 +55,3 @@ lazy_static! {
lazy_static! {
pub static ref TREE_GVARIANT_STRING: &'static str = unsafe{CStr::from_ptr(ffi::OSTREE_TREE_GVARIANT_STRING).to_str().unwrap()};
}
#[cfg(any(feature = "v2017_4", feature = "dox"))]
lazy_static! {
pub static ref VERSION_S: &'static str = unsafe{CStr::from_ptr(ffi::OSTREE_VERSION_S).to_str().unwrap()};
}

2
rust-bindings/rust/src/auto/mod.rs
View File

@ -88,8 +88,6 @@ pub use self::constants::REPO_METADATA_REF;
pub use self::constants::SUMMARY_GVARIANT_STRING;
pub use self::constants::SUMMARY_SIG_GVARIANT_STRING;
pub use self::constants::TREE_GVARIANT_STRING;
#[cfg(any(feature = "v2017_4", feature = "dox"))]
pub use self::constants::VERSION_S;
#[doc(hidden)]
pub mod traits {

2
rust-bindings/rust/sys/Cargo.toml
View File

@ -49,6 +49,6 @@ license = "MIT"
links = "ostree-1"
name = "libostree-sys"
repository = "https://gitlab.com/fkrull/ostree-rs"
version = "0.1.5"
version = "0.2.0"
[package.metadata.docs.rs]
features = ["dox"]

4
rust-bindings/rust/sys/src/lib.rs
View File

@ -127,7 +127,6 @@ pub const OSTREE_FILEMETA_GVARIANT_STRING: *const c_char = b"(uuua(ayay))\0" as
pub const OSTREE_MAX_METADATA_SIZE: c_int = 10485760;
pub const OSTREE_MAX_METADATA_WARN_SIZE: c_int = 7340032;
pub const OSTREE_ORIGIN_TRANSIENT_GROUP: *const c_char = b"libostree-transient\0" as *const u8 as *const c_char;
pub const OSTREE_RELEASE_VERSION: c_int = 8;
pub const OSTREE_REPO_METADATA_REF: *const c_char = b"ostree-metadata\0" as *const u8 as *const c_char;
pub const OSTREE_SHA256_DIGEST_LEN: c_int = 32;
pub const OSTREE_SHA256_STRING_LEN: c_int = 64;
@ -135,9 +134,6 @@ pub const OSTREE_SUMMARY_GVARIANT_STRING: *const c_char = b"(a(s(taya{sv}))a{sv}
pub const OSTREE_SUMMARY_SIG_GVARIANT_STRING: *const c_char = b"a{sv}\0" as *const u8 as *const c_char;
pub const OSTREE_TIMESTAMP: c_int = 0;
pub const OSTREE_TREE_GVARIANT_STRING: *const c_char = b"(a(say)a(sayay))\0" as *const u8 as *const c_char;
pub const OSTREE_VERSION: c_double = 2018.800000;
pub const OSTREE_VERSION_S: *const c_char = b"2018.8\0" as *const u8 as *const c_char;
pub const OSTREE_YEAR_VERSION: c_int = 2018;
// Flags
pub type OstreeChecksumFlags = c_uint;

4
rust-bindings/rust/sys/tests/abi.rs
View File

@ -324,7 +324,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"),
("OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"),
("OSTREE_ORIGIN_TRANSIENT_GROUP", "libostree-transient"),
("OSTREE_RELEASE_VERSION", "8"),
("OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"),
("OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"),
("OSTREE_REPO_CHECKOUT_MODE_NONE", "0"),
@ -397,9 +396,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
("OSTREE_TIMESTAMP", "0"),
("OSTREE_TREE_GVARIANT_STRING", "(a(say)a(sayay))"),
("OSTREE_VERSION", "2018.800000"),
("OSTREE_VERSION_S", "2018.8"),
("OSTREE_YEAR_VERSION", "2018"),
];