From 8e626bc45116d42d3394df116728e14611e19932 Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Thu, 16 Nov 2023 08:42:08 -0800 Subject: [PATCH] Improve code check. --- application/MissionManager/CMakeLists.txt | 4 +-- application/main/CMakeLists.txt | 13 ++++++++-- application/main/main.cpp | 2 +- application/main/src/MainThread.cpp | 30 ++++++----------------- hal/CMakeLists.txt | 4 +-- middleware/DeviceManager/CMakeLists.txt | 4 +-- middleware/IpcConfig/CMakeLists.txt | 4 +-- middleware/StateMachine/CMakeLists.txt | 4 +-- test/middleware/IpcConfig/CMakeLists.txt | 4 +-- test/utils/Config/CMakeLists.txt | 4 +-- test/utils/Log/CMakeLists.txt | 4 +-- test/utils/SharedData/CMakeLists.txt | 4 +-- utils/Config/CMakeLists.txt | 4 +-- utils/Log/CMakeLists.txt | 5 ++-- utils/SharedData/CMakeLists.txt | 4 +-- utils/StatusCode/CMakeLists.txt | 4 +-- utils/UartDevice/CMakeLists.txt | 4 +-- 17 files changed, 48 insertions(+), 54 deletions(-) diff --git a/application/MissionManager/CMakeLists.txt b/application/MissionManager/CMakeLists.txt index 25748eb2..67086902 100644 --- a/application/MissionManager/CMakeLists.txt +++ b/application/MissionManager/CMakeLists.txt @@ -34,13 +34,13 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/MissionManager ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make MissionManager_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/application/main/CMakeLists.txt b/application/main/CMakeLists.txt index e467e6e3..1ec3a42b 100644 --- a/application/main/CMakeLists.txt +++ b/application/main/CMakeLists.txt @@ -45,13 +45,22 @@ add_custom_target( --system-headers=false ${MAIN_SRC_FILE_THIS} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell + WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/main +) +file(GLOB_RECURSE HEADER_FILES *.h) +add_custom_target( + ipc_x86_code_format + COMMAND ${CLANG_FORMAT_EXE} + -style=file + -i ${SRC_FILES} ${HEADER_FILES} ${MAIN_SRC_FILE_THIS} WORKING_DIRECTORY ${APPLICATION_SOURCE_PATH}/main ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make ipc_x86_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + COMMAND make ipc_x86_code_format + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() diff --git a/application/main/main.cpp b/application/main/main.cpp index b937face..8c1b801c 100644 --- a/application/main/main.cpp +++ b/application/main/main.cpp @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "MainThread.h" #include "ILog.h" +#include "MainThread.h" #include int main(int argc, char *argv[]) { diff --git a/application/main/src/MainThread.cpp b/application/main/src/MainThread.cpp index fbef8c42..6abbec48 100644 --- a/application/main/src/MainThread.cpp +++ b/application/main/src/MainThread.cpp @@ -15,22 +15,16 @@ #include "MainThread.h" #include "ILog.h" #include -MainThread::MainThread() -{ - mMainThreadRuning = false; -} +MainThread::MainThread() { mMainThreadRuning = false; } std::shared_ptr &MainThread::GetInstance(std::shared_ptr *impl) { static auto instance = std::make_shared(); - if (impl) - { - if (instance.use_count() == 1) - { + if (impl) { + if (instance.use_count() == 1) { LogInfo("Instance changed succeed.\n"); instance = *impl; } - else - { + else { LogError("Can't changing the instance becase of using by some one.\n"); } } @@ -46,20 +40,12 @@ StatusCode MainThread::UnInit(void) DestoryAllModules(); return CreateStatusCode(STATUS_CODE_OK); } -StatusCode MainThread::CreateAllModules(void) -{ - return CreateStatusCode(STATUS_CODE_OK); -} -void MainThread::DestoryAllModules(void) -{ -} -void MainThread::ResetAllPtrMaker(void) -{ -} +StatusCode MainThread::CreateAllModules(void) { return CreateStatusCode(STATUS_CODE_OK); } +void MainThread::DestoryAllModules(void) {} +void MainThread::ResetAllPtrMaker(void) {} void MainThread::Runing(void) { - while (mMainThreadRuning) - { + while (mMainThreadRuning) { std::this_thread::sleep_for(std::chrono::milliseconds(1000)); } } \ No newline at end of file diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index d69b0787..e1be1c64 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -42,7 +42,7 @@ add_custom_target( ${ABSTRACT_SRC_FILES} ${IMPL_SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell # -- -I /usr/include/linux/ -X c++ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/hal ) @@ -51,6 +51,6 @@ add_custom_command( TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make hal_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/middleware/DeviceManager/CMakeLists.txt b/middleware/DeviceManager/CMakeLists.txt index 82d8e8bf..696ede1b 100644 --- a/middleware/DeviceManager/CMakeLists.txt +++ b/middleware/DeviceManager/CMakeLists.txt @@ -33,13 +33,13 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/DeviceManager ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make DeviceManager_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/middleware/IpcConfig/CMakeLists.txt b/middleware/IpcConfig/CMakeLists.txt index 21327859..3c762c53 100644 --- a/middleware/IpcConfig/CMakeLists.txt +++ b/middleware/IpcConfig/CMakeLists.txt @@ -38,13 +38,13 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/IpcConfig ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make IpcConfig_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/middleware/StateMachine/CMakeLists.txt b/middleware/StateMachine/CMakeLists.txt index 89c5be3a..e84be302 100644 --- a/middleware/StateMachine/CMakeLists.txt +++ b/middleware/StateMachine/CMakeLists.txt @@ -35,7 +35,7 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StateMachine ) file(GLOB_RECURSE HEADER_FILES *.h) @@ -51,6 +51,6 @@ add_custom_command( PRE_BUILD COMMAND make StateMahince_code_check COMMAND make StateMahince_code_format - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/test/middleware/IpcConfig/CMakeLists.txt b/test/middleware/IpcConfig/CMakeLists.txt index ad9d940f..d6b727a7 100644 --- a/test/middleware/IpcConfig/CMakeLists.txt +++ b/test/middleware/IpcConfig/CMakeLists.txt @@ -45,14 +45,14 @@ add_custom_target( ${CLANG_TIDY_CONFIG} # --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 ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/middleware/IpcConfig ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make IpcConfigTest_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() define_file_name(${TARGET_NAME}) \ No newline at end of file diff --git a/test/utils/Config/CMakeLists.txt b/test/utils/Config/CMakeLists.txt index c61b6782..81cb9e37 100644 --- a/test/utils/Config/CMakeLists.txt +++ b/test/utils/Config/CMakeLists.txt @@ -46,13 +46,13 @@ add_custom_target( ${CLANG_TIDY_CONFIG} # --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 ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Config ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make ConfigTest_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt index bc1b402c..9ee59070 100644 --- a/test/utils/Log/CMakeLists.txt +++ b/test/utils/Log/CMakeLists.txt @@ -43,13 +43,13 @@ add_custom_target( ${CLANG_TIDY_CONFIG} # --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 ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Log ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make LogTest_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/test/utils/SharedData/CMakeLists.txt b/test/utils/SharedData/CMakeLists.txt index 010f505a..7e81c406 100644 --- a/test/utils/SharedData/CMakeLists.txt +++ b/test/utils/SharedData/CMakeLists.txt @@ -42,7 +42,7 @@ add_custom_target( ${CLANG_TIDY_CONFIG} # --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 ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/SharedData ) file(GLOB_RECURSE HEADER_FILES *.h) @@ -58,7 +58,7 @@ add_custom_command( PRE_BUILD COMMAND make SharedDataTest_code_check COMMAND make SharedDataTest_code_format - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt index 21ee8d3f..ef8d3575 100644 --- a/utils/Config/CMakeLists.txt +++ b/utils/Config/CMakeLists.txt @@ -32,14 +32,14 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Config ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make Config_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() diff --git a/utils/Log/CMakeLists.txt b/utils/Log/CMakeLists.txt index 4b3325c5..0216cae5 100644 --- a/utils/Log/CMakeLists.txt +++ b/utils/Log/CMakeLists.txt @@ -38,14 +38,13 @@ add_custom_target( ${IMPL_SRC_FILES} ${ABSTRACT_SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Log ) add_custom_command( TARGET ${IMPL_TARGET} - # TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make Log_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/utils/SharedData/CMakeLists.txt b/utils/SharedData/CMakeLists.txt index 35731747..bae3a49e 100644 --- a/utils/SharedData/CMakeLists.txt +++ b/utils/SharedData/CMakeLists.txt @@ -30,7 +30,7 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/SharedData ) file(GLOB_RECURSE HEADER_FILES *.h) @@ -46,7 +46,7 @@ add_custom_command( PRE_BUILD COMMAND make SharedData_code_check COMMAND make SharedData_code_format - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() diff --git a/utils/StatusCode/CMakeLists.txt b/utils/StatusCode/CMakeLists.txt index 7dca222e..e7185d8a 100644 --- a/utils/StatusCode/CMakeLists.txt +++ b/utils/StatusCode/CMakeLists.txt @@ -31,14 +31,14 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/StatusCode ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make StatusCode_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() define_file_name(${TARGET_NAME}) \ No newline at end of file diff --git a/utils/UartDevice/CMakeLists.txt b/utils/UartDevice/CMakeLists.txt index aeccb346..811d8b66 100644 --- a/utils/UartDevice/CMakeLists.txt +++ b/utils/UartDevice/CMakeLists.txt @@ -30,7 +30,7 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell + -p ${PLATFORM_PATH}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/UartDevice ) file(GLOB_RECURSE HEADER_FILES *.h) @@ -46,7 +46,7 @@ add_custom_command( PRE_BUILD COMMAND make UartDevice_code_check COMMAND make UartDevice_code_format - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ + WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif()