From 9753ab334099ee816e1ab8a3de537eb0cfcbf1e4 Mon Sep 17 00:00:00 2001
From: Svetlana Rokashevich <rokashevich.svetlana@huawei-partners.com>
Date: Wed, 6 Sep 2023 18:56:10 +0300
Subject: [PATCH 1/2] Try import .abc files

Signed-off-by: Svetlana Rokashevich <rokashevich.svetlana@huawei-partners.com>
---
 ecmastdlib/CMakeLists.txt | 16 ++++++++++------
 tests/CMakeLists.txt      | 28 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ecmastdlib/CMakeLists.txt b/ecmastdlib/CMakeLists.txt
index c6a4d5aa8..0db110774 100644
--- a/ecmastdlib/CMakeLists.txt
+++ b/ecmastdlib/CMakeLists.txt
@@ -26,12 +26,16 @@ else()
     set(arkquick_bin    $<TARGET_FILE:${arkquick_target}>)
 endif()
 
-if (PANDA_WITH_QUICKENER)
-    add_custom_command(TARGET ecmastdlib
-                       POST_BUILD
-                       COMMAND ${arkquick_bin} "${CMAKE_CURRENT_BINARY_DIR}/ecmastdlib.abc" "${CMAKE_CURRENT_BINARY_DIR}/ecmastdlib.abcq"
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                       DEPENDS arkquick)
+set(ecmastdlib_abc_file "${CMAKE_CURRENT_BINARY_DIR}/ecmastdlib.abc")
+set(ecmastdlib_abcq_file "${CMAKE_CURRENT_BINARY_DIR}/ecmastdlib.abcq")
+if(NOT PANDA_USE_PREBUILT_TARGETS OR NOT EXISTS ecmastdlib_abc_file OR NOT EXISTS ecmastdlib_abcq_file)
+    if (PANDA_WITH_QUICKENER)
+        add_custom_command(TARGET ecmastdlib
+                        POST_BUILD
+                        COMMAND ${arkquick_bin} ecmastdlib_abc_file ecmastdlib_abcq_file
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                        DEPENDS arkquick)
+    endif()
 endif()
 
 set(ECMASTDLIB_INLINE_GEN "${CMAKE_CURRENT_BINARY_DIR}/ecmastdlib_inline_gen.h")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e63dc22b7..3c934d322 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -271,19 +271,21 @@ function(compile_file_ecma)
     get_filename_component(SOURCE_DIR "${ARG_FILE}" DIRECTORY)
 
     get_filename_component(FILE_TYPE "${ARG_FILE}" EXT)
-    if (${FILE_TYPE} MATCHES "js")
-        add_custom_command(OUTPUT "${ARG_OUTPUT_FILE}"
-                COMMENT "Run es2panda for ${ARG_FILE}"
-                COMMAND ${es2panda_bin} ${ARG_OPTIONS} --opt-level 2 --output ${ARG_OUTPUT_FILE} "${ARG_FILE}"
-                DEPENDS ${es2panda_target} "${ARG_FILE}"
-                WORKING_DIRECTORY "${ARG_WORKING_DIR}")
-    else()
-        # Compile assembly file
-        add_custom_command(OUTPUT "${ARG_OUTPUT_FILE}"
-                COMMENT "Building ${TEST_NAME}"
-                COMMAND ${PANDA_RUN_PREFIX} $<TARGET_FILE:ark_asm> --log-file ${BUILD_LOG} ${ARG_FILE} ${ARG_OUTPUT_FILE}
-                DEPENDS ${assembler} "${ARG_FILE}"
-                WORKING_DIRECTORY "${ARG_WORKING_DIR}")
+    if (NOT PANDA_USE_PREBUILT_TARGETS OR NOT EXISTS ${ARG_OUTPUT_FILE})
+        if (${FILE_TYPE} MATCHES "js")
+            add_custom_command(OUTPUT "${ARG_OUTPUT_FILE}"
+                    COMMENT "Run es2panda for ${ARG_FILE}"
+                    COMMAND ${es2panda_bin} ${ARG_OPTIONS} --opt-level 2 --output ${ARG_OUTPUT_FILE} "${ARG_FILE}"
+                    DEPENDS ${es2panda_target} "${ARG_FILE}"
+                    WORKING_DIRECTORY "${ARG_WORKING_DIR}")
+        else()
+            # Compile assembly file
+            add_custom_command(OUTPUT "${ARG_OUTPUT_FILE}"
+                    COMMENT "Building ${TEST_NAME}"
+                    COMMAND ${PANDA_RUN_PREFIX} $<TARGET_FILE:ark_asm> --log-file ${BUILD_LOG} ${ARG_FILE} ${ARG_OUTPUT_FILE}
+                    DEPENDS ${assembler} "${ARG_FILE}"
+                    WORKING_DIRECTORY "${ARG_WORKING_DIR}")
+        endif()
     endif()
 endfunction()
 
-- 
Gitee


From 561da3c35cea4c92456cdfbccae1c83e520f3f4a Mon Sep 17 00:00:00 2001
From: Svetlana Rokashevich <rokashevich.svetlana@huawei-partners.com>
Date: Sun, 10 Sep 2023 20:57:01 +0300
Subject: [PATCH 2/2] Try not build panda_host_tools

Signed-off-by: Svetlana Rokashevich <rokashevich.svetlana@huawei-partners.com>
---
 ecmastdlib/CMakeLists.txt | 6 +++++-
 tests/CMakeLists.txt      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ecmastdlib/CMakeLists.txt b/ecmastdlib/CMakeLists.txt
index 0db110774..c6b73548c 100644
--- a/ecmastdlib/CMakeLists.txt
+++ b/ecmastdlib/CMakeLists.txt
@@ -19,7 +19,11 @@ add_panda_assembly(TARGET ecmastdlib SOURCE ecmastdlib.pa)
 
 if(CMAKE_CROSSCOMPILING)
     ExternalProject_Get_Property(panda_host_tools binary_dir)
-    set(arkquick_target panda_host_tools-build)
+    if(PANDA_USE_PREBUILT_TARGETS)
+        set(arkquick_target "")
+    else()
+        set(arkquick_target panda_host_tools-build)
+    endif()
     set(arkquick_bin    "${binary_dir}/quickener/arkquick")
 else()
     set(arkquick_target arkquick)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3c934d322..a0b9dd2ce 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -249,7 +249,11 @@ endfunction()
 
 if(CMAKE_CROSSCOMPILING)
     ExternalProject_Get_Property(panda_host_tools binary_dir)
-    set(es2panda_target panda_host_tools-build)
+    if(PANDA_USE_PREBUILT_TARGETS)
+        set(es2panda_target "")
+    else()
+        set(es2panda_target panda_host_tools-build)
+    endif()
     set(es2panda_bin    "${binary_dir}/plugins/ecmascript/es2panda/aot/es2panda")
 else()
     set(es2panda_target es2panda)
-- 
Gitee