diff --git a/application/HuntingCamera/CMakeLists.txt b/application/HuntingCamera/CMakeLists.txt index 504305b2..0727975f 100644 --- a/application/HuntingCamera/CMakeLists.txt +++ b/application/HuntingCamera/CMakeLists.txt @@ -31,7 +31,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HuntingCamera_code_check COMMAND ${CLANG_TIDY_EXE} @@ -58,6 +57,7 @@ add_custom_target( -i ${SRC_FILES} ${MAIN_SRC_FILE_THIS} ${HEADER_FILES} WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/HuntingCamera ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/application/MissionManager/CMakeLists.txt b/application/MissionManager/CMakeLists.txt index 10d17bb1..b18189f3 100644 --- a/application/MissionManager/CMakeLists.txt +++ b/application/MissionManager/CMakeLists.txt @@ -32,7 +32,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} McuAskBase StateMachine MediaManager StorageManager DeviceManager HuntingUpgrade KeyControl LedControl StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MissionManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -58,6 +57,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/MissionManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/application/main/CMakeLists.txt b/application/main/CMakeLists.txt index b0d5e124..6f32dd6c 100644 --- a/application/main/CMakeLists.txt +++ b/application/main/CMakeLists.txt @@ -35,7 +35,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( ipc_x86_code_check COMMAND ${CLANG_TIDY_EXE} @@ -55,6 +54,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} ${MAIN_SRC_FILE_THIS} WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/main ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD 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/doc/git_guide.md b/doc/git_guide.md index f7984770..cda57cd8 100644 --- a/doc/git_guide.md +++ b/doc/git_guide.md @@ -192,7 +192,7 @@ origin git@gitee.com:shenzhen-jiuyilian/ipc.git (fetch) origin git@gitee.com:shenzhen-jiuyilian/ipc.git (push) ``` -### 1.4.5. git删除一个远端分支 +### 1.4.5. git删除远端分支 ```code # git push --delete @@ -210,6 +210,34 @@ To gitee.com:shenzhen-jiuyilian/ipc.git - [deleted] Branch_QT ``` +### 1.4.6. git删除本地分支 + +```code +# git branch -d +$ git branch -a +---------------- + =-a + master +* sdk-202405 + remotes/origin/HEAD -> origin/master + remotes/origin/app_test + remotes/origin/master + remotes/origin/sdk-202402 + remotes/origin/sdk-202405 +$ git branch -d =-a +-------------------- +Deleted branch =-a (was c29b4f5). +$ git branch -a +--------------- + master +* sdk-202405 + remotes/origin/HEAD -> origin/master + remotes/origin/app_test + remotes/origin/master + remotes/origin/sdk-202402 + remotes/origin/sdk-202405 +``` + ## 1.5. 多仓库管理 ### 1.5.1. 合并两个无关联记录的仓库 diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index a299a953..cfaf4a4b 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -29,8 +29,6 @@ target_link_libraries(${ABSTRACT_TARGET} LinuxApi KeyControl LedControl StatusCo add_library(${IMPL_TARGET} STATIC ${IMPL_SRC_FILES}) target_link_libraries(${IMPL_TARGET} ${ABSTRACT_TARGET}) - -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( Hal_code_check COMMAND ${CLANG_TIDY_EXE} @@ -51,6 +49,7 @@ add_custom_target( -i ${ABSTRACT_SRC_FILES} ${IMPL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${HAL_SOURCE_PATH} ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${IMPL_TARGET} PRE_BUILD diff --git a/middleware/AppManager/CMakeLists.txt b/middleware/AppManager/CMakeLists.txt index fb405201..5dfba487 100644 --- a/middleware/AppManager/CMakeLists.txt +++ b/middleware/AppManager/CMakeLists.txt @@ -27,7 +27,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} WebServer TcpModule Hal cjson-static StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( AppManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -47,6 +46,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/AppManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/DeviceManager/CMakeLists.txt b/middleware/DeviceManager/CMakeLists.txt index 37344b31..ab52d6a4 100644 --- a/middleware/DeviceManager/CMakeLists.txt +++ b/middleware/DeviceManager/CMakeLists.txt @@ -22,7 +22,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LedControl Hal StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( DeviceManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/DeviceManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/FilesManager/CMakeLists.txt b/middleware/FilesManager/CMakeLists.txt index 66522da3..055c9ac7 100644 --- a/middleware/FilesManager/CMakeLists.txt +++ b/middleware/FilesManager/CMakeLists.txt @@ -24,7 +24,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} sqlite3 StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( FilesManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -50,6 +49,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/FilesManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/HuntingUpgrade/CMakeLists.txt b/middleware/HuntingUpgrade/CMakeLists.txt index c86ea279..b9a2a7ad 100644 --- a/middleware/HuntingUpgrade/CMakeLists.txt +++ b/middleware/HuntingUpgrade/CMakeLists.txt @@ -23,7 +23,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} UpgradeBase StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HuntingUpgrade_code_check COMMAND ${CLANG_TIDY_EXE} @@ -43,6 +42,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/HuntingUpgrade ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/IpcConfig/CMakeLists.txt b/middleware/IpcConfig/CMakeLists.txt index 9bf3c391..d3921c64 100644 --- a/middleware/IpcConfig/CMakeLists.txt +++ b/middleware/IpcConfig/CMakeLists.txt @@ -23,7 +23,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi ConfigBase StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( IpcConfig_code_check COMMAND ${CLANG_TIDY_EXE} @@ -49,6 +48,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/IpcConfig ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/McuAskBase/CMakeLists.txt b/middleware/McuAskBase/CMakeLists.txt index 1b0e51a3..63a7a3b5 100644 --- a/middleware/McuAskBase/CMakeLists.txt +++ b/middleware/McuAskBase/CMakeLists.txt @@ -31,7 +31,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} McuManager StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuAskBase_code_check COMMAND ${CLANG_TIDY_EXE} @@ -57,6 +56,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/McuAskBase ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/McuManager/CMakeLists.txt b/middleware/McuManager/CMakeLists.txt index adcca1a2..ad3d4801 100644 --- a/middleware/McuManager/CMakeLists.txt +++ b/middleware/McuManager/CMakeLists.txt @@ -28,7 +28,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} UartDevice McuAskBase McuProtocol StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -54,6 +53,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/McuManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/MediaManager/CMakeLists.txt b/middleware/MediaManager/CMakeLists.txt index b053f835..22e46e2b 100644 --- a/middleware/MediaManager/CMakeLists.txt +++ b/middleware/MediaManager/CMakeLists.txt @@ -29,7 +29,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} Hal StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MediaManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -55,6 +54,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/MediaManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/StateMachine/CMakeLists.txt b/middleware/StateMachine/CMakeLists.txt index 04e67cdb..5665cefe 100644 --- a/middleware/StateMachine/CMakeLists.txt +++ b/middleware/StateMachine/CMakeLists.txt @@ -23,7 +23,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES} ${SRC_FILES_OPENHARMONY}) target_link_libraries(${TARGET_NAME} Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( StateMachine_code_check COMMAND ${CLANG_TIDY_EXE} @@ -49,6 +48,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StateMachine ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/middleware/StorageManager/CMakeLists.txt b/middleware/StorageManager/CMakeLists.txt index 85a63795..8e88c7b7 100644 --- a/middleware/StorageManager/CMakeLists.txt +++ b/middleware/StorageManager/CMakeLists.txt @@ -26,7 +26,6 @@ add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( StorageManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -52,6 +51,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StorageManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/application/HuntingCamera/CMakeLists.txt b/test/application/HuntingCamera/CMakeLists.txt index 4f21551b..3762933e 100644 --- a/test/application/HuntingCamera/CMakeLists.txt +++ b/test/application/HuntingCamera/CMakeLists.txt @@ -48,7 +48,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HuntingCameraTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -78,6 +77,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/application/HuntingCamera ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/application/MissionManager/tool/CMakeLists.txt b/test/application/MissionManager/tool/CMakeLists.txt index bf73dae1..167f2d01 100644 --- a/test/application/MissionManager/tool/CMakeLists.txt +++ b/test/application/MissionManager/tool/CMakeLists.txt @@ -40,7 +40,6 @@ set(TEST_TOOL_TARGET MissionManagerTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} MissionManager AppManagerTestTool MediaManagerTestTool KeyControl LedControl UpgradeTool StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MissionManagerTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -60,6 +59,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/application/MissionManager/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/application/VersionReleaseTool/CMakeLists.txt b/test/application/VersionReleaseTool/CMakeLists.txt index c75b2c16..89a761a7 100644 --- a/test/application/VersionReleaseTool/CMakeLists.txt +++ b/test/application/VersionReleaseTool/CMakeLists.txt @@ -44,7 +44,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( VersionReleaseTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -74,6 +73,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/application/VersionRelease ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/hal/CMakeLists.txt b/test/hal/CMakeLists.txt index c5ccbcc6..0391ab89 100644 --- a/test/hal/CMakeLists.txt +++ b/test/hal/CMakeLists.txt @@ -14,10 +14,6 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) - - - - aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/hal/tool/CMakeLists.txt b/test/hal/tool/CMakeLists.txt index f56b4561..b35324dd 100644 --- a/test/hal/tool/CMakeLists.txt +++ b/test/hal/tool/CMakeLists.txt @@ -23,7 +23,6 @@ set(TEST_TOOL_TARGET HalTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} Hal KeyControl LedControl LinuxApiMock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HalTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -43,6 +42,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/hal/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/AppManager/CMakeLists.txt b/test/middleware/AppManager/CMakeLists.txt index 95db319b..42ef2722 100644 --- a/test/middleware/AppManager/CMakeLists.txt +++ b/test/middleware/AppManager/CMakeLists.txt @@ -40,7 +40,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( AppManagerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -69,6 +68,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/AppManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/AppManager/tool/CMakeLists.txt b/test/middleware/AppManager/tool/CMakeLists.txt index d32b142e..45285bc0 100644 --- a/test/middleware/AppManager/tool/CMakeLists.txt +++ b/test/middleware/AppManager/tool/CMakeLists.txt @@ -25,7 +25,6 @@ set(TEST_TOOL_TARGET AppManagerTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} AppManager Servers Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( AppManagerTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -45,6 +44,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/AppManager/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/DeviceManager/CMakeLists.txt b/test/middleware/DeviceManager/CMakeLists.txt index c7950fc6..8cc9caff 100644 --- a/test/middleware/DeviceManager/CMakeLists.txt +++ b/test/middleware/DeviceManager/CMakeLists.txt @@ -38,7 +38,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( DeviceManagerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -67,6 +66,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/DeviceManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/DeviceManager/tool/CMakeLists.txt b/test/middleware/DeviceManager/tool/CMakeLists.txt index 05f2ab58..227b2736 100644 --- a/test/middleware/DeviceManager/tool/CMakeLists.txt +++ b/test/middleware/DeviceManager/tool/CMakeLists.txt @@ -21,7 +21,6 @@ set(TEST_TOOL_TARGET DeviceManagerTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} LedControl Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( DeviceManagerTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -41,6 +40,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/DeviceManager/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/HuntingUpgrade/CMakeLists.txt b/test/middleware/HuntingUpgrade/CMakeLists.txt index bcdf839b..85d7478f 100644 --- a/test/middleware/HuntingUpgrade/CMakeLists.txt +++ b/test/middleware/HuntingUpgrade/CMakeLists.txt @@ -37,7 +37,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HuntingUpgradeTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -66,6 +65,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/HuntingUpgrade ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/HuntingUpgrade/tool/CMakeLists.txt b/test/middleware/HuntingUpgrade/tool/CMakeLists.txt index 3489bc22..a22d2c13 100644 --- a/test/middleware/HuntingUpgrade/tool/CMakeLists.txt +++ b/test/middleware/HuntingUpgrade/tool/CMakeLists.txt @@ -24,7 +24,6 @@ set(TEST_TOOL_TARGET HuntingUpgradeTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} UpgradeTool LinuxApi HuntingUpgrade Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( HuntingUpgradeTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -44,6 +43,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/HuntingUpgrade/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/IpcConfig/CMakeLists.txt b/test/middleware/IpcConfig/CMakeLists.txt index 247c9da9..97e7ffd8 100644 --- a/test/middleware/IpcConfig/CMakeLists.txt +++ b/test/middleware/IpcConfig/CMakeLists.txt @@ -38,7 +38,6 @@ target_link_libraries(${TARGET_NAME} IpcConfigTestTool LinuxApi gtest gmock pthr if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( IpcConfigTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -67,6 +66,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/IpcConfig ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/IpcConfig/tool/CMakeLists.txt b/test/middleware/IpcConfig/tool/CMakeLists.txt index e9c8a9b3..00ab20c5 100644 --- a/test/middleware/IpcConfig/tool/CMakeLists.txt +++ b/test/middleware/IpcConfig/tool/CMakeLists.txt @@ -22,7 +22,6 @@ set(TEST_TOOL_TARGET IpcConfigTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} IpcConfig LinuxApiMock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( IpcConfigTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/IpcConfig/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/McuAskBase/tool/CMakeLists.txt b/test/middleware/McuAskBase/tool/CMakeLists.txt index ffeecb99..59670de8 100644 --- a/test/middleware/McuAskBase/tool/CMakeLists.txt +++ b/test/middleware/McuAskBase/tool/CMakeLists.txt @@ -26,7 +26,6 @@ set(TEST_TOOL_TARGET McuAskBaseTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} UartDeviceTestTool Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuAskBaseTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -46,6 +45,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/McuAskBase/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/McuManager/CMakeLists.txt b/test/middleware/McuManager/CMakeLists.txt index 7cbe45a3..408458d0 100644 --- a/test/middleware/McuManager/CMakeLists.txt +++ b/test/middleware/McuManager/CMakeLists.txt @@ -46,7 +46,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuManagerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -75,6 +74,7 @@ add_custom_target( -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/McuManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/McuManager/tool/CMakeLists.txt b/test/middleware/McuManager/tool/CMakeLists.txt index 2fa3e01d..da522314 100644 --- a/test/middleware/McuManager/tool/CMakeLists.txt +++ b/test/middleware/McuManager/tool/CMakeLists.txt @@ -22,7 +22,6 @@ set(TEST_TOOL_TARGET McuManagerTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} McuManager McuProtocolTestTool UartDeviceTestTool LinuxApiMock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuManagerTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/McuManager/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/middleware/MediaManager/CMakeLists.txt b/test/middleware/MediaManager/CMakeLists.txt index 443a29d7..647cba23 100644 --- a/test/middleware/MediaManager/CMakeLists.txt +++ b/test/middleware/MediaManager/CMakeLists.txt @@ -39,7 +39,6 @@ if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MediaManagerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -51,7 +50,7 @@ add_custom_target( # --line-filter='[{\"name\":\"${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include/getest/gtest.h\"}]' --line-filter='[{\"name\":\"${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include/getest/*.h\"}]' -p ${PLATFORM_PATH}/cmake-shell - WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/AppManager + WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/MediaManager ) add_custom_command( TARGET ${TARGET_NAME} @@ -66,8 +65,9 @@ add_custom_target( COMMAND ${CLANG_FORMAT_EXE} -style=file -i ${SRC_FILES} ${SRC_FILES_MAIN} ${HEADER_FILES} - WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/AppManager + WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/MediaManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/middleware/MediaManager/tool/CMakeLists.txt b/test/middleware/MediaManager/tool/CMakeLists.txt index 7d3430f4..45ed2765 100644 --- a/test/middleware/MediaManager/tool/CMakeLists.txt +++ b/test/middleware/MediaManager/tool/CMakeLists.txt @@ -24,7 +24,6 @@ set(TEST_TOOL_TARGET MediaManagerTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} MediaManager Servers Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MediaManagerTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -44,6 +43,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/MediaManager/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/utils/Config/CMakeLists.txt b/test/utils/Config/CMakeLists.txt index 08fb3f86..803d1864 100644 --- a/test/utils/Config/CMakeLists.txt +++ b/test/utils/Config/CMakeLists.txt @@ -27,7 +27,6 @@ target_link_libraries(${TARGET_NAME} ConfigBase gtest gmock pthread) if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( ConfigTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -41,6 +40,7 @@ add_custom_target( -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Config ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/FxHttpServer/CMakeLists.txt b/test/utils/FxHttpServer/CMakeLists.txt index 906b109b..17a0878c 100644 --- a/test/utils/FxHttpServer/CMakeLists.txt +++ b/test/utils/FxHttpServer/CMakeLists.txt @@ -24,7 +24,6 @@ target_link_libraries(${TARGET_NAME} FxHttpServer gtest gmock pthread Log) if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( FxHttpServerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -46,6 +45,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/FxHttpServer ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/LinuxApiMock/CMakeLists.txt b/test/utils/LinuxApiMock/CMakeLists.txt index f921bacb..560a09b7 100644 --- a/test/utils/LinuxApiMock/CMakeLists.txt +++ b/test/utils/LinuxApiMock/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME LinuxApiMock) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi gtest gmock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( LinuxApiMock_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/LinuxApiMock ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt index f15f9dac..277058e2 100644 --- a/test/utils/Log/CMakeLists.txt +++ b/test/utils/Log/CMakeLists.txt @@ -25,7 +25,6 @@ target_link_libraries(${TARGET_NAME} Log gtest gmock pthread) if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( LogTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Log ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/McuProtocol/tool/CMakeLists.txt b/test/utils/McuProtocol/tool/CMakeLists.txt index 42dfd382..2948b736 100644 --- a/test/utils/McuProtocol/tool/CMakeLists.txt +++ b/test/utils/McuProtocol/tool/CMakeLists.txt @@ -25,7 +25,6 @@ set(TEST_TOOL_TARGET McuProtocolTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} UartDeviceTestTool Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuProtocolTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -45,6 +44,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/McuProtocol/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/utils/SharedData/CMakeLists.txt b/test/utils/SharedData/CMakeLists.txt index 2f59cae1..4f3b70e8 100644 --- a/test/utils/SharedData/CMakeLists.txt +++ b/test/utils/SharedData/CMakeLists.txt @@ -28,7 +28,6 @@ target_link_libraries(${TARGET_NAME} SharedData gtest gmock pthread Log) if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( SharedDataTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -50,6 +49,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/SharedData ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/TcpModule/CMakeLists.txt b/test/utils/TcpModule/CMakeLists.txt index 0619c71a..8c737a76 100644 --- a/test/utils/TcpModule/CMakeLists.txt +++ b/test/utils/TcpModule/CMakeLists.txt @@ -32,7 +32,6 @@ endif() if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) target_link_libraries(${TARGET_NAME} LinuxApiMock) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( TcpModuleTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -54,6 +53,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/TcpModule ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/TestManager/CMakeLists.txt b/test/utils/TestManager/CMakeLists.txt index 7b2b91ba..fcefe5a8 100644 --- a/test/utils/TestManager/CMakeLists.txt +++ b/test/utils/TestManager/CMakeLists.txt @@ -21,7 +21,6 @@ set(TARGET_NAME TestManager) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi gtest gmock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( TestManager_code_check COMMAND ${CLANG_TIDY_EXE} @@ -41,6 +40,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/TestManager ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/UartDevice/CMakeLists.txt b/test/utils/UartDevice/CMakeLists.txt index f442586f..40eea415 100644 --- a/test/utils/UartDevice/CMakeLists.txt +++ b/test/utils/UartDevice/CMakeLists.txt @@ -33,7 +33,6 @@ endif() if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) target_link_libraries(${TARGET_NAME} LinuxApiMock) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( UartDeviceTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -55,6 +54,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/UartDevice ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/test/utils/UartDevice/tool/CMakeLists.txt b/test/utils/UartDevice/tool/CMakeLists.txt index 4f0afa9b..88776c4b 100644 --- a/test/utils/UartDevice/tool/CMakeLists.txt +++ b/test/utils/UartDevice/tool/CMakeLists.txt @@ -19,7 +19,6 @@ set(TEST_TOOL_TARGET UartDeviceTestTool) add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES}) target_link_libraries(${TEST_TOOL_TARGET} LinuxApiMock Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( UartDeviceTestTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -i ${TEST_TOOL_SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/UartDevice/tool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TEST_TOOL_TARGET} PRE_BUILD diff --git a/test/utils/WebServer/CMakeLists.txt b/test/utils/WebServer/CMakeLists.txt index 5a84238b..a19ecddf 100644 --- a/test/utils/WebServer/CMakeLists.txt +++ b/test/utils/WebServer/CMakeLists.txt @@ -24,7 +24,6 @@ target_link_libraries(${TARGET_NAME} WebServer gtest gmock pthread Log) if(${TEST_COVERAGE} MATCHES "true") target_link_libraries(${TARGET_NAME} gcov) endif() -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( WebServerTest_code_check COMMAND ${CLANG_TIDY_EXE} @@ -46,6 +45,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/WebServer ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt index f6f1e999..60a87808 100644 --- a/utils/Config/CMakeLists.txt +++ b/utils/Config/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME ConfigBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log libconfig.a) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( Config_code_check COMMAND ${CLANG_TIDY_EXE} @@ -46,6 +45,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Config ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/ConfigBase/CMakeLists.txt b/utils/ConfigBase/CMakeLists.txt index 40703219..284d78c4 100644 --- a/utils/ConfigBase/CMakeLists.txt +++ b/utils/ConfigBase/CMakeLists.txt @@ -21,7 +21,6 @@ set(TARGET_NAME ConfigBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log config) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( ConfigBase_code_check COMMAND ${CLANG_TIDY_EXE} @@ -47,6 +46,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/ConfigBase ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/FxHttpServer/CMakeLists.txt b/utils/FxHttpServer/CMakeLists.txt index 8fba0ba7..2f20c634 100644 --- a/utils/FxHttpServer/CMakeLists.txt +++ b/utils/FxHttpServer/CMakeLists.txt @@ -25,7 +25,6 @@ set(TARGET_NAME FxHttpServer) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log -Wl,--start-group httpsrv -Wl,--end-group) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( FxHttpServer_code_check COMMAND ${CLANG_TIDY_EXE} @@ -45,6 +44,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/FxHttpServer ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/KeyControl/CMakeLists.txt b/utils/KeyControl/CMakeLists.txt index 102e6a1d..0b0a5efe 100644 --- a/utils/KeyControl/CMakeLists.txt +++ b/utils/KeyControl/CMakeLists.txt @@ -22,7 +22,6 @@ set(TARGET_NAME KeyControl) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( KeyControl_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/KeyControl ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/LedControl/CMakeLists.txt b/utils/LedControl/CMakeLists.txt index 6f212f65..3b2f9ad1 100644 --- a/utils/LedControl/CMakeLists.txt +++ b/utils/LedControl/CMakeLists.txt @@ -22,7 +22,6 @@ set(TARGET_NAME LedControl) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( LedControl_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/LedControl ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/LinuxApi/CMakeLists.txt b/utils/LinuxApi/CMakeLists.txt index ea8af247..0e8eecdf 100644 --- a/utils/LinuxApi/CMakeLists.txt +++ b/utils/LinuxApi/CMakeLists.txt @@ -19,7 +19,6 @@ set(TARGET_NAME LinuxApi) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( LinuxApi_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/LinuxApi ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/Log/CMakeLists.txt b/utils/Log/CMakeLists.txt index b65eb640..6b9e528b 100644 --- a/utils/Log/CMakeLists.txt +++ b/utils/Log/CMakeLists.txt @@ -27,7 +27,6 @@ add_library(${ABSTRACT_TARGET} STATIC ${ABSTRACT_SRC_FILES}) add_library(${IMPL_TARGET} STATIC ${IMPL_SRC_FILES} ${EASYLOGGING_SRC_FILES}) target_link_libraries(${IMPL_TARGET} ${ABSTRACT_TARGET}) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( Log_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Log ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${IMPL_TARGET} PRE_BUILD diff --git a/utils/McuProtocol/CMakeLists.txt b/utils/McuProtocol/CMakeLists.txt index 0b37a80a..c9be68df 100644 --- a/utils/McuProtocol/CMakeLists.txt +++ b/utils/McuProtocol/CMakeLists.txt @@ -22,7 +22,6 @@ set(TARGET_NAME McuProtocol) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} ModBusCRC16 StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( McuProtocol_code_check COMMAND ${CLANG_TIDY_EXE} @@ -42,6 +41,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/McuProtocol ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/MediaAdapter/CMakeLists.txt b/utils/MediaAdapter/CMakeLists.txt index 02285eab..ece81b73 100644 --- a/utils/MediaAdapter/CMakeLists.txt +++ b/utils/MediaAdapter/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME MediaAdapter) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MediaAdapter_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/MediaAdapter ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/MediaBase/CMakeLists.txt b/utils/MediaBase/CMakeLists.txt index 7c1e51d8..c27aed28 100644 --- a/utils/MediaBase/CMakeLists.txt +++ b/utils/MediaBase/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME MediaBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MediaBase_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/MediaBase ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/MediaBase/include/MediaBase.h b/utils/MediaBase/include/MediaBase.h index a5df302f..2746f0c4 100644 --- a/utils/MediaBase/include/MediaBase.h +++ b/utils/MediaBase/include/MediaBase.h @@ -21,9 +21,13 @@ extern "C" { enum MediaHandleType { MEDIA_HANDLE_TYPE_READ_H264 = 0, + MEDIA_HANDLE_TYPE_READ_G711, MEDIA_HANDLE_TYPE_END }; void *ICreateMediaBase(const MediaHandleType type); +// StatusCode Init(void *object); +// StatusCode UnInit(void *object); +StatusCode IStartReadFile(void *object, const char *path); void IMediaBaseFree(void *object); #ifdef __cplusplus } diff --git a/utils/MediaBase/src/IMediaBase.cpp b/utils/MediaBase/src/IMediaBase.cpp index 5a36544d..0bbf06bd 100644 --- a/utils/MediaBase/src/IMediaBase.cpp +++ b/utils/MediaBase/src/IMediaBase.cpp @@ -15,6 +15,11 @@ #include "IMediaBase.h" #include "ILog.h" #include +StatusCode IMediaBase::StartReadFile(const std::string &path) +{ + LogInfo("STATUS_CODE_VIRTUAL_FUNCTION\n"); + return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); +} static const char *MEDIA_BASE_NAME = "media_adapter"; const char inline *GetMediaBaseModuleName(void) { diff --git a/utils/MediaBase/src/IMediaBase.h b/utils/MediaBase/src/IMediaBase.h index 092899eb..d6a93f08 100644 --- a/utils/MediaBase/src/IMediaBase.h +++ b/utils/MediaBase/src/IMediaBase.h @@ -21,6 +21,7 @@ class IMediaBase public: IMediaBase() = default; virtual ~IMediaBase() = default; + virtual StatusCode StartReadFile(const std::string &path); }; typedef struct media_base_header { diff --git a/utils/MediaBase/src/MediaBase.cpp b/utils/MediaBase/src/MediaBase.cpp index 9d41dc08..cdf31fab 100644 --- a/utils/MediaBase/src/MediaBase.cpp +++ b/utils/MediaBase/src/MediaBase.cpp @@ -31,6 +31,13 @@ static bool ObjectCheck(void *object) } return true; } +StatusCode IStartReadFile(void *object, const char *path) +{ + if (ObjectCheck(object) == true) { + return (*(std::shared_ptr *)object)->StartReadFile(path); + } + return CreateStatusCode(STATUS_CODE_OK); +} void IMediaBaseFree(void *object) { if (ObjectCheck(object) == true) { diff --git a/utils/MediaBase/src/MediaBaseImpl.cpp b/utils/MediaBase/src/MediaBaseImpl.cpp index 632636a8..186715eb 100644 --- a/utils/MediaBase/src/MediaBaseImpl.cpp +++ b/utils/MediaBase/src/MediaBaseImpl.cpp @@ -12,4 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "MediaBaseImpl.h" \ No newline at end of file +#include "MediaBaseImpl.h" +StatusCode MediaBaseImpl::StartReadFile(const std::string &path) +{ + return CreateStatusCode(STATUS_CODE_OK); +} +void MediaBaseImpl::InitFfmpeg(void) +{ +} +void MediaBaseImpl::UnInitFfmpeg(void) +{ +} \ No newline at end of file diff --git a/utils/MediaBase/src/MediaBaseImpl.h b/utils/MediaBase/src/MediaBaseImpl.h index 39d2598a..0ac28602 100644 --- a/utils/MediaBase/src/MediaBaseImpl.h +++ b/utils/MediaBase/src/MediaBaseImpl.h @@ -20,5 +20,10 @@ class MediaBaseImpl : public IMediaBase public: MediaBaseImpl() = default; virtual ~MediaBaseImpl() = default; + StatusCode StartReadFile(const std::string &path) override; + +private: + void InitFfmpeg(void); + void UnInitFfmpeg(void); }; #endif \ No newline at end of file diff --git a/utils/ModBusCRC16/CMakeLists.txt b/utils/ModBusCRC16/CMakeLists.txt index a60d4dc4..c475c95f 100644 --- a/utils/ModBusCRC16/CMakeLists.txt +++ b/utils/ModBusCRC16/CMakeLists.txt @@ -21,7 +21,6 @@ set(TARGET_NAME ModBusCRC16) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( ModBusCRC16_code_check COMMAND ${CLANG_TIDY_EXE} @@ -33,6 +32,7 @@ add_custom_target( -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/ModBusCRC16 ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/MultiProcess/CMakeLists.txt b/utils/MultiProcess/CMakeLists.txt index 59ff909d..949ad512 100644 --- a/utils/MultiProcess/CMakeLists.txt +++ b/utils/MultiProcess/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME MultiProcess) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( MultiProcess_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/MultiProcess ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/Servers/CMakeLists.txt b/utils/Servers/CMakeLists.txt index 1e356c4c..eb4eb669 100755 --- a/utils/Servers/CMakeLists.txt +++ b/utils/Servers/CMakeLists.txt @@ -108,7 +108,6 @@ add_custom_command( WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( Servers_code_check COMMAND ${CLANG_TIDY_EXE} @@ -128,6 +127,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Servers ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/SharedData/CMakeLists.txt b/utils/SharedData/CMakeLists.txt index 2bd1ce4f..32fb0a75 100644 --- a/utils/SharedData/CMakeLists.txt +++ b/utils/SharedData/CMakeLists.txt @@ -19,7 +19,6 @@ set(TARGET_NAME SharedData) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log LinuxApi) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( SharedData_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/SharedData ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/StatusCode/CMakeLists.txt b/utils/StatusCode/CMakeLists.txt index 3f2d415e..7e9b9b32 100644 --- a/utils/StatusCode/CMakeLists.txt +++ b/utils/StatusCode/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME StatusCode) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( StatusCode_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/StatusCode ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/TcpModule/CMakeLists.txt b/utils/TcpModule/CMakeLists.txt index a3d94d2e..613358d3 100644 --- a/utils/TcpModule/CMakeLists.txt +++ b/utils/TcpModule/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME TcpModule) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi hv_static StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( TcpModule_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/TcpModule ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/UartDevice/CMakeLists.txt b/utils/UartDevice/CMakeLists.txt index eafbfeba..130ae203 100644 --- a/utils/UartDevice/CMakeLists.txt +++ b/utils/UartDevice/CMakeLists.txt @@ -19,7 +19,6 @@ set(TARGET_NAME UartDevice) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( UartDevice_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/UartDevice ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/UpgradeBase/CMakeLists.txt b/utils/UpgradeBase/CMakeLists.txt index e34986ce..77051ed3 100644 --- a/utils/UpgradeBase/CMakeLists.txt +++ b/utils/UpgradeBase/CMakeLists.txt @@ -19,7 +19,6 @@ set(TARGET_NAME UpgradeBase) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( UpgradeBase_code_check COMMAND ${CLANG_TIDY_EXE} @@ -39,6 +38,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/UpgradeBase ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/UpgradeTool/CMakeLists.txt b/utils/UpgradeTool/CMakeLists.txt index 9665d8b0..fdd797ec 100644 --- a/utils/UpgradeTool/CMakeLists.txt +++ b/utils/UpgradeTool/CMakeLists.txt @@ -20,7 +20,6 @@ set(TARGET_NAME UpgradeTool) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} LinuxApi StatusCode Log) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( UpgradeTool_code_check COMMAND ${CLANG_TIDY_EXE} @@ -40,6 +39,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/UpgradeTool ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD diff --git a/utils/WebServer/CMakeLists.txt b/utils/WebServer/CMakeLists.txt index 4b0c8150..2782a27a 100644 --- a/utils/WebServer/CMakeLists.txt +++ b/utils/WebServer/CMakeLists.txt @@ -42,7 +42,6 @@ set(TARGET_NAME WebServer) add_library(${TARGET_NAME} STATIC ${SRC_FILES}) target_link_libraries(${TARGET_NAME} StatusCode Log -Wl,--start-group libgo.a libmbedtls.a libgoahead-mbedtls.a -Wl,--end-group) -if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_target( WebServer_code_check COMMAND ${CLANG_TIDY_EXE} @@ -62,6 +61,7 @@ add_custom_target( -i ${SRC_FILES} ${HEADER_FILES} WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/WebServer ) +if ("${COMPILE_IMPROVE_SUPPORT}" MATCHES "true") add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD