openharmony/ace_engine_lite
1
0
Fork 0
mirror of https://github.com/openharmony/ace_engine_lite.git synced 2026-07-19 21:33:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

!533 修改ace_engine_lite、ace_engine、napi仓名的路径

Browse Source 
Merge pull request !533 from master
This commit is contained in:
mamingshuai
2022-04-27 14:09:51 +00:00
committed by Gitee
parent 89549081b7 a14124a8a8
commit 7800dec2e2
33 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -36,7 +36,7 @@ The JS UI framework consists of the JavaScript data binding framework, JavaScrip
The source code of the framework is stored in **/foundation/ace/ace\_engine\_lite**. The directory structure is as follows:
```
/foundation/ace/ace_engine_lite
/foundation/arkui/ace_engine_lite
├── frameworks # Framework code
│ ├── common # Common kits
│ ├── examples # Sample code
README_zh.md
+1 -1
View File
@@ -35,7 +35,7 @@ JS-UI框架子系统包括JS数据绑定框架（JS Data binding）、JS运行
JS-UI框架子系统源代码在/foundation/ace/ace\_engine\_lite下，目录结构如下图所示：
```
/foundation/ace/ace_engine_lite
/foundation/arkui/ace_engine_lite
├── frameworks # 框架代码目录
│   ├── common # 公共工具类目录
│ ├── examples # 示例代码目录
ace_lite.gni
+8 -7
View File
@@ -13,11 +13,12 @@
import("//build/lite/config/subsystem/aafwk/path.gni")
ACE_LITE_PATH = "//foundation/ace/ace_engine_lite/frameworks"
ACE_LITE_COMMON_PATH = "//foundation/ace/ace_engine_lite/frameworks/common"
NATIVE_ENGINE_PATH = "//foundation/ace/ace_engine_lite/frameworks/native_engine"
ACE_LITE_PATH = "//foundation/arkui/ace_engine_lite/frameworks"
ACE_LITE_COMMON_PATH = "//foundation/arkui/ace_engine_lite/frameworks/common"
NATIVE_ENGINE_PATH =
"//foundation/arkui/ace_engine_lite/frameworks/native_engine"
MODULE_MANAGER_PATH =
"//foundation/ace/ace_engine_lite/frameworks/module_manager"
"//foundation/arkui/ace_engine_lite/frameworks/module_manager"
GRAPHIC_LITE_PATH = "//foundation/graphic/ui"
ace_lite_include_dirs = [
@@ -43,9 +44,9 @@ ace_lite_include_dirs = [
ace_lite_include_dirs += [
"//third_party/bounds_checking_function/include",
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async",
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base",
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/jsi",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi",
"$ACE_LITE_PATH/include/context",
"$ACE_LITE_PATH/include/base",
"$ACE_LITE_PATH/include/modules",
bundle.json
+4 -4
View File
@@ -5,13 +5,13 @@
"license": "Apache License 2.0",
"pubiishAs": "code-segment",
"segment": {
"destPath": "foundation/ace/ace_engine_lite"
"destPath": "foundation/arkui/ace_engine_lite"
},
"dirs": {},
"scripts": {},
"component": {
"name": "ace_engine_lite",
"subsystem": "ace",
"subsystem": "arkui",
"syscap": [ "SystemCapability.Ace.AceEngineLite" ],
"feature": [],
"adapted_system_type": [ "mini","small" ],
@@ -45,8 +45,8 @@
},
"build": {
"sub_component": [
"//foundation/ace/ace_engine_lite/test:unittest",
"//foundation/ace/ace_engine_lite/frameworks:jsfwk"
"//foundation/arkui/ace_engine_lite/test:unittest",
"//foundation/arkui/ace_engine_lite/frameworks:jsfwk"
],
"inner_kits": [],
"test": []
frameworks/BUILD.gn
+1 -1
View File
@@ -13,7 +13,7 @@
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/config/subsystem/aafwk/config.gni")
import("//foundation/ace/ace_engine_lite/ace_lite.gni")
import("//foundation/arkui/ace_engine_lite/ace_lite.gni")
defines = []
frameworks/CMakeLists.txt
+1 -1
View File
@@ -25,7 +25,7 @@ add_compile_options(-fpermissive -Wno-narrowing)
set(ACE_LITE_CONFIG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/targets/simulator")
set(ACE_LITE_INNERKITS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/innerkits/builtin")
set(JSFWK_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include")
set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/ace/ace_engine_lite/interfaces/innerkits/builtin")
set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin")
set(JSFWK_SOURCE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/core")
set(UIKIT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/graphic/ui")
set(THIRTY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../third_party")
frameworks/common/BUILD.gn
+3 -3
View File
@@ -13,10 +13,10 @@
import("//build/lite/config/component/lite_component.gni")
ace_common_root = "//foundation/ace/ace_engine_lite/frameworks/common"
ace_common_root = "//foundation/arkui/ace_engine_lite/frameworks/common"
ace_interface_root =
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin"
ace_target_root = "//foundation/ace/ace_engine_lite/frameworks/targets"
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin"
ace_target_root = "//foundation/arkui/ace_engine_lite/frameworks/targets"
lite_component("ace_common_lite") {
features = [ ":ace_common" ]
frameworks/common/memory/cache/test/unittest/BUILD.gn
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_cache_manager") {
output_extension = "bin"
frameworks/module_manager/BUILD.gn
+3 -3
View File
@@ -13,10 +13,10 @@
import("//build/lite/config/component/lite_component.gni")
ace_frameworks_root = "//foundation/ace/ace_engine_lite/frameworks"
ace_frameworks_root = "//foundation/arkui/ace_engine_lite/frameworks"
ace_interface_root =
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin"
ace_target_root = "//foundation/ace/ace_engine_lite/frameworks/targets"
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin"
ace_target_root = "//foundation/arkui/ace_engine_lite/frameworks/targets"
lite_component("ace_module_manager_lite") {
features = [ ":ace_module_manager" ]
frameworks/module_manager/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_require_module") {
output_extension = "bin"
frameworks/native_engine/BUILD.gn
+5 -4
View File
@@ -13,11 +13,12 @@
import("//build/lite/config/component/lite_component.gni")
ace_common_root = "//foundation/ace/ace_engine_lite/frameworks/common"
ace_common_root = "//foundation/arkui/ace_engine_lite/frameworks/common"
ace_interface_root =
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin"
ace_target_root = "//foundation/ace/ace_engine_lite/frameworks/targets"
native_engine_root = "//foundation/ace/ace_engine_lite/frameworks/native_engine"
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin"
ace_target_root = "//foundation/arkui/ace_engine_lite/frameworks/targets"
native_engine_root =
"//foundation/arkui/ace_engine_lite/frameworks/native_engine"
lite_component("ace_native_engine_lite") {
features = [ ":ace_native_engine" ]
frameworks/native_engine/async/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_js_async_work") {
output_extension = "bin"
frameworks/native_engine/jsi/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_jsiinterface") {
output_extension = "bin"
frameworks/src/core/base/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_system_info") {
output_extension = "bin"
frameworks/src/core/components/test/unittest/common/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_arc") {
output_extension = "bin"
frameworks/src/core/context/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_jsfwk") {
output_extension = "bin"
frameworks/src/core/modules/presets/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_date_time") {
output_extension = "bin"
frameworks/src/core/modules/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
presets_unittest_root =
"$ace_lite_root/frameworks/src/core/modules/presets/test/unittest"
frameworks/src/core/router/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_router_module") {
output_extension = "bin"
frameworks/src/core/stylemgr/test/unittest/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
unittest("js_frameworks_test_stylemgr") {
output_extension = "bin"
frameworks/targets/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/component/lite_component.gni")
import("//foundation/ace/ace_engine_lite/ace_lite.gni")
import("//foundation/arkui/ace_engine_lite/ace_lite.gni")
declare_args() {
enable_ohos_ace_engine_lite_product_config = false
frameworks/targets/simulator/BUILD.gn
+4 -4
View File
@@ -13,7 +13,7 @@
import("//build/lite/config/subsystem/aafwk/config.gni")
import("//build/ohos.gni")
import("//foundation/ace/ace_engine_lite/ace_lite.gni")
import("//foundation/arkui/ace_engine_lite/ace_lite.gni")
declare_args() {
LOSCFG_TEST_JS_BUILD = false
@@ -23,7 +23,7 @@ config("ace_lite_config") {
include_dirs = ace_lite_include_dirs_simulator
include_dirs += ace_lite_include_dirs
include_dirs +=
[ "//foundation/ace/ace_engine_lite/frameworks/targets/simulator" ]
[ "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator" ]
}
ohos_static_library("ace_lite") {
@@ -37,9 +37,9 @@ ohos_static_library("ace_lite") {
"$ACE_LITE_COMMON_PATH/memory/memory_heap.cpp",
"$MODULE_MANAGER_PATH/module_manager.cpp",
"$NATIVE_ENGINE_PATH/jsi/jsi.cpp",
"//foundation/ace/ace_engine_lite/frameworks/src/core/modules/presets/feature_ability_module.cpp",
"//foundation/arkui/ace_engine_lite/frameworks/src/core/modules/presets/feature_ability_module.cpp",
]
sources -= [ "//foundation/ace/ace_engine_lite/frameworks/src/core/context/ace_ability.cpp" ]
sources -= [ "//foundation/arkui/ace_engine_lite/frameworks/src/core/context/ace_ability.cpp" ]
cflags_cc = [
"-Wall",
"-D_INC_STRING_S",
frameworks/tools/qt/simulator/README_zh.md
+1 -1
View File
@@ -56,7 +56,7 @@
- 参考源码路径（请下载到windows本地，不要使用"\\\wsl$"路径映射）：
[源码工程目录]\foundation\ace\ace_engine_lite\frameworks\tools\qt\simulator\simulator.pro。
[源码工程目录]\foundation\arkui\ace_engine_lite\frameworks\tools\qt\simulator\simulator.pro。
注意：第一次打开项目时，需要在Configure Project界面，kits列表中勾选minGW（仅勾选minGW）。
frameworks/tools/qt/simulator/jsfwk/jsfwk.pro
+3 -3
View File
@@ -202,9 +202,9 @@ INCLUDEPATH += \
$${ROOT_PATH}/foundation/aafwk/aafwk_lite/interfaces/innerkits/abilitymgr_lite \
$${ROOT_PATH}/foundation/communication/ipc_lite/liteipc/include \
$${ROOT_PATH}/third_party/bounds_checking_function/include \
$${ROOT_PATH}/foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async \
$${ROOT_PATH}/foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base \
$${ROOT_PATH}/foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/jsi \
$${ROOT_PATH}/foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async \
$${ROOT_PATH}/foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base \
$${ROOT_PATH}/foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi \
$${ACELITE_FRAMEWORK_PATH}/include/context \
$${ACELITE_FRAMEWORK_PATH}/include/base \
$${ACELITE_FRAMEWORK_PATH}/include/modules \
interfaces/innerkits/builtin/async/js_async_work.h → interfaces/inner_api/builtin/async/js_async_work.h
View File
interfaces/innerkits/builtin/async/message_queue_utils.h → interfaces/inner_api/builtin/async/message_queue_utils.h
+1 -1
View File
@@ -37,7 +37,7 @@ typedef void* QueueHandler;
* Failed message queue operation
*/
#ifndef MSGQ_FAIL
#define MSGQ_FAIL -1
#define MSGQ_FAIL (-1)
#endif
/**
interfaces/innerkits/builtin/base/ace_mem_base.h → interfaces/inner_api/builtin/base/ace_mem_base.h
View File
interfaces/innerkits/builtin/base/memory_heap.h → interfaces/inner_api/builtin/base/memory_heap.h
View File
interfaces/innerkits/builtin/jsi/jsi.h → interfaces/inner_api/builtin/jsi/jsi.h
View File
interfaces/innerkits/builtin/jsi/jsi_types.h → interfaces/inner_api/builtin/jsi/jsi_types.h
View File
test/BUILD.gn
+1 -1
View File
@@ -13,7 +13,7 @@
if (ohos_kernel_type != "liteos_m") {
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
cache_manager_unittest_root =
"$ACE_LITE_COMMON_PATH/memory/cache/test/unittest"
test/ace_test_config.gni
+7 -6
View File
@@ -14,11 +14,11 @@
import("//build/lite/config/component/lite_component.gni")
import("//build/lite/config/subsystem/aafwk/config.gni")
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/ace_lite.gni")
import("//foundation/arkui/ace_engine_lite/ace_lite.gni")
ace_lite_root = "//foundation/ace/ace_engine_lite"
ace_lite_root = "//foundation/arkui/ace_engine_lite"
ace_lite_builtin_root =
"//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin"
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin"
graphic_ui_root = "//foundation/graphic/ui"
test_output_root = "$root_out_dir/test/unittest/jsfwk"
@@ -79,8 +79,8 @@ ace_test_deps = [
"${aafwk_lite_path}/frameworks/ability_lite:aafwk_abilitykit_lite",
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
"//base/powermgr/battery_lite/frameworks/js:ace_battery_kits",
"//foundation/ace/ace_engine_lite/frameworks:ace_lite",
"//foundation/ace/ace_engine_lite/frameworks/targets",
"//foundation/arkui/ace_engine_lite/frameworks:ace_lite",
"//foundation/arkui/ace_engine_lite/frameworks/targets",
"//foundation/communication/ipc_lite:liteipc_adapter",
"//foundation/distributedschedule/samgr_lite/communication/broadcast",
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
@@ -114,7 +114,8 @@ extra_deps = [
]
all_external_deps = ace_test_deps + extra_deps
all_external_deps -= [ "//foundation/ace/ace_engine_lite/frameworks:ace_lite" ]
all_external_deps -=
[ "//foundation/arkui/ace_engine_lite/frameworks:ace_lite" ]
all_external_includes = ace_lite_include_dirs + ace_test_includes
# add specific defines for test case only here
test/moduletest/common/BUILD.gn
+1 -1
View File
@@ -12,7 +12,7 @@
#limitations under the License.
import("//build/lite/config/test.gni")
import("//foundation/ace/ace_engine_lite/test/ace_test_config.gni")
import("//foundation/arkui/ace_engine_lite/test/ace_test_config.gni")
ace_lite_src_core = "$ace_lite_root/frameworks/src/core"
unittest("js_frameworks_tdd_door") {