From 4834d682d4ed4c90f43c121c9a58d54727586195 Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Fri, 24 May 2024 13:54:35 +0800
Subject: [PATCH] Improve:Ipc config build.

---
 build/cmake/toolchain/linux.toolchain.cmake              | 1 +
 middleware/IpcConfig/build/ipc_config.cmake              | 8 +++++++-
 middleware/IpcConfig/src/IpcConfigImpl.cpp               | 2 +-
 test/middleware/IpcConfig/tool/CMakeLists.txt            | 1 +
 test/middleware/IpcConfig/tool/src/IpcConfigTestTool.cpp | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake
index 3ffcf28..bbbaf2d 100755
--- a/build/cmake/toolchain/linux.toolchain.cmake
+++ b/build/cmake/toolchain/linux.toolchain.cmake
@@ -38,6 +38,7 @@ set(CURL_OPENSSL_LIB_SHARED_ENABLE         "false")
 
 # ------------ build IpcConfig ------------ #
 set(IPC_CONFIG_FILE_PATH                   "./ipc_config")
+set(USERDATA_MOUNT_PATH                    "/userdata")
 # ------------ build IpcConfig end ------------ #
 
 # ------------ build log ------------ #
diff --git a/middleware/IpcConfig/build/ipc_config.cmake b/middleware/IpcConfig/build/ipc_config.cmake
index e0db7f9..4666dc8 100644
--- a/middleware/IpcConfig/build/ipc_config.cmake
+++ b/middleware/IpcConfig/build/ipc_config.cmake
@@ -2,5 +2,11 @@
 if (DEFINED IPC_CONFIG_FILE_PATH)
     add_definitions(-DIPC_CONFIG_FILE_PATH=\"${IPC_CONFIG_FILE_PATH}\")
 else()
-    message(FATAL_ERROR "You set define IPC_CONFIG_FILE_PATH in toolchan .cmake file to tell code where to save config file.")
+    message(FATAL_ERROR "You should set define IPC_CONFIG_FILE_PATH in toolchan.cmake file to tell code where to save config file.")
+endif()
+
+if (DEFINED USERDATA_MOUNT_PATH)
+    add_definitions(-DUSERDATA_MOUNT_PATH=\"${USERDATA_MOUNT_PATH}\")
+else()
+    message(FATAL_ERROR "You should set define USERDATA_MOUNT_PATH in toolchan.cmake.")
 endif()
\ No newline at end of file
diff --git a/middleware/IpcConfig/src/IpcConfigImpl.cpp b/middleware/IpcConfig/src/IpcConfigImpl.cpp
index 32f7e73..ad98ff0 100644
--- a/middleware/IpcConfig/src/IpcConfigImpl.cpp
+++ b/middleware/IpcConfig/src/IpcConfigImpl.cpp
@@ -895,7 +895,7 @@ bool IpcConfigImpl::CheckConfigPathMounted(void)
     while (fgets(line, sizeof(line), fp) != nullptr) {
         if (sscanf(line, "%*s %1023s %*s %*s %*d %*d\n", mount_point) == 1) {
             // LogInfo("mount_point: %s\n", mount_point);
-            if (strcmp("/userdata", mount_point) == 0) {
+            if (strcmp(USERDATA_MOUNT_PATH, mount_point) == 0) {
                 fclose(fp);
                 return true; // mounted
             }
diff --git a/test/middleware/IpcConfig/tool/CMakeLists.txt b/test/middleware/IpcConfig/tool/CMakeLists.txt
index c91e235..eb3d4b1 100644
--- a/test/middleware/IpcConfig/tool/CMakeLists.txt
+++ b/test/middleware/IpcConfig/tool/CMakeLists.txt
@@ -1,4 +1,5 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
+include(${MIDDLEWARE_SOURCE_PATH}/IpcConfig/build/ipc_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
 set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
 
diff --git a/test/middleware/IpcConfig/tool/src/IpcConfigTestTool.cpp b/test/middleware/IpcConfig/tool/src/IpcConfigTestTool.cpp
index 2a345c8..d12906e 100644
--- a/test/middleware/IpcConfig/tool/src/IpcConfigTestTool.cpp
+++ b/test/middleware/IpcConfig/tool/src/IpcConfigTestTool.cpp
@@ -50,7 +50,7 @@ void IpcConfigTestTool::MockMountedFile(void)
     fprintf(file, "tmpfs /tmp tmpfs rw,relatime,size=14464k,nr_inodes=3616 0 0\n");
     fprintf(file, "tmpfs /run tmpfs rw,nosuid,nodev,relatime,size=14464k,nr_inodes=3616,mode=755 0 0\n");
     fprintf(file, "sysfs /sys sysfs rw,relatime 0 0\n");
-    fprintf(file, "/dev/block/by-name/userdata /userdata jffs2 rw,relatime 0 0\n");
+    fprintf(file, "/dev/block/by-name" USERDATA_MOUNT_PATH " " USERDATA_MOUNT_PATH " jffs2 rw,relatime 0 0\n");
     fprintf(
         file,
         "/dev/mmcblk1p1 /mnt/sdcard vfat "