From d0bf72d6f74412880802fc9c061a6875a5908de4 Mon Sep 17 00:00:00 2001 From: lichao Date: Thu, 25 Apr 2024 14:58:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- bundle.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 bundle.json diff --git a/bundle.json b/bundle.json new file mode 100644 index 00000000..d9925e7a --- /dev/null +++ b/bundle.json @@ -0,0 +1,40 @@ +{ + "name": "@ohos/rust", + "description": "This library provides a **safe** mechanism for calling C++ code from Rust and Rust code from C++", + "version": "3.1", + "license": "Apache License 2.0", + "publishAs": "code-segment", + "segment": { + "destPath": "third_party/rust/crates/cxx" + }, + "dirs": {}, + "scripts": {}, + "licensePath": "LICENSE-APACHE", + "readmePath": { + "en": "README" + }, + "component": { + "name": "rust", + "subsystem": "thirdparty", + "syscap": [], + "features": [], + "adapted_system_type": ["mini", "small", "standard"], + "rom": "", + "ram": "", + "build": { + "sub_component": [], + "inner_kits": [ + { + "name" : "//third_party/rust/crates/cxx:cxx_cppdeps" + }, + { + "name" : "//third_party/rust/crates/cxx:lib" + }, + { + "name": "//third_party/rust/crates/cxx/gen/cmd:cxxbridge" + } + ], + "test": [] + } + } +} -- Gitee From 6bbc75062129b3af96b40b8ab64735ecabee1705 Mon Sep 17 00:00:00 2001 From: lichao Date: Thu, 25 Apr 2024 16:27:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- bundle.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index d9925e7a..4bd13522 100644 --- a/bundle.json +++ b/bundle.json @@ -1,11 +1,11 @@ { "name": "@ohos/rust", "description": "This library provides a **safe** mechanism for calling C++ code from Rust and Rust code from C++", - "version": "3.1", + "version": "4.0", "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "third_party/rust/crates/cxx" + "destPath": "third_party/rust/rust" }, "dirs": {}, "scripts": {}, @@ -18,7 +18,7 @@ "subsystem": "thirdparty", "syscap": [], "features": [], - "adapted_system_type": ["mini", "small", "standard"], + "adapted_system_type": ["standard"], "rom": "", "ram": "", "build": { -- Gitee From 485d0d3daf613ed81e56a94b9957562358a63b8b Mon Sep 17 00:00:00 2001 From: lichao Date: Thu, 25 Apr 2024 16:28:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- bundle.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 4bd13522..bcd66459 100644 --- a/bundle.json +++ b/bundle.json @@ -1,5 +1,5 @@ { - "name": "@ohos/rust", + "name": "@ohos/rust_cxx", "description": "This library provides a **safe** mechanism for calling C++ code from Rust and Rust code from C++", "version": "4.0", "license": "Apache License 2.0", @@ -14,7 +14,7 @@ "en": "README" }, "component": { - "name": "rust", + "name": "rust_cxx", "subsystem": "thirdparty", "syscap": [], "features": [], -- Gitee From c0aecdb2d92ca0ec26bd328c91f4c0ac07c2c98a Mon Sep 17 00:00:00 2001 From: lichao Date: Thu, 25 Apr 2024 16:31:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bundle.json=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lichao --- bundle.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index bcd66459..9ba2c523 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "third_party/rust/rust" + "destPath": "third_party/rust/crates/cxx" }, "dirs": {}, "scripts": {}, @@ -18,7 +18,7 @@ "subsystem": "thirdparty", "syscap": [], "features": [], - "adapted_system_type": ["standard"], + "adapted_system_type": ["mini", "small", "standard"], "rom": "", "ram": "", "build": { -- Gitee