diff --git a/Makefile b/Makefile index 0346ea68..f3bf5342 100755 --- a/Makefile +++ b/Makefile @@ -36,4 +36,5 @@ clean: external/libconfig/libconfig-1.7.3 \ external/goahead-5.2.0/GoAhead \ output_files \ - cmake-shell \ No newline at end of file + cmake-shell + @git checkout output_files \ No newline at end of file diff --git a/build/global_config.cmake b/build/global_config.cmake index 2cb9a11a..232f3848 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -55,7 +55,7 @@ set(CLANG_FORMAT_FILE "LLVM ${CMAKE_SOURCE_DIR_IPCSDK}/tools/clang-format/.clang if(${LINUX_TEST} MATCHES "true") set(CLANG_TIDY_SUPPORT "true") set(CLANG_FORMAT_SUPPORT "true") - set(COMPILE_IMPROVE_SUPPORT "true") # 开启后每次编译可能会很慢 + set(COMPILE_IMPROVE_SUPPORT "false") # 开启后每次编译可能会很慢 set(LLVM_PATH "$ENV{HOME}/llvm-project") endif() # ------------ build clang-tools end ------------ # diff --git a/merge.sh b/merge.sh new file mode 100755 index 00000000..d8e6e01f --- /dev/null +++ b/merge.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# 获取所有由我们删除的文件列表 +deleted_files=$(git status --short | grep '^DU' | awk '{print $2}') + +# 检查是否找到了任何文件 +if [[ -z "$deleted_files" ]]; then + echo "没有找到由我们删除的文件。" + exit 0 +fi + +# 遍历文件列表并忽略它们 +for file in $deleted_files; do + echo "忽略文件: $file" + git rm --cached "$file" +done + +# 提示用户提交更改 +echo "已忽略所有由我们删除的文件。" +echo "你可以使用 'git commit' 来提交这些更改。" \ No newline at end of file diff --git a/output_files/libs/test_tools/libAppManagerTestTool.a b/output_files/libs/test_tools/libAppManagerTestTool.a index 53e6489c..8a094a9a 100644 Binary files a/output_files/libs/test_tools/libAppManagerTestTool.a and b/output_files/libs/test_tools/libAppManagerTestTool.a differ diff --git a/output_files/libs/test_tools/libDeviceManagerTestTool.a b/output_files/libs/test_tools/libDeviceManagerTestTool.a index 1486e761..4856dd6c 100644 Binary files a/output_files/libs/test_tools/libDeviceManagerTestTool.a and b/output_files/libs/test_tools/libDeviceManagerTestTool.a differ diff --git a/output_files/libs/test_tools/libHalTestTool.a b/output_files/libs/test_tools/libHalTestTool.a index bcbc9c0d..d36ceb56 100644 Binary files a/output_files/libs/test_tools/libHalTestTool.a and b/output_files/libs/test_tools/libHalTestTool.a differ diff --git a/output_files/libs/test_tools/libHuntingUpgradeTestTool.a b/output_files/libs/test_tools/libHuntingUpgradeTestTool.a index f8724d28..abae798e 100644 Binary files a/output_files/libs/test_tools/libHuntingUpgradeTestTool.a and b/output_files/libs/test_tools/libHuntingUpgradeTestTool.a differ diff --git a/output_files/libs/test_tools/libIpcConfigTestTool.a b/output_files/libs/test_tools/libIpcConfigTestTool.a index 91602c68..724f8aa5 100644 Binary files a/output_files/libs/test_tools/libIpcConfigTestTool.a and b/output_files/libs/test_tools/libIpcConfigTestTool.a differ diff --git a/output_files/libs/test_tools/libMcuAskBaseTestTool.a b/output_files/libs/test_tools/libMcuAskBaseTestTool.a index 061d26dc..bdcb7b02 100644 Binary files a/output_files/libs/test_tools/libMcuAskBaseTestTool.a and b/output_files/libs/test_tools/libMcuAskBaseTestTool.a differ diff --git a/output_files/libs/test_tools/libMcuManagerTestTool.a b/output_files/libs/test_tools/libMcuManagerTestTool.a index 052de460..c3a8df30 100644 Binary files a/output_files/libs/test_tools/libMcuManagerTestTool.a and b/output_files/libs/test_tools/libMcuManagerTestTool.a differ diff --git a/output_files/libs/test_tools/libMcuProtocolTestTool.a b/output_files/libs/test_tools/libMcuProtocolTestTool.a index be3c2e27..1337e716 100644 Binary files a/output_files/libs/test_tools/libMcuProtocolTestTool.a and b/output_files/libs/test_tools/libMcuProtocolTestTool.a differ diff --git a/output_files/libs/test_tools/libMediaManagerTestTool.a b/output_files/libs/test_tools/libMediaManagerTestTool.a index f5ce65e1..bcea574c 100644 Binary files a/output_files/libs/test_tools/libMediaManagerTestTool.a and b/output_files/libs/test_tools/libMediaManagerTestTool.a differ diff --git a/output_files/libs/test_tools/libMissionManagerTestTool.a b/output_files/libs/test_tools/libMissionManagerTestTool.a index 4779dd7b..f52b1f76 100644 Binary files a/output_files/libs/test_tools/libMissionManagerTestTool.a and b/output_files/libs/test_tools/libMissionManagerTestTool.a differ diff --git a/output_files/libs/test_tools/libUartDeviceTestTool.a b/output_files/libs/test_tools/libUartDeviceTestTool.a index cd8b271b..5d546664 100644 Binary files a/output_files/libs/test_tools/libUartDeviceTestTool.a and b/output_files/libs/test_tools/libUartDeviceTestTool.a differ