From 81ddb89b652e2d944c1d6b3f0a3a5c74faf14ad2 Mon Sep 17 00:00:00 2001 From: Panferov Ivan Date: Tue, 17 Jun 2025 00:20:11 +0800 Subject: [PATCH] modify include paths to libpandafile Issue: #ICFWS0 Signed-off-by: Panferov Ivan --- ets2panda/BUILD.gn | 6 +++--- ets2panda/aot/BUILD.gn | 4 ++-- ets2panda/bindings/BUILD.gn | 4 ++-- ets2panda/declgen_ets2ts/BUILD.gn | 2 +- ets2panda/driver/dependency_analyzer/BUILD.gn | 2 +- .../evaluate/debugInfoDeserialization/classBuilder.cpp | 6 +++--- .../debugInfoDeserialization/debugInfoDeserializer.cpp | 4 ++-- .../debugInfoDeserialization/debugInfoDeserializer.h | 4 ++-- .../debugInfoDeserialization/inheritanceResolution.cpp | 4 ++-- .../debugInfoDeserialization/methodBuilder.cpp | 6 +++--- ets2panda/evaluate/debugInfoStorage.cpp | 4 ++-- ets2panda/evaluate/debugInfoStorage.h | 6 +++--- ets2panda/evaluate/evaluateContext.h | 6 +++--- ets2panda/evaluate/helpers.cpp | 4 ++-- ets2panda/evaluate/helpers.h | 10 +++++----- ets2panda/lsp/BUILD.gn | 2 +- ets2panda/test/unit/declgen/CMakeLists.txt | 2 -- 17 files changed, 37 insertions(+), 39 deletions(-) diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn index 60c32ea888d..e5222723479 100644 --- a/ets2panda/BUILD.gn +++ b/ets2panda/BUILD.gn @@ -1155,7 +1155,7 @@ if (ark_standalone_build || ark_static_standalone_build) { libes2panda_configs += [ "$ark_root/assembler:arkassembler_public_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/abc2program:arkts_abc2program_public_config", ] } @@ -1169,7 +1169,7 @@ if (ark_standalone_build || ark_static_standalone_build) { libes2panda_public_configs += [ "$ark_root/assembler:arkassembler_public_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/runtime:arkruntime_public_config", "$ark_root/compiler:arkcompiler_public_config", @@ -1288,7 +1288,7 @@ ohos_source_set("libes2panda_public_frontend_static") { "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/compiler:libarktscompiler", "$ark_root/libpandabase:libarktsbase", - "$ark_root/libpandafile:libarktsfile", + "$ark_root/libarkfile:libarktsfile", ] } else { external_deps += [ diff --git a/ets2panda/aot/BUILD.gn b/ets2panda/aot/BUILD.gn index a3a533b320f..55f5f3e98d6 100644 --- a/ets2panda/aot/BUILD.gn +++ b/ets2panda/aot/BUILD.gn @@ -44,7 +44,7 @@ ohos_executable("ets2panda") { if (ark_standalone_build || ark_static_standalone_build) { configs += [ "$ark_root/assembler:arkassembler_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/runtime:arkruntime_public_config", @@ -65,7 +65,7 @@ ohos_executable("ets2panda") { deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/libpandabase:libarktsbase_package", - "$ark_root/libpandafile:libarktsfile_package", + "$ark_root/libarkfile:libarktsfile_package", ] } diff --git a/ets2panda/bindings/BUILD.gn b/ets2panda/bindings/BUILD.gn index a6f48462abf..a51c47c5d1b 100644 --- a/ets2panda/bindings/BUILD.gn +++ b/ets2panda/bindings/BUILD.gn @@ -46,7 +46,7 @@ shared_library("ts_bindings") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ] deps = [ @@ -207,7 +207,7 @@ shared_library("public") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ] include_dirs = [ diff --git a/ets2panda/declgen_ets2ts/BUILD.gn b/ets2panda/declgen_ets2ts/BUILD.gn index 8cc3dabeefb..6fdca2dbfb4 100644 --- a/ets2panda/declgen_ets2ts/BUILD.gn +++ b/ets2panda/declgen_ets2ts/BUILD.gn @@ -39,7 +39,7 @@ ohos_executable("declgen_ets2ts") { configs += [ "$ark_es2panda_root:libes2panda_public_config", "$ark_root/assembler:arkassembler_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", "$ark_root/bytecode_optimizer:bytecodeopt_public_config", "$ark_root/compiler:arkcompiler_public_config", diff --git a/ets2panda/driver/dependency_analyzer/BUILD.gn b/ets2panda/driver/dependency_analyzer/BUILD.gn index 96449c6f58f..fd2530fddc4 100644 --- a/ets2panda/driver/dependency_analyzer/BUILD.gn +++ b/ets2panda/driver/dependency_analyzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_executable("dependency_analyzer") { deps += [ "$ark_root/bytecode_optimizer:libarktsbytecodeopt_package", "$ark_root/libpandabase:libarktsbase_package", - "$ark_root/libpandafile:libarktsfile_package", + "$ark_root/libarkfile:libarktsfile_package", ] } diff --git a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp index e1101e2b003..df3118e7b67 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.cpp @@ -18,9 +18,9 @@ #include "checker/ETSchecker.h" #include "ir/statements/classDeclaration.h" #include "ir/expressions/identifier.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" -#include "libpandafile/method_data_accessor.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" +#include "libarkfile/method_data_accessor.h" #include "evaluate/helpers.h" #include "evaluate/debugInfoDeserialization/methodBuilder.h" diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp index a84486f5f56..d9bfbbee6f9 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.cpp @@ -29,8 +29,8 @@ #include "compiler/lowering/scopesInit/scopesInitPhase.h" #include "compiler/lowering/util.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h index fe5e9ac7d38..d2035a6d6d7 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h +++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h @@ -17,8 +17,8 @@ #define ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H #include "libpandabase/utils/arena_containers.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" namespace ark::es2panda::varbinder { class Variable; diff --git a/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp b/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp index 1e82b52cc2d..586bbb08f06 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/inheritanceResolution.cpp @@ -22,8 +22,8 @@ #include "evaluate/proxyProgramsCache.h" #include "evaluate/entityDeclarator-inl.h" -#include "libpandafile/class_data_accessor.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp index a2326cba1b3..574f543e1cc 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp +++ b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.cpp @@ -15,9 +15,9 @@ #include "evaluate/debugInfoDeserialization/methodBuilder.h" #include "checker/ETSchecker.h" -#include "libpandafile/file-inl.h" -#include "libpandafile/method_data_accessor-inl.h" -#include "libpandafile/proto_data_accessor-inl.h" +#include "libarkfile/file-inl.h" +#include "libarkfile/method_data_accessor-inl.h" +#include "libarkfile/proto_data_accessor-inl.h" #include "evaluate/helpers.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoStorage.cpp b/ets2panda/evaluate/debugInfoStorage.cpp index 20163df7651..b1f0f03d293 100644 --- a/ets2panda/evaluate/debugInfoStorage.cpp +++ b/ets2panda/evaluate/debugInfoStorage.cpp @@ -18,8 +18,8 @@ #include "generated/signatures.h" #include "evaluate/helpers.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/class_data_accessor-inl.h" +#include "libarkfile/file-inl.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/debugInfoStorage.h b/ets2panda/evaluate/debugInfoStorage.h index 43966dca6b0..bffdd2f8cc1 100644 --- a/ets2panda/evaluate/debugInfoStorage.h +++ b/ets2panda/evaluate/debugInfoStorage.h @@ -20,9 +20,9 @@ #include "evaluate/importExportTable.h" #include "util/ustring.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" -#include "libpandafile/class_data_accessor.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" +#include "libarkfile/class_data_accessor.h" #include #include diff --git a/ets2panda/evaluate/evaluateContext.h b/ets2panda/evaluate/evaluateContext.h index 848719954f6..3365e558e19 100644 --- a/ets2panda/evaluate/evaluateContext.h +++ b/ets2panda/evaluate/evaluateContext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -20,8 +20,8 @@ #include "util/options.h" #include "libpandabase/utils/arena_containers.h" -#include "libpandafile/debug_info_extractor.h" -#include "libpandafile/file.h" +#include "libarkfile/debug_info_extractor.h" +#include "libarkfile/file.h" #include #include diff --git a/ets2panda/evaluate/helpers.cpp b/ets2panda/evaluate/helpers.cpp index e41daa9022f..88a631b2f78 100644 --- a/ets2panda/evaluate/helpers.cpp +++ b/ets2panda/evaluate/helpers.cpp @@ -24,8 +24,8 @@ #include "ir/typeNode.h" #include "assembler/assembly-type.h" -#include "libpandafile/field_data_accessor-inl.h" -#include "libpandafile/file-inl.h" +#include "libarkfile/field_data_accessor-inl.h" +#include "libarkfile/file-inl.h" #include #include diff --git a/ets2panda/evaluate/helpers.h b/ets2panda/evaluate/helpers.h index dd4766d19c0..5038bcc9ac8 100644 --- a/ets2panda/evaluate/helpers.h +++ b/ets2panda/evaluate/helpers.h @@ -21,11 +21,11 @@ #include "ir/astNodeFlags.h" #include "varbinder/ETSBinder.h" -#include "libpandafile/field_data_accessor.h" -#include "libpandafile/method_data_accessor.h" -#include "libpandafile/class_data_accessor.h" -#include "libpandafile/file.h" -#include "type.h" +#include "libarkfile/field_data_accessor.h" +#include "libarkfile/method_data_accessor.h" +#include "libarkfile/class_data_accessor.h" +#include "libarkfile/file.h" +#include #include #include diff --git a/ets2panda/lsp/BUILD.gn b/ets2panda/lsp/BUILD.gn index 4c7e5927d8f..d75bb4419fc 100644 --- a/ets2panda/lsp/BUILD.gn +++ b/ets2panda/lsp/BUILD.gn @@ -120,7 +120,7 @@ ohos_source_set("libes2panda_lsp_static") { "../:libes2panda_public_config", "../:libes2panda_config", "$ark_root/libpandabase:arkbase_public_config", - "$ark_root/libpandafile:arkfile_public_config", + "$ark_root/libarkfile:arkfile_public_config", ":libes2panda_lsp_config", ] diff --git a/ets2panda/test/unit/declgen/CMakeLists.txt b/ets2panda/test/unit/declgen/CMakeLists.txt index 37a9cc44966..1e0cab0b035 100644 --- a/ets2panda/test/unit/declgen/CMakeLists.txt +++ b/ets2panda/test/unit/declgen/CMakeLists.txt @@ -43,7 +43,6 @@ foreach(TEST_DATA IN ITEMS ${DECLGEN_PLUGIN_TESTS}) panda_target_include_directories(${TEST_NAME} PRIVATE ${ES2PANDA_PATH} - PRIVATE ${PANDA_ROOT}/libpandafile PRIVATE ${PANDA_ROOT}/assembler PRIVATE ${OUTPUT_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} @@ -51,7 +50,6 @@ foreach(TEST_DATA IN ITEMS ${DECLGEN_PLUGIN_TESTS}) PUBLIC ${CMAKE_SOURCE_DIR}/libpandabase PUBLIC ${CMAKE_SOURCE_DIR}/runtime PUBLIC ${CMAKE_BINARY_DIR}/libpandabase - PUBLIC ${CMAKE_BINARY_DIR}/libpandafile/include ${CMAKE_BINARY_DIR} ) panda_target_link_libraries(${TEST_NAME} es2panda-public arkassembler arkbase arkfile) -- Gitee