From ced47cbb26df7332f6332ef5528883b08daa5b35 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Sat, 20 Oct 2018 11:59:07 +0200 Subject: [PATCH] Move main crate into repo root --- rust-bindings/rust/Cargo.toml | 64 ++++++++++++++++++- rust-bindings/rust/conf/libostree.toml | 2 +- rust-bindings/rust/libostree/Cargo.toml | 56 ---------------- .../src/auto/async_progress.rs | 0 .../src/auto/collection_ref.rs | 0 .../{libostree => }/src/auto/constants.rs | 0 .../rust/{libostree => }/src/auto/enums.rs | 0 .../rust/{libostree => }/src/auto/flags.rs | 0 .../{libostree => }/src/auto/functions.rs | 0 .../src/auto/gpg_verify_result.rs | 0 .../rust/{libostree => }/src/auto/mod.rs | 0 .../{libostree => }/src/auto/mutable_tree.rs | 0 .../rust/{libostree => }/src/auto/remote.rs | 0 .../rust/{libostree => }/src/auto/repo.rs | 0 .../src/auto/repo_commit_modifier.rs | 0 .../src/auto/repo_dev_ino_cache.rs | 0 .../{libostree => }/src/auto/repo_file.rs | 0 .../src/auto/repo_transaction_stats.rs | 0 .../{libostree => }/src/auto/se_policy.rs | 0 rust-bindings/rust/{libostree => }/src/lib.rs | 0 .../rust/{libostree => }/src/object_name.rs | 0 .../rust/{libostree => }/src/repo.rs | 0 .../rust/{libostree => }/tests/roundtrip.rs | 0 23 files changed, 62 insertions(+), 60 deletions(-) delete mode 100644 rust-bindings/rust/libostree/Cargo.toml rename rust-bindings/rust/{libostree => }/src/auto/async_progress.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/collection_ref.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/constants.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/enums.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/flags.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/functions.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/gpg_verify_result.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/mod.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/mutable_tree.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/remote.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/repo.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/repo_commit_modifier.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/repo_dev_ino_cache.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/repo_file.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/repo_transaction_stats.rs (100%) rename rust-bindings/rust/{libostree => }/src/auto/se_policy.rs (100%) rename rust-bindings/rust/{libostree => }/src/lib.rs (100%) rename rust-bindings/rust/{libostree => }/src/object_name.rs (100%) rename rust-bindings/rust/{libostree => }/src/repo.rs (100%) rename rust-bindings/rust/{libostree => }/tests/roundtrip.rs (100%) diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/rust/Cargo.toml index f391e0a0..4f1c1a4f 100644 --- a/rust-bindings/rust/Cargo.toml +++ b/rust-bindings/rust/Cargo.toml @@ -1,5 +1,63 @@ -[workspace] -members = [ +[package] +name = "libostree" +version = "0.1.1" +authors = ["Felix Krull"] + +license = "MIT" +description = "Rust bindings for libostree" +keywords = ["ostree", "libostree"] + +documentation = "https://fkrull.gitlab.io/rust-libostree/libostree" +repository = "https://gitlab.com/fkrull/rust-libostree" +readme = "README.md" + +exclude = [ + "conf", + "gir-files", "libostree-sys", - "libostree" + ] + +[package.metadata.docs.rs] +features = ["dox"] + +[badges.gitlab] +repository = "fkrull/rust-libostree" + +[lib] +name = "libostree" + +[dependencies] +libc = "0.2" +bitflags = "1" +lazy_static = "1.1" +glib = "0.6" +gio = "0.5" +glib-sys = "0.7" +gobject-sys = "0.7" +gio-sys = "0.7" +libostree-sys = { version = "0.1", path = "libostree-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"] diff --git a/rust-bindings/rust/conf/libostree.toml b/rust-bindings/rust/conf/libostree.toml index 1b87167d..f76fd2f6 100644 --- a/rust-bindings/rust/conf/libostree.toml +++ b/rust-bindings/rust/conf/libostree.toml @@ -2,7 +2,7 @@ work_mode = "normal" library = "OSTree" version = "1.0" -target_path = "../libostree" +target_path = ".." doc_target_path = "../target/vendor.md" deprecate_by_min_version = true diff --git a/rust-bindings/rust/libostree/Cargo.toml b/rust-bindings/rust/libostree/Cargo.toml deleted file mode 100644 index 6d860011..00000000 --- a/rust-bindings/rust/libostree/Cargo.toml +++ /dev/null @@ -1,56 +0,0 @@ -[package] -name = "libostree" -version = "0.1.1" -authors = ["Felix Krull"] - -license = "MIT" -description = "Rust bindings for libostree" -keywords = ["ostree", "libostree"] - -documentation = "https://fkrull.gitlab.io/rust-libostree/libostree" -repository = "https://gitlab.com/fkrull/rust-libostree" -readme = "README.md" - -[package.metadata.docs.rs] -features = ["dox"] - -[badges.gitlab] -repository = "fkrull/rust-libostree" - -[lib] -name = "libostree" - -[dependencies] -libc = "0.2" -bitflags = "1" -lazy_static = "1.1" -glib = "0.6" -gio = "0.5" -glib-sys = "0.7" -gobject-sys = "0.7" -gio-sys = "0.7" -libostree-sys = { version = "0.1", path = "../libostree-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"] diff --git a/rust-bindings/rust/libostree/src/auto/async_progress.rs b/rust-bindings/rust/src/auto/async_progress.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/async_progress.rs rename to rust-bindings/rust/src/auto/async_progress.rs diff --git a/rust-bindings/rust/libostree/src/auto/collection_ref.rs b/rust-bindings/rust/src/auto/collection_ref.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/collection_ref.rs rename to rust-bindings/rust/src/auto/collection_ref.rs diff --git a/rust-bindings/rust/libostree/src/auto/constants.rs b/rust-bindings/rust/src/auto/constants.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/constants.rs rename to rust-bindings/rust/src/auto/constants.rs diff --git a/rust-bindings/rust/libostree/src/auto/enums.rs b/rust-bindings/rust/src/auto/enums.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/enums.rs rename to rust-bindings/rust/src/auto/enums.rs diff --git a/rust-bindings/rust/libostree/src/auto/flags.rs b/rust-bindings/rust/src/auto/flags.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/flags.rs rename to rust-bindings/rust/src/auto/flags.rs diff --git a/rust-bindings/rust/libostree/src/auto/functions.rs b/rust-bindings/rust/src/auto/functions.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/functions.rs rename to rust-bindings/rust/src/auto/functions.rs diff --git a/rust-bindings/rust/libostree/src/auto/gpg_verify_result.rs b/rust-bindings/rust/src/auto/gpg_verify_result.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/gpg_verify_result.rs rename to rust-bindings/rust/src/auto/gpg_verify_result.rs diff --git a/rust-bindings/rust/libostree/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/mod.rs rename to rust-bindings/rust/src/auto/mod.rs diff --git a/rust-bindings/rust/libostree/src/auto/mutable_tree.rs b/rust-bindings/rust/src/auto/mutable_tree.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/mutable_tree.rs rename to rust-bindings/rust/src/auto/mutable_tree.rs diff --git a/rust-bindings/rust/libostree/src/auto/remote.rs b/rust-bindings/rust/src/auto/remote.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/remote.rs rename to rust-bindings/rust/src/auto/remote.rs diff --git a/rust-bindings/rust/libostree/src/auto/repo.rs b/rust-bindings/rust/src/auto/repo.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/repo.rs rename to rust-bindings/rust/src/auto/repo.rs diff --git a/rust-bindings/rust/libostree/src/auto/repo_commit_modifier.rs b/rust-bindings/rust/src/auto/repo_commit_modifier.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/repo_commit_modifier.rs rename to rust-bindings/rust/src/auto/repo_commit_modifier.rs diff --git a/rust-bindings/rust/libostree/src/auto/repo_dev_ino_cache.rs b/rust-bindings/rust/src/auto/repo_dev_ino_cache.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/repo_dev_ino_cache.rs rename to rust-bindings/rust/src/auto/repo_dev_ino_cache.rs diff --git a/rust-bindings/rust/libostree/src/auto/repo_file.rs b/rust-bindings/rust/src/auto/repo_file.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/repo_file.rs rename to rust-bindings/rust/src/auto/repo_file.rs diff --git a/rust-bindings/rust/libostree/src/auto/repo_transaction_stats.rs b/rust-bindings/rust/src/auto/repo_transaction_stats.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/repo_transaction_stats.rs rename to rust-bindings/rust/src/auto/repo_transaction_stats.rs diff --git a/rust-bindings/rust/libostree/src/auto/se_policy.rs b/rust-bindings/rust/src/auto/se_policy.rs similarity index 100% rename from rust-bindings/rust/libostree/src/auto/se_policy.rs rename to rust-bindings/rust/src/auto/se_policy.rs diff --git a/rust-bindings/rust/libostree/src/lib.rs b/rust-bindings/rust/src/lib.rs similarity index 100% rename from rust-bindings/rust/libostree/src/lib.rs rename to rust-bindings/rust/src/lib.rs diff --git a/rust-bindings/rust/libostree/src/object_name.rs b/rust-bindings/rust/src/object_name.rs similarity index 100% rename from rust-bindings/rust/libostree/src/object_name.rs rename to rust-bindings/rust/src/object_name.rs diff --git a/rust-bindings/rust/libostree/src/repo.rs b/rust-bindings/rust/src/repo.rs similarity index 100% rename from rust-bindings/rust/libostree/src/repo.rs rename to rust-bindings/rust/src/repo.rs diff --git a/rust-bindings/rust/libostree/tests/roundtrip.rs b/rust-bindings/rust/tests/roundtrip.rs similarity index 100% rename from rust-bindings/rust/libostree/tests/roundtrip.rs rename to rust-bindings/rust/tests/roundtrip.rs