From 0014698a597685813e350ed6f0190e661edcd5d7 Mon Sep 17 00:00:00 2001 From: WangJiangtong Date: Fri, 7 Jul 2023 15:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20cloud=20extension=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/rust_proj_mock.iml | 5 +++++ Cargo.lock | 12 ++-------- cloudExtension/Cargo.toml | 9 -------- cloudExtension/src/lib.rs | 14 ------------ .../Cargo.lock | 0 cloud_extension/Cargo.toml | 22 +++++++++++++++++++ cloud_extension/README.md | 0 cloud_extension/README_zh.md | 0 cloud_extension/include/cloud_extension.h | 0 cloud_extension/src/c_adapter/mod.rs | 0 cloud_extension/src/ipc_conn/error.rs | 0 cloud_extension/src/ipc_conn/mod.rs | 2 ++ cloud_extension/src/ipc_conn/types.rs | 0 cloud_extension/src/lib.rs | 9 ++++++++ .../src/service_impl/asset_loader.rs | 0 cloud_extension/src/service_impl/cloud_db.rs | 0 .../src/service_impl/cloud_service.rs | 0 cloud_extension/src/service_impl/error.rs | 0 cloud_extension/src/service_impl/mod.rs | 4 ++++ 19 files changed, 44 insertions(+), 33 deletions(-) delete mode 100644 cloudExtension/Cargo.toml delete mode 100644 cloudExtension/src/lib.rs rename {cloudExtension => cloud_extension}/Cargo.lock (100%) create mode 100644 cloud_extension/Cargo.toml create mode 100644 cloud_extension/README.md create mode 100644 cloud_extension/README_zh.md create mode 100644 cloud_extension/include/cloud_extension.h create mode 100644 cloud_extension/src/c_adapter/mod.rs create mode 100644 cloud_extension/src/ipc_conn/error.rs create mode 100644 cloud_extension/src/ipc_conn/mod.rs create mode 100644 cloud_extension/src/ipc_conn/types.rs create mode 100644 cloud_extension/src/lib.rs create mode 100644 cloud_extension/src/service_impl/asset_loader.rs create mode 100644 cloud_extension/src/service_impl/cloud_db.rs create mode 100644 cloud_extension/src/service_impl/cloud_service.rs create mode 100644 cloud_extension/src/service_impl/error.rs create mode 100644 cloud_extension/src/service_impl/mod.rs diff --git a/.idea/rust_proj_mock.iml b/.idea/rust_proj_mock.iml index c254557..b89b3ff 100644 --- a/.idea/rust_proj_mock.iml +++ b/.idea/rust_proj_mock.iml @@ -2,6 +2,11 @@ + + + + + diff --git a/Cargo.lock b/Cargo.lock index f262052..6b3b84c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,9 +3,10 @@ version = 3 [[package]] -name = "cloudExtension" +name = "cloud_extension" version = "0.1.0" dependencies = [ + "hilog_rust", "ipc_rust", ] @@ -19,12 +20,3 @@ version = "0.1.0" dependencies = [ "hilog_rust", ] - -[[package]] -name = "rust_proj_mock" -version = "0.1.0" -dependencies = [ - "cloudExtension", - "hilog_rust", - "ipc_rust", -] diff --git a/cloudExtension/Cargo.toml b/cloudExtension/Cargo.toml deleted file mode 100644 index 2d07c82..0000000 --- a/cloudExtension/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "cloudExtension" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -ipc_rust = {path = "../ipc_rust", version = "0.1.0"} \ No newline at end of file diff --git a/cloudExtension/src/lib.rs b/cloudExtension/src/lib.rs deleted file mode 100644 index 7d12d9a..0000000 --- a/cloudExtension/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -pub fn add(left: usize, right: usize) -> usize { - left + right -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn it_works() { - let result = add(2, 2); - assert_eq!(result, 4); - } -} diff --git a/cloudExtension/Cargo.lock b/cloud_extension/Cargo.lock similarity index 100% rename from cloudExtension/Cargo.lock rename to cloud_extension/Cargo.lock diff --git a/cloud_extension/Cargo.toml b/cloud_extension/Cargo.toml new file mode 100644 index 0000000..cd717be --- /dev/null +++ b/cloud_extension/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "cloud_extension" +version = "1.0.0" +edition = "2021" +description = "Cloud and Local End Synchronization General Implementation in Rust. Belong to OH Distributed Data Service." +license = "Apache-2.0" +repository = "https://gitee.com/openharmony-sig/commonlibrary_rust_ylong_runtime" +keywords = ["cloud", "distributeddataservice"] + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[lib] +name = "cloud_extension" +crate-type = ["cdylib", "staticlib", "lib"] + +[features] +default = [] +c_adapter = [] + +[dependencies] +ipc_rust = {path = "../ipc_rust", version = "0.1.0"} +hilog_rust = { path = "../hilog_rust", version = "0.1.0" } \ No newline at end of file diff --git a/cloud_extension/README.md b/cloud_extension/README.md new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/README_zh.md b/cloud_extension/README_zh.md new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/include/cloud_extension.h b/cloud_extension/include/cloud_extension.h new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/c_adapter/mod.rs b/cloud_extension/src/c_adapter/mod.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/ipc_conn/error.rs b/cloud_extension/src/ipc_conn/error.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/ipc_conn/mod.rs b/cloud_extension/src/ipc_conn/mod.rs new file mode 100644 index 0000000..8d752fa --- /dev/null +++ b/cloud_extension/src/ipc_conn/mod.rs @@ -0,0 +1,2 @@ +mod types; +mod error; \ No newline at end of file diff --git a/cloud_extension/src/ipc_conn/types.rs b/cloud_extension/src/ipc_conn/types.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/lib.rs b/cloud_extension/src/lib.rs new file mode 100644 index 0000000..d7159e1 --- /dev/null +++ b/cloud_extension/src/lib.rs @@ -0,0 +1,9 @@ +#[cfg(feature = "c_adapter")] +pub mod c_adapter; +mod ipc_conn; +mod service_impl; + +pub use service_impl::*; + +// TODO: 可能改名 +pub use ipc_conn::IpcConfig; diff --git a/cloud_extension/src/service_impl/asset_loader.rs b/cloud_extension/src/service_impl/asset_loader.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/service_impl/cloud_db.rs b/cloud_extension/src/service_impl/cloud_db.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/service_impl/cloud_service.rs b/cloud_extension/src/service_impl/cloud_service.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/service_impl/error.rs b/cloud_extension/src/service_impl/error.rs new file mode 100644 index 0000000..e69de29 diff --git a/cloud_extension/src/service_impl/mod.rs b/cloud_extension/src/service_impl/mod.rs new file mode 100644 index 0000000..2c01c57 --- /dev/null +++ b/cloud_extension/src/service_impl/mod.rs @@ -0,0 +1,4 @@ +mod error; +mod asset_loader; +mod cloud_db; +mod cloud_service; \ No newline at end of file -- Gitee