You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2023/08/29 17:38:46 UTC
[celix] 04/13: #599: Move Celix rust api to a separate rust lib
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/599-provide-and-use-c-service-in-rust
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4c14d8cab191e9c1b7955f75a04353e6e06d2a0e
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Sun Aug 20 16:48:57 2023 +0200
#599: Move Celix rust api to a separate rust lib
---
misc/experimental/rust/Cargo.toml | 1 +
misc/experimental/rust/{ => celix}/Cargo.toml | 18 ++++++++++++------
.../src/celix => celix/src}/bundle_activator.rs | 0
.../src/celix => celix/src}/bundle_context.rs | 0
.../{celix_bindings/src/celix => celix/src}/errno.rs | 0
.../src/celix => celix/src}/log_helper.rs | 0
.../{celix_bindings/src/celix => celix/src}/mod.rs | 0
misc/experimental/rust/celix_bindings/src/lib.rs | 2 --
8 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/misc/experimental/rust/Cargo.toml b/misc/experimental/rust/Cargo.toml
index 891c8dd6..d6679dd3 100644
--- a/misc/experimental/rust/Cargo.toml
+++ b/misc/experimental/rust/Cargo.toml
@@ -18,6 +18,7 @@
[workspace]
members = [
"celix_bindings",
+ "celix",
"hello_world_activator",
#"rust_shell_tui",
]
diff --git a/misc/experimental/rust/Cargo.toml b/misc/experimental/rust/celix/Cargo.toml
similarity index 81%
copy from misc/experimental/rust/Cargo.toml
copy to misc/experimental/rust/celix/Cargo.toml
index 891c8dd6..d81416c8 100644
--- a/misc/experimental/rust/Cargo.toml
+++ b/misc/experimental/rust/celix/Cargo.toml
@@ -15,9 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-[workspace]
-members = [
- "celix_bindings",
- "hello_world_activator",
- #"rust_shell_tui",
-]
+[package]
+name = "celixs"
+version = "0.0.1"
+
+[build-dependencies]
+celix_bindings = { path = "../celix_bindings" }
+
+
+[lib]
+name = "bindings"
+path = "src/lib.rs"
+crate-type = ["rlib"]
diff --git a/misc/experimental/rust/celix_bindings/src/celix/bundle_activator.rs b/misc/experimental/rust/celix/src/bundle_activator.rs
similarity index 100%
rename from misc/experimental/rust/celix_bindings/src/celix/bundle_activator.rs
rename to misc/experimental/rust/celix/src/bundle_activator.rs
diff --git a/misc/experimental/rust/celix_bindings/src/celix/bundle_context.rs b/misc/experimental/rust/celix/src/bundle_context.rs
similarity index 100%
rename from misc/experimental/rust/celix_bindings/src/celix/bundle_context.rs
rename to misc/experimental/rust/celix/src/bundle_context.rs
diff --git a/misc/experimental/rust/celix_bindings/src/celix/errno.rs b/misc/experimental/rust/celix/src/errno.rs
similarity index 100%
rename from misc/experimental/rust/celix_bindings/src/celix/errno.rs
rename to misc/experimental/rust/celix/src/errno.rs
diff --git a/misc/experimental/rust/celix_bindings/src/celix/log_helper.rs b/misc/experimental/rust/celix/src/log_helper.rs
similarity index 100%
rename from misc/experimental/rust/celix_bindings/src/celix/log_helper.rs
rename to misc/experimental/rust/celix/src/log_helper.rs
diff --git a/misc/experimental/rust/celix_bindings/src/celix/mod.rs b/misc/experimental/rust/celix/src/mod.rs
similarity index 100%
rename from misc/experimental/rust/celix_bindings/src/celix/mod.rs
rename to misc/experimental/rust/celix/src/mod.rs
diff --git a/misc/experimental/rust/celix_bindings/src/lib.rs b/misc/experimental/rust/celix_bindings/src/lib.rs
index a07ac3ea..64fdba67 100644
--- a/misc/experimental/rust/celix_bindings/src/lib.rs
+++ b/misc/experimental/rust/celix_bindings/src/lib.rs
@@ -22,5 +22,3 @@ mod bindings {
include!(concat!(env!("OUT_DIR"), "/celix_bindings.rs"));
}
pub use bindings::*;
-
-pub mod celix;