From 4b58c9c687bb18ec676b07a4f5e8f772c8966ce6 Mon Sep 17 00:00:00 2001 From: jiyong Date: Wed, 19 Jan 2022 18:10:07 -0800 Subject: [PATCH] rename rpc to ipc Signed-off-by: jiyong --- dsoftbus/BUILD.gn | 2 +- dsoftbus/{rpc => ipcrpc_standard}/BUILD.gn | 8 ++++---- dsoftbus/{rpc => ipcrpc_standard}/Test.json | 0 .../entry}/src/main/config.json | 0 .../entry}/src/main/js/default/app.js | 0 .../entry}/src/main/js/default/i18n/en-US.json | 0 .../entry}/src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../entry}/src/main/js/default/pages/index/index.js | 0 .../entry}/src/main/js/default/test/List.test.js | 0 .../src/main/js/default/test/RpcJsunit.test.js | 0 .../src/main/resources/base/element/string.json | 0 .../entry}/src/main/resources/base/media/icon.png | Bin .../signature/openharmony_sx.p7b | Bin 15 files changed, 5 insertions(+), 5 deletions(-) rename dsoftbus/{rpc => ipcrpc_standard}/BUILD.gn (82%) rename dsoftbus/{rpc => ipcrpc_standard}/Test.json (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/config.json (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/app.js (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/i18n/en-US.json (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/i18n/zh-CN.json (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/pages/index/index.css (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/pages/index/index.hml (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/pages/index/index.js (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/test/List.test.js (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/js/default/test/RpcJsunit.test.js (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/resources/base/element/string.json (100%) rename dsoftbus/{rpc => ipcrpc_standard/entry}/src/main/resources/base/media/icon.png (100%) rename dsoftbus/{rpc => ipcrpc_standard}/signature/openharmony_sx.p7b (100%) diff --git a/dsoftbus/BUILD.gn b/dsoftbus/BUILD.gn index 461babcfd..3beaf89d4 100644 --- a/dsoftbus/BUILD.gn +++ b/dsoftbus/BUILD.gn @@ -16,6 +16,6 @@ import("//build/ohos_var.gni") group("dsoftbus") { testonly = true if (is_standard_system) { - deps = [ "rpc:ActsRpcJsTest" ] + deps = [ "ipcrpc_standard:ActsRpcJsTest" ] } } diff --git a/dsoftbus/rpc/BUILD.gn b/dsoftbus/ipcrpc_standard/BUILD.gn similarity index 82% rename from dsoftbus/rpc/BUILD.gn rename to dsoftbus/ipcrpc_standard/BUILD.gn index 8e8511196..2f64ac9fe 100644 --- a/dsoftbus/rpc/BUILD.gn +++ b/dsoftbus/ipcrpc_standard/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsRpcJsTest") { - hap_profile = "./src/main/config.json" + hap_profile = "./entry/src/main/config.json" deps = [ ":rpc_js_assets", ":rpc_js_resources", @@ -23,9 +23,9 @@ ohos_js_hap_suite("ActsRpcJsTest") { hap_name = "ActsRpcHapTest" } ohos_js_assets("rpc_js_assets") { - source_dir = "./src/main/js/default" + source_dir = "./entry/src/main/js/default" } ohos_resources("rpc_js_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/dsoftbus/rpc/Test.json b/dsoftbus/ipcrpc_standard/Test.json similarity index 100% rename from dsoftbus/rpc/Test.json rename to dsoftbus/ipcrpc_standard/Test.json diff --git a/dsoftbus/rpc/src/main/config.json b/dsoftbus/ipcrpc_standard/entry/src/main/config.json similarity index 100% rename from dsoftbus/rpc/src/main/config.json rename to dsoftbus/ipcrpc_standard/entry/src/main/config.json diff --git a/dsoftbus/rpc/src/main/js/default/app.js b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/app.js similarity index 100% rename from dsoftbus/rpc/src/main/js/default/app.js rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/app.js diff --git a/dsoftbus/rpc/src/main/js/default/i18n/en-US.json b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from dsoftbus/rpc/src/main/js/default/i18n/en-US.json rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/en-US.json diff --git a/dsoftbus/rpc/src/main/js/default/i18n/zh-CN.json b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from dsoftbus/rpc/src/main/js/default/i18n/zh-CN.json rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/zh-CN.json diff --git a/dsoftbus/rpc/src/main/js/default/pages/index/index.css b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from dsoftbus/rpc/src/main/js/default/pages/index/index.css rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.css diff --git a/dsoftbus/rpc/src/main/js/default/pages/index/index.hml b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from dsoftbus/rpc/src/main/js/default/pages/index/index.hml rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.hml diff --git a/dsoftbus/rpc/src/main/js/default/pages/index/index.js b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from dsoftbus/rpc/src/main/js/default/pages/index/index.js rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.js diff --git a/dsoftbus/rpc/src/main/js/default/test/List.test.js b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/test/List.test.js similarity index 100% rename from dsoftbus/rpc/src/main/js/default/test/List.test.js rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/test/List.test.js diff --git a/dsoftbus/rpc/src/main/js/default/test/RpcJsunit.test.js b/dsoftbus/ipcrpc_standard/entry/src/main/js/default/test/RpcJsunit.test.js similarity index 100% rename from dsoftbus/rpc/src/main/js/default/test/RpcJsunit.test.js rename to dsoftbus/ipcrpc_standard/entry/src/main/js/default/test/RpcJsunit.test.js diff --git a/dsoftbus/rpc/src/main/resources/base/element/string.json b/dsoftbus/ipcrpc_standard/entry/src/main/resources/base/element/string.json similarity index 100% rename from dsoftbus/rpc/src/main/resources/base/element/string.json rename to dsoftbus/ipcrpc_standard/entry/src/main/resources/base/element/string.json diff --git a/dsoftbus/rpc/src/main/resources/base/media/icon.png b/dsoftbus/ipcrpc_standard/entry/src/main/resources/base/media/icon.png similarity index 100% rename from dsoftbus/rpc/src/main/resources/base/media/icon.png rename to dsoftbus/ipcrpc_standard/entry/src/main/resources/base/media/icon.png diff --git a/dsoftbus/rpc/signature/openharmony_sx.p7b b/dsoftbus/ipcrpc_standard/signature/openharmony_sx.p7b similarity index 100% rename from dsoftbus/rpc/signature/openharmony_sx.p7b rename to dsoftbus/ipcrpc_standard/signature/openharmony_sx.p7b -- GitLab