From dc13645299df2ddfa77fde8e4072834fb0025e4f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 9 Jun 2022 14:53:06 -0400 Subject: [PATCH 1/3] rust-bindings: Fix repository reference Since the repo merge. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0489bc5f..da623f1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["ostree", "libostree"] license = "MIT" name = "ostree" readme = "README.md" -repository = "https://github.com/ostreedev/ostree-rs" +repository = "https://github.com/ostreedev/ostree" version = "0.14.0" exclude = [ From 61dd54f94091b2493afb1fa66e716acb7cd1aa15 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 9 Jun 2022 14:55:25 -0400 Subject: [PATCH 2/3] rust-bindings: use correct README.md I noticed at https://crates.io/crates/ostree/0.14.0 that the `README.md` was wrong... --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index da623f1e..561b4dec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" keywords = ["ostree", "libostree"] license = "MIT" name = "ostree" -readme = "README.md" +readme = "rust-bindings/README.md" repository = "https://github.com/ostreedev/ostree" version = "0.14.0" From d7802c27ddd6ffbb8c18cef459f5882a546499c0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 9 Jun 2022 14:59:44 -0400 Subject: [PATCH 3/3] rust-bindings: Update cargo package list When we did the merger, it turns out cargo by default is basically going to include all of stuff in the git repository root directory which is "libostree". We just want the stuff in `rust-bindings/`. I initially tried adding `include = "rust-bindings/"` but according to https://doc.rust-lang.org/cargo/reference/manifest.html#the-exclude-and-include-fields specifying `include` means that `exclude` is ignored, which is kind of annoying. Further, doing so *also* turns off the cargo automatic rules for handling e.g. `gitignore`. So for now I went with the approach of adding everything from the C library stuff into `exclude/`. --- Cargo.toml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 561b4dec..a52c27d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,11 +11,15 @@ repository = "https://github.com/ostreedev/ostree" version = "0.14.0" exclude = [ - "rust-bindings/conf/**", - "rust-bindings/gir-files/**", - "rust-bindings/sys/**", - ".gitlab-ci.yml", - "LICENSE.LGPL*", + "/*.am", "/apidoc", "/autogen.sh", "/bash", "/bsdiff", + "/build-aux", "/buildutil", "/*.mk", "/ci", "/coccinelle", + "/*.ac", "/docs", "/libglnx", "/man", "/manual-tests", + "/*.yml", "/*.doap", "/src", "/tests", + "/.github", "/.cci.jenkinsfile", "/.dir-locals.el", "/.editorconfig", + "/.vimrc", "/.copr", "/.packit.yaml", "/GNUmakefile", "TODO", + "/rust-bindings/conf/**", + "/rust-bindings/gir-files/**", + "/rust-bindings/sys/**", ] [package.metadata.docs.rs]