From 211a6e078cb580e36f32469ab89781792def3178 Mon Sep 17 00:00:00 2001 From: Mateusz Grzegorzek Date: Thu, 15 Jul 2021 08:33:41 +0200 Subject: [PATCH] [BH-375] Clean `module-utils/third-party` Clean `module-utils/third-party` --- .gitmodules | 56 +++++++++++++------------- cmake/modules/PureCoverage.cmake | 3 -- config/format-config.sh | 4 -- doc/Doxyfile.in | 4 -- module-utils/third-party/pugixml.cmake | 21 ---------- 5 files changed, 28 insertions(+), 60 deletions(-) delete mode 100644 module-utils/third-party/pugixml.cmake diff --git a/.gitmodules b/.gitmodules index 68624b5eb9c5c2967eabed4bef66b15306074a2d..c0dda7ce6169dcef677dd4f78bd49b2fb237ae71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,95 +1,95 @@ -[submodule "module-lwip/lib/lwip"] +[submodule "lwip"] path = module-lwip/lib/lwip url = ../lwip.git shallow = true -[submodule "module-utils/microtar"] +[submodule "microtar"] path = third-party/microtar/src url = ../microtar.git -[submodule "third-party/segger"] +[submodule "segger"] path = third-party/segger url = ../segger-utils.git -[submodule "module-utils/protobuf"] +[submodule "protobuf"] path = third-party/protobuf/src url = ../protobuf.git branch = rt1051 shallow = true -[submodule "third-party/libphonenumber"] +[submodule "libphonenumber"] path = third-party/libphonenumber/src url = ../libphonenumber.git branch = rt1051 shallow = true -[submodule "test/googletest"] +[submodule "googletest"] path = test/googletest url = https://github.com/google/googletest branch = 703bd9caab50b139428cea1aaff9974ebee5742e -[submodule "test/Catch2"] +[submodule "Catch2"] path = test/Catch2 url = https://github.com/catchorg/Catch2 -[submodule "third-party/date"] +[submodule "date"] path = third-party/date url = ../date.git -[submodule "module-utils/taglib"] +[submodule "taglib"] path = third-party/taglib url = ../taglib.git branch = rt1051 -[submodule "module-bluetooth/lib/btstack"] +[submodule "btstack"] path = module-bluetooth/lib/btstack url = ../btstack.git -[submodule "module-utils/pugixml"] +[submodule "pugixml"] path = third-party/pugixml url = ../pugixml.git -[submodule "module-utils/magic_enum"] +[submodule "magic_enum"] path = third-party/magic_enum url = https://github.com/Neargye/magic_enum.git -[submodule "module-utils/tinyexpr"] +[submodule "tinyexpr"] path = third-party/tinyexpr/src url = https://github.com/codeplea/tinyexpr.git -[submodule "module-vfs/thirdparty/fatfs"] +[submodule "fatfs"] path = third-party/fatfs/src url = ../fatfs.git -[submodule "host-tools/littlefs-fuse/lfsfuse"] +[submodule "lfsfuse"] path = host-tools/littlefs-fuse/lfsfuse url = https://github.com/littlefs-project/littlefs-fuse.git -[submodule "third-party/sml"] +[submodule "sml"] path = third-party/sml/src url = https://github.com/boost-ext/sml -[submodule "tools/misc"] +[submodule "misc"] path = tools/misc url = ../misc-tools.git -[submodule "test/harness"] +[submodule "harness"] path = test/harness url = ../QAMuditaHarness.git shallow = true -[submodule "third-party/CrashDebug"] +[submodule "CrashDebug"] path = third-party/CrashDebug/src url = https://github.com/adamgreen/CrashDebug.git -[submodule "third-party/minimp3/minimp3"] +[submodule "minimp3"] path = third-party/minimp3/minimp3 url = ../minimp3.git branch = RT1051 -[submodule "third-party/parallel-hashmap/src"] +[submodule "parallel-hashmap"] path = third-party/parallel-hashmap/src url = https://github.com/greg7mdp/parallel-hashmap.git -[submodule "third-party/littlefs/src"] +[submodule "littlefs"] path = third-party/littlefs/src url = https://github.com/littlefs-project/littlefs.git -[submodule "third-party/gsl"] +[submodule "gsl"] path = third-party/gsl url = https://github.com/microsoft/GSL.git -[submodule "third-party/re2/src"] +[submodule "re2"] path = third-party/re2/src url = ../re2.git branch = rt1051 -[submodule "third-party/utz/src/utz"] +[submodule "utz"] path = third-party/utz/src/utz url = https://github.com/mudita/utz.git -[submodule "third-party/base64/src"] +[submodule "base64"] path = third-party/base64/src url = https://github.com/rafagafe/base64.git -[submodule "third-party/hash-library/src"] +[submodule "hash-library"] path = third-party/hash-library/src url = https://github.com/mudita/hash-library.git branch = rt1051 -[submodule "third-party/usb_stack"] +[submodule "usb_stack"] path = third-party/usb_stack url = ../usb_stack.git diff --git a/cmake/modules/PureCoverage.cmake b/cmake/modules/PureCoverage.cmake index 5f099ae1672c3be034c03ce645a811d2a9ddfc99..5bd1ea90b793bea7c499eb75ecbd17508b4d46d5 100644 --- a/cmake/modules/PureCoverage.cmake +++ b/cmake/modules/PureCoverage.cmake @@ -28,9 +28,6 @@ if(COVERAGE_ENABLE) module-db/Database/sqlite3.c module-lwip/lib/.* module-os/.* - module-utils/gsl/.* - module-utils/json/.* - module-utils/segger/.* source/main.cpp test/.* ) diff --git a/config/format-config.sh b/config/format-config.sh index 15d42df34ae3f6638b1782ac6221f40ccf9e74dc..ba903452b7cb59034b7c0294cff8ef1bac4c5150 100644 --- a/config/format-config.sh +++ b/config/format-config.sh @@ -47,10 +47,6 @@ export declare ignore_paths=( 'module-lwip/includes/lwipopts.h' 'module-lwip/lib/lwip/' 'module-os/' - 'module-utils/microtar/' - 'module-utils/segger/log/' - 'module-utils/segger/systemview/' - 'module-utils/tinyfsm/' 'module-vfs/board/cross/freeRTOS_FAT/' 'module-vfs/board/free_rtos_custom/include/FreeRTOSFATConfig.h' 'module-vfs/drivers/include/thirdparty/fatfs/ffconf.h' diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index d74556598f02dd2073c48f6eb0dfe6cec9a7738e..5f012025e6208b224b6a2cc891863aa4570fef07 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -886,15 +886,11 @@ RECURSIVE = YES # run. EXCLUDE = @PROJECT_SOURCE_DIR@/module-bluetooth/lib \ - @PROJECT_SOURCE_DIR@/module-utils/tinyfsm \ - @PROJECT_SOURCE_DIR@/module-utils/segger \ - @PROJECT_SOURCE_DIR@/module-utils/sbini \ @PROJECT_SOURCE_DIR@/module-utils/test \ @PROJECT_SOURCE_DIR@/module-db/tests \ @PROJECT_SOURCE_DIR@/module-db/Database/sqlite3.c \ @PROJECT_SOURCE_DIR@/module-cellular/tests \ @PROJECT_SOURCE_DIR@/module-cellular/Modem/TS0710/tests \ - @PROJECT_SOURCE_DIR@/module-utils/test \ @PROJECT_SOURCE_DIR@/module-sys/tests \ @PROJECT_SOURCE_DIR@/module-bsp/tests \ @PROJECT_SOURCE_DIR@/module-audio/tests \ diff --git a/module-utils/third-party/pugixml.cmake b/module-utils/third-party/pugixml.cmake deleted file mode 100644 index 806b0563a5370145a89f6f9e2e7e000994cfbc47..0000000000000000000000000000000000000000 --- a/module-utils/third-party/pugixml.cmake +++ /dev/null @@ -1,21 +0,0 @@ -include (thirdparty) - -set (PUGIXML_TARGET pugixml) - -# setup pufixml path and source list -set (PUGIXML_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src) -set (PUGIXML_SOURCES - ${PUGIXML_SRCDIR}/pugixml.cpp -) - -# create static library for the third party -add_library (${PUGIXML_TARGET} STATIC ${PUGIXML_SOURCES}) - -# setup flags for the third party -third_party_target_setup (${PUGIXML_TARGET}) - -# add include directory path -target_include_directories (${PUGIXML_TARGET} PUBLIC ${PUGIXML_SRCDIR}) - -# turn on optimization in debug -third_party_source_optimization (${PUGIXML_SOURCES})