From 3fef82c7d465a38f4fe037a8f9bc3acde605fa0c Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Sun, 3 Mar 2024 04:54:00 -0800 Subject: [PATCH] Improve:cross compile. --- build/cmake/toolchain/linux.toolchain.cmake | 8 +++++++- test/middleware/AppManager/tool/src/ServersMock.cpp | 3 +++ utils/WebServer/CMakeLists.txt | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index f6dc8951..63eee977 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -36,29 +36,35 @@ add_definitions(-DPLATFORM_PATH=\"${PLATFORM_PATH}\") # ------------ build curl + openssl ------------ # set(CURL_OPENSSL_LIB_SHARED_ENABLE "false") # ------------ build curl + openssl end ------------ # + # ------------ build IpcConfig ------------ # set(IPC_CONFIG_FILE_PATH "./ipc_config") # ------------ build IpcConfig end ------------ # + # ------------ build log ------------ # set(LOG_SUPPORT "true") # ------------ build log end ------------ # + # ------------ build GoAhead ------------ # set(GOAHEAD_DOCUMENTS_PATH "web") set(GOAHEAD_UPLOAD_TMP_PATH "./goahead") set(GOAHEAD_UPLOAD_PATH "${GOAHEAD_UPLOAD_TMP_PATH}") -set(GOAHEAD_LIMIT_POST "33554432") +set(GOAHEAD_LIMIT_POST "33554432") # If not defined means using default setting. See goahead-linux-static-fancy.mk # GOAHEAD_CONFIG_FILE_PATH should be set when cross compile # set(GOAHEAD_CONFIG_FILE_PATH "./") # ------------ build GoAhead end ------------ # + # ------------ build McuManager ------------ # set(MCU_UART_DEVICE "dev/s1") # ------------ build McuManager end ------------ # + # ------------ build curl + openssl ------------ start set(CROSS_COMPILE_PREFIX "") # set(CROSS_COMPILE_PREFIX "") set(CURL_OPENSSL_LIB_SHARED_ENABLE "false") set(CURL_SHARED_LIBS_PATH "/mnt/mmc") # ------------ build curl + openssl ------------ end + # ------------ build AppManager ------------ # set(APP_MANAGER_HTTP_SERVER_IP "localhost") set(APP_MANAGER_HTTP_SERVER_PORT "8080") diff --git a/test/middleware/AppManager/tool/src/ServersMock.cpp b/test/middleware/AppManager/tool/src/ServersMock.cpp index c5753287..fb842d49 100644 --- a/test/middleware/AppManager/tool/src/ServersMock.cpp +++ b/test/middleware/AppManager/tool/src/ServersMock.cpp @@ -58,6 +58,9 @@ void ServersMock::MockGetProductInfo(void) DeleteServersHttp(http); } } +#ifndef PLATFORM_PATH +#error Add the code in your linux.toolchain.cmake : add_definitions(-DPLATFORM_PATH="${PLATFORM_PATH}") +#endif void ServersMock::MockUploadFiles(void) { ServerParam init = { diff --git a/utils/WebServer/CMakeLists.txt b/utils/WebServer/CMakeLists.txt index 4b3f6561..bed864f6 100644 --- a/utils/WebServer/CMakeLists.txt +++ b/utils/WebServer/CMakeLists.txt @@ -107,6 +107,8 @@ add_custom_target( libgo.a DEPENDS ${EXTERNAL_LIBS_OUTPUT_PATH}/libgo.a # COMMAND mkdir ${GOAHEAD_UPLOAD_TMP_PATH} + COMMAND cp ${EXTERNAL_SOURCE_PATH}/goahead-5.2.0/modify/http.c ${EXTERNAL_SOURCE_PATH}/goahead-5.2.0/GoAhead/src + COMMAND touch ${EXTERNAL_SOURCE_PATH}/goahead-5.2.0/GoAhead/src/http.c WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ )