From 6bfd3fd6051b1081cd921260197bc1e92e80996a Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Thu, 28 Apr 2022 10:08:38 +0800 Subject: [PATCH 1/3] dbms part Signed-off-by: changzheng6 --- distributed_bundle_framework/BUILD.gn | 25 +++++++++++++++++++ .../bundle.json | 7 +++--- distributed_bundle_framework/dbms.gni | 16 ++++++++++++ .../kits/js}/distributebundlemgr/BUILD.gn | 6 ++--- .../distributed_bundle_mgr.cpp | 0 .../distributed_bundle_mgr.h | 0 .../js}/distributebundlemgr/native_module.cpp | 0 .../services}/dbms/BUILD.gn | 2 +- .../services}/dbms/include/distributed_bms.h | 0 .../dbms/include/distributed_bms_host.h | 0 .../dbms/include/distributed_bms_interface.h | 0 .../dbms/include/distributed_bms_proxy.h | 0 .../services}/dbms/include/image_buffer.h | 0 .../services}/dbms/include/image_compress.h | 0 .../services}/dbms/sa_profile/402.xml | 0 .../services}/dbms/sa_profile/BUILD.gn | 0 .../dbms/sa_profile/distributedbms.cfg | 0 .../services}/dbms/src/distributed_bms.cpp | 0 .../dbms/src/distributed_bms_host.cpp | 0 .../dbms/src/distributed_bms_proxy.cpp | 0 .../services}/dbms/src/image_buffer.cpp | 0 .../services}/dbms/src/image_compress.cpp | 0 22 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 distributed_bundle_framework/BUILD.gn rename {services/dbms => distributed_bundle_framework}/bundle.json (76%) create mode 100644 distributed_bundle_framework/dbms.gni rename {kits/appkit/napi => distributed_bundle_framework/interfaces/kits/js}/distributebundlemgr/BUILD.gn (91%) rename {kits/appkit/napi => distributed_bundle_framework/interfaces/kits/js}/distributebundlemgr/distributed_bundle_mgr.cpp (100%) rename {kits/appkit/napi => distributed_bundle_framework/interfaces/kits/js}/distributebundlemgr/distributed_bundle_mgr.h (100%) rename {kits/appkit/napi => distributed_bundle_framework/interfaces/kits/js}/distributebundlemgr/native_module.cpp (100%) rename {services => distributed_bundle_framework/services}/dbms/BUILD.gn (98%) rename {services => distributed_bundle_framework/services}/dbms/include/distributed_bms.h (100%) rename {services => distributed_bundle_framework/services}/dbms/include/distributed_bms_host.h (100%) rename {services => distributed_bundle_framework/services}/dbms/include/distributed_bms_interface.h (100%) rename {services => distributed_bundle_framework/services}/dbms/include/distributed_bms_proxy.h (100%) rename {services => distributed_bundle_framework/services}/dbms/include/image_buffer.h (100%) rename {services => distributed_bundle_framework/services}/dbms/include/image_compress.h (100%) rename {services => distributed_bundle_framework/services}/dbms/sa_profile/402.xml (100%) rename {services => distributed_bundle_framework/services}/dbms/sa_profile/BUILD.gn (100%) rename {services => distributed_bundle_framework/services}/dbms/sa_profile/distributedbms.cfg (100%) rename {services => distributed_bundle_framework/services}/dbms/src/distributed_bms.cpp (100%) rename {services => distributed_bundle_framework/services}/dbms/src/distributed_bms_host.cpp (100%) rename {services => distributed_bundle_framework/services}/dbms/src/distributed_bms_proxy.cpp (100%) rename {services => distributed_bundle_framework/services}/dbms/src/image_buffer.cpp (100%) rename {services => distributed_bundle_framework/services}/dbms/src/image_compress.cpp (100%) diff --git a/distributed_bundle_framework/BUILD.gn b/distributed_bundle_framework/BUILD.gn new file mode 100644 index 0000000000..42f4c5e479 --- /dev/null +++ b/distributed_bundle_framework/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +group("jsapi_target") { + deps = [ "interfaces/kits/js/distributebundlemgr:jsapi_target" ] +} + +group("dbms_target") { + deps = [ + "services/dbms:dbms_target", + "services/dbms/sa_profile:distributedbms", + ] +} \ No newline at end of file diff --git a/services/dbms/bundle.json b/distributed_bundle_framework/bundle.json similarity index 76% rename from services/dbms/bundle.json rename to distributed_bundle_framework/bundle.json index f25e7dd5a6..ba758b0acb 100644 --- a/services/dbms/bundle.json +++ b/distributed_bundle_framework/bundle.json @@ -4,7 +4,7 @@ "version": "3.1", "license": "Apache 2.0", "segment": { - "destPath": "foundation/appexecfwk/standard/services/dbms" + "destPath": "foundation/appexecfwk/standard/distributed_bundle_framework" }, "component": { "name": "distributed_bundle_framework", @@ -38,9 +38,8 @@ }, "build": { "sub_component": [ - "//foundation/appexecfwk/standard/kits/appkit/napi/distributebundlemgr:jsapi_target", - "//foundation/appexecfwk/standard/services/dbms:dbms_target", - "//foundation/appexecfwk/standard/services/dbms/sa_profile:distributedbms" + "//foundation/appexecfwk/standard/distributed_bundle_framework:jsapi_target", + "//foundation/appexecfwk/standard/distributed_bundle_framework:dbms_target" ], "test": [] } diff --git a/distributed_bundle_framework/dbms.gni b/distributed_bundle_framework/dbms.gni new file mode 100644 index 0000000000..af46b4e052 --- /dev/null +++ b/distributed_bundle_framework/dbms.gni @@ -0,0 +1,16 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("../appexecfwk.gni") + +dbms_services_path = "${appexecfwk_path}/distributed_bundle_framework/services/dbms" \ No newline at end of file diff --git a/kits/appkit/napi/distributebundlemgr/BUILD.gn b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/BUILD.gn similarity index 91% rename from kits/appkit/napi/distributebundlemgr/BUILD.gn rename to distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/BUILD.gn index 47f5147ab5..4d24d69c0a 100644 --- a/kits/appkit/napi/distributebundlemgr/BUILD.gn +++ b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("../../../../appexecfwk.gni") +import("../../../../dbms.gni") ohos_shared_library("distributedbundle") { include_dirs = [] @@ -25,11 +25,11 @@ ohos_shared_library("distributedbundle") { "native_module.cpp", ] - configs = [ "${services_path}/dbms:distributed_bms_config" ] + configs = [ "${dbms_services_path}:distributed_bms_config" ] deps = [ "${common_path}:libappexecfwk_common", - "${services_path}/dbms:libdbms", + "${dbms_services_path}:libdbms", ] external_deps = [ diff --git a/kits/appkit/napi/distributebundlemgr/distributed_bundle_mgr.cpp b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp similarity index 100% rename from kits/appkit/napi/distributebundlemgr/distributed_bundle_mgr.cpp rename to distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp diff --git a/kits/appkit/napi/distributebundlemgr/distributed_bundle_mgr.h b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.h similarity index 100% rename from kits/appkit/napi/distributebundlemgr/distributed_bundle_mgr.h rename to distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.h diff --git a/kits/appkit/napi/distributebundlemgr/native_module.cpp b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/native_module.cpp similarity index 100% rename from kits/appkit/napi/distributebundlemgr/native_module.cpp rename to distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/native_module.cpp diff --git a/services/dbms/BUILD.gn b/distributed_bundle_framework/services/dbms/BUILD.gn similarity index 98% rename from services/dbms/BUILD.gn rename to distributed_bundle_framework/services/dbms/BUILD.gn index 0c37de1607..bf3d38a572 100644 --- a/services/dbms/BUILD.gn +++ b/distributed_bundle_framework/services/dbms/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("../../appexecfwk.gni") +import("../../dbms.gni") group("dbms_target") { if (bundle_framework_graphics) { diff --git a/services/dbms/include/distributed_bms.h b/distributed_bundle_framework/services/dbms/include/distributed_bms.h similarity index 100% rename from services/dbms/include/distributed_bms.h rename to distributed_bundle_framework/services/dbms/include/distributed_bms.h diff --git a/services/dbms/include/distributed_bms_host.h b/distributed_bundle_framework/services/dbms/include/distributed_bms_host.h similarity index 100% rename from services/dbms/include/distributed_bms_host.h rename to distributed_bundle_framework/services/dbms/include/distributed_bms_host.h diff --git a/services/dbms/include/distributed_bms_interface.h b/distributed_bundle_framework/services/dbms/include/distributed_bms_interface.h similarity index 100% rename from services/dbms/include/distributed_bms_interface.h rename to distributed_bundle_framework/services/dbms/include/distributed_bms_interface.h diff --git a/services/dbms/include/distributed_bms_proxy.h b/distributed_bundle_framework/services/dbms/include/distributed_bms_proxy.h similarity index 100% rename from services/dbms/include/distributed_bms_proxy.h rename to distributed_bundle_framework/services/dbms/include/distributed_bms_proxy.h diff --git a/services/dbms/include/image_buffer.h b/distributed_bundle_framework/services/dbms/include/image_buffer.h similarity index 100% rename from services/dbms/include/image_buffer.h rename to distributed_bundle_framework/services/dbms/include/image_buffer.h diff --git a/services/dbms/include/image_compress.h b/distributed_bundle_framework/services/dbms/include/image_compress.h similarity index 100% rename from services/dbms/include/image_compress.h rename to distributed_bundle_framework/services/dbms/include/image_compress.h diff --git a/services/dbms/sa_profile/402.xml b/distributed_bundle_framework/services/dbms/sa_profile/402.xml similarity index 100% rename from services/dbms/sa_profile/402.xml rename to distributed_bundle_framework/services/dbms/sa_profile/402.xml diff --git a/services/dbms/sa_profile/BUILD.gn b/distributed_bundle_framework/services/dbms/sa_profile/BUILD.gn similarity index 100% rename from services/dbms/sa_profile/BUILD.gn rename to distributed_bundle_framework/services/dbms/sa_profile/BUILD.gn diff --git a/services/dbms/sa_profile/distributedbms.cfg b/distributed_bundle_framework/services/dbms/sa_profile/distributedbms.cfg similarity index 100% rename from services/dbms/sa_profile/distributedbms.cfg rename to distributed_bundle_framework/services/dbms/sa_profile/distributedbms.cfg diff --git a/services/dbms/src/distributed_bms.cpp b/distributed_bundle_framework/services/dbms/src/distributed_bms.cpp similarity index 100% rename from services/dbms/src/distributed_bms.cpp rename to distributed_bundle_framework/services/dbms/src/distributed_bms.cpp diff --git a/services/dbms/src/distributed_bms_host.cpp b/distributed_bundle_framework/services/dbms/src/distributed_bms_host.cpp similarity index 100% rename from services/dbms/src/distributed_bms_host.cpp rename to distributed_bundle_framework/services/dbms/src/distributed_bms_host.cpp diff --git a/services/dbms/src/distributed_bms_proxy.cpp b/distributed_bundle_framework/services/dbms/src/distributed_bms_proxy.cpp similarity index 100% rename from services/dbms/src/distributed_bms_proxy.cpp rename to distributed_bundle_framework/services/dbms/src/distributed_bms_proxy.cpp diff --git a/services/dbms/src/image_buffer.cpp b/distributed_bundle_framework/services/dbms/src/image_buffer.cpp similarity index 100% rename from services/dbms/src/image_buffer.cpp rename to distributed_bundle_framework/services/dbms/src/image_buffer.cpp diff --git a/services/dbms/src/image_compress.cpp b/distributed_bundle_framework/services/dbms/src/image_compress.cpp similarity index 100% rename from services/dbms/src/image_compress.cpp rename to distributed_bundle_framework/services/dbms/src/image_compress.cpp -- Gitee From 619098d0174effa180ac696c56ba90455cf00c50 Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Thu, 28 Apr 2022 10:25:02 +0800 Subject: [PATCH 2/3] dbms part Signed-off-by: changzheng6 --- distributed_bundle_framework/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed_bundle_framework/BUILD.gn b/distributed_bundle_framework/BUILD.gn index 42f4c5e479..c23bf696d2 100644 --- a/distributed_bundle_framework/BUILD.gn +++ b/distributed_bundle_framework/BUILD.gn @@ -22,4 +22,4 @@ group("dbms_target") { "services/dbms:dbms_target", "services/dbms/sa_profile:distributedbms", ] -} \ No newline at end of file +} -- Gitee From eb1785e395e622c19ab6b543a22922a5ea1639fa Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Thu, 28 Apr 2022 10:33:49 +0800 Subject: [PATCH 3/3] dbms part Signed-off-by: changzheng6 --- distributed_bundle_framework/dbms.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distributed_bundle_framework/dbms.gni b/distributed_bundle_framework/dbms.gni index af46b4e052..b9820c08e2 100644 --- a/distributed_bundle_framework/dbms.gni +++ b/distributed_bundle_framework/dbms.gni @@ -13,4 +13,5 @@ import("../appexecfwk.gni") -dbms_services_path = "${appexecfwk_path}/distributed_bundle_framework/services/dbms" \ No newline at end of file +dbms_services_path = + "${appexecfwk_path}/distributed_bundle_framework/services/dbms" -- Gitee