diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/rust/.gitlab-ci.yml index 546caa93..7bcb7044 100644 --- a/rust-bindings/rust/.gitlab-ci.yml +++ b/rust-bindings/rust/.gitlab-ci.yml @@ -12,20 +12,20 @@ stages: - build - publish -# libostree-sys -libostree-sys: +# ostree-sys +ostree-sys: stage: build script: - cargo test --verbose --manifest-path sys/Cargo.toml --all-features -libostree-sys_nightly: +ostree-sys_nightly: stage: build image: rustlang/rust:nightly script: - cargo test --verbose --manifest-path sys/Cargo.toml --all-features allow_failure: true -publish_libostree-sys: +publish_ostree-sys: stage: publish script: - cargo publish --verbose --manifest-path sys/Cargo.toml --token $CRATES_IO_TOKEN diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/rust/Cargo.toml index 154453df..99ad529c 100644 --- a/rust-bindings/rust/Cargo.toml +++ b/rust-bindings/rust/Cargo.toml @@ -36,28 +36,28 @@ gio = "0.5" glib-sys = "0.7" gobject-sys = "0.7" gio-sys = "0.7" -libostree-sys = { version = "0.2", path = "sys" } +ostree-sys = { version = "0.2", path = "sys" } [dev-dependencies] tempfile = "3" [features] -dox = ["libostree-sys/dox"] -v2014_9 = ["libostree-sys/v2014_9"] -v2015_7 = ["v2014_9", "libostree-sys/v2015_7"] -v2017_3 = ["v2015_7", "libostree-sys/v2017_3"] -v2017_4 = ["v2017_3", "libostree-sys/v2017_4"] -v2017_6 = ["v2017_4", "libostree-sys/v2017_6"] -v2017_7 = ["v2017_6", "libostree-sys/v2017_7"] -v2017_8 = ["v2017_7", "libostree-sys/v2017_8"] -v2017_9 = ["v2017_8", "libostree-sys/v2017_9"] -v2017_10 = ["v2017_9", "libostree-sys/v2017_10"] -v2017_11 = ["v2017_10", "libostree-sys/v2017_11"] -v2017_12 = ["v2017_11", "libostree-sys/v2017_12"] -v2017_13 = ["v2017_12", "libostree-sys/v2017_13"] -v2017_15 = ["v2017_13", "libostree-sys/v2017_15"] -v2018_2 = ["v2017_15", "libostree-sys/v2018_2"] -v2018_3 = ["v2018_2", "libostree-sys/v2018_3"] -v2018_5 = ["v2018_3", "libostree-sys/v2018_5"] -v2018_6 = ["v2018_5", "libostree-sys/v2018_6"] -v2018_7 = ["v2018_6", "libostree-sys/v2018_7"] +dox = ["ostree-sys/dox"] +v2014_9 = ["ostree-sys/v2014_9"] +v2015_7 = ["v2014_9", "ostree-sys/v2015_7"] +v2017_3 = ["v2015_7", "ostree-sys/v2017_3"] +v2017_4 = ["v2017_3", "ostree-sys/v2017_4"] +v2017_6 = ["v2017_4", "ostree-sys/v2017_6"] +v2017_7 = ["v2017_6", "ostree-sys/v2017_7"] +v2017_8 = ["v2017_7", "ostree-sys/v2017_8"] +v2017_9 = ["v2017_8", "ostree-sys/v2017_9"] +v2017_10 = ["v2017_9", "ostree-sys/v2017_10"] +v2017_11 = ["v2017_10", "ostree-sys/v2017_11"] +v2017_12 = ["v2017_11", "ostree-sys/v2017_12"] +v2017_13 = ["v2017_12", "ostree-sys/v2017_13"] +v2017_15 = ["v2017_13", "ostree-sys/v2017_15"] +v2018_2 = ["v2017_15", "ostree-sys/v2018_2"] +v2018_3 = ["v2018_2", "ostree-sys/v2018_3"] +v2018_5 = ["v2018_3", "ostree-sys/v2018_5"] +v2018_6 = ["v2018_5", "ostree-sys/v2018_6"] +v2018_7 = ["v2018_6", "ostree-sys/v2018_7"] diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile index 9ce83e1a..e0858033 100644 --- a/rust-bindings/rust/Makefile +++ b/rust-bindings/rust/Makefile @@ -1,4 +1,4 @@ -all: gir/libostree gir/libostree-sys +all: gir/libostree gir/ostree-sys .PHONY: update-gir-files diff --git a/rust-bindings/rust/README.md b/rust-bindings/rust/README.md index 3ed45dc9..95823f3b 100644 --- a/rust-bindings/rust/README.md +++ b/rust-bindings/rust/README.md @@ -41,7 +41,7 @@ features = ["v2018_7"] ``` ## Developing -The `libostree` and `libostree-sys` crates can be built and tested using regular +The `libostree` and `ostree-sys` crates can be built and tested using regular Cargo commands. ### Generated code @@ -50,7 +50,7 @@ Most code is generated based on the gir files using the the included Makefile: ```ShellSession -$ make gir/libostree gir/libostree-sys +$ make gir/libostree gir/ostree-sys ``` Run the following command to update the bundled gir files: diff --git a/rust-bindings/rust/conf/libostree-sys.toml b/rust-bindings/rust/conf/ostree-sys.toml similarity index 100% rename from rust-bindings/rust/conf/libostree-sys.toml rename to rust-bindings/rust/conf/ostree-sys.toml diff --git a/rust-bindings/rust/src/lib.rs b/rust-bindings/rust/src/lib.rs index a32a211a..12b99db1 100644 --- a/rust-bindings/rust/src/lib.rs +++ b/rust-bindings/rust/src/lib.rs @@ -1,7 +1,7 @@ extern crate gio_sys as gio_ffi; extern crate glib_sys as glib_ffi; extern crate gobject_sys as gobject_ffi; -extern crate libostree_sys as ffi; +extern crate ostree_sys as ffi; #[macro_use] extern crate glib; extern crate gio; diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml index 17d9f53e..e13672bf 100644 --- a/rust-bindings/rust/sys/Cargo.toml +++ b/rust-bindings/rust/sys/Cargo.toml @@ -36,18 +36,18 @@ v2018_6 = ["v2018_5"] v2018_7 = ["v2018_6"] [lib] -name = "libostree_sys" +name = "ostree_sys" [package] authors = ["Felix Krull"] build = "build.rs" categories = ["external-ffi-bindings"] description = "FFI bindings to libostree-1" -documentation = "https://fkrull.gitlab.io/ostree-rs/libostree_sys" +documentation = "https://fkrull.gitlab.io/ostree-rs/ostree_sys" keywords = ["ffi", "ostree", "libostree"] license = "MIT" links = "ostree-1" -name = "libostree-sys" +name = "ostree-sys" repository = "https://gitlab.com/fkrull/ostree-rs" version = "0.2.0" [package.metadata.docs.rs] diff --git a/rust-bindings/rust/sys/tests/abi.rs b/rust-bindings/rust/sys/tests/abi.rs index 4e9bb10c..25bb819b 100644 --- a/rust-bindings/rust/sys/tests/abi.rs +++ b/rust-bindings/rust/sys/tests/abi.rs @@ -2,7 +2,7 @@ // from gir-files (https://github.com/gtk-rs/gir-files @ ???) // DO NOT EDIT -extern crate libostree_sys; +extern crate ostree_sys; extern crate shell_words; extern crate tempdir; use std::env; @@ -11,7 +11,7 @@ use std::path::Path; use std::mem::{align_of, size_of}; use std::process::Command; use std::str; -use libostree_sys::*; +use ostree_sys::*; static PACKAGES: &[&str] = &["ostree-1"];