From cb8f448635943ef70b867dd39eb78be62c4d4bd1 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 14 May 2023 23:53:10 +0300 Subject: [PATCH] fix some details of merge --- CMakeLists.txt | 1 - metrics/CMakeLists.txt | 13 --------- server/internal/CMakeLists.txt | 6 ++++ server/internal/metrics/CMakeLists.txt | 28 +++++++++++++++++++ .../metrics/include}/TextMetricsLib.h | 0 .../metrics/include}/TokenMetricLib.h | 0 .../internal/metrics/src}/TextMetricImpl.cpp | 0 .../internal/metrics/src}/TokenMetricImpl.cpp | 0 .../internal/metrics}/testProgs/code1.txt | 0 .../internal/metrics}/testProgs/code2.txt | 0 .../internal/metrics}/tests/CMakeLists.txt | 0 .../metrics}/tests/src/test-codes/code1.txt | 0 .../metrics}/tests/src/text_metrics_tests.cpp | 0 server/internal/service/CMakeLists.txt | 7 +++-- .../service/include/SolutionService.h | 1 + 15 files changed, 40 insertions(+), 16 deletions(-) delete mode 100644 metrics/CMakeLists.txt create mode 100644 server/internal/metrics/CMakeLists.txt rename {metrics/metrics_headers => server/internal/metrics/include}/TextMetricsLib.h (100%) rename {metrics/metrics_headers => server/internal/metrics/include}/TokenMetricLib.h (100%) rename {metrics/source => server/internal/metrics/src}/TextMetricImpl.cpp (100%) rename {metrics/source => server/internal/metrics/src}/TokenMetricImpl.cpp (100%) rename {metrics => server/internal/metrics}/testProgs/code1.txt (100%) rename {metrics => server/internal/metrics}/testProgs/code2.txt (100%) rename {metrics => server/internal/metrics}/tests/CMakeLists.txt (100%) rename {metrics => server/internal/metrics}/tests/src/test-codes/code1.txt (100%) rename {metrics => server/internal/metrics}/tests/src/text_metrics_tests.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef5a104..e51f2bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ set(CMAKE_CXX_STANDARD 20) cmake_minimum_required(VERSION 3.16) -<<<<<<< HEAD set(PROJECT_NAME "SourcedOut") diff --git a/metrics/CMakeLists.txt b/metrics/CMakeLists.txt deleted file mode 100644 index 83bc97d..0000000 --- a/metrics/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(MetricsLib source/TextMetricImpl.cpp source/TokenMetricImpl.cpp) - -target_include_directories(MetricsLib PUBLIC metrics_headers) -target_link_libraries(MetricsLib PUBLIC ${Boost_LIBRARIES}) - -add_custom_target( - ${PROJECT_NAME}_COVERAGE - COMMAND gcovr ${CMAKE_CURRENT_BINARY_DIR} -r ${CMAKE_CURRENT_SOURCE_DIR} -) - -#if(BUILD_TESTS) -add_subdirectory(tests) -#endif() \ No newline at end of file diff --git a/server/internal/CMakeLists.txt b/server/internal/CMakeLists.txt index ef68e73..8fe4e6a 100644 --- a/server/internal/CMakeLists.txt +++ b/server/internal/CMakeLists.txt @@ -1,11 +1,17 @@ add_subdirectory(entities) add_subdirectory(repository) +add_subdirectory(metrics) add_subdirectory(service) set(libEntities_LIB ${libEntities_LIB} PARENT_SCOPE) set(libEntities_INCLUDE_DIRS ${libEntities_INCLUDE_DIRS} PARENT_SCOPE) +set(METRICS_LIBRARY ${METRICS_LIBRARY} PARENT_SCOPE) +set(METRICS_lib_INCLUDE_DIRS ${METRICS_lib_INCLUDE_DIRS} PARENT_SCOPE) + + + set(libRepository_LIB ${libRepository_LIB} PARENT_SCOPE) set(libRepository_INCLUDE_DIRS ${libRepository_INCLUDE_DIRS} PARENT_SCOPE) diff --git a/server/internal/metrics/CMakeLists.txt b/server/internal/metrics/CMakeLists.txt new file mode 100644 index 0000000..bea052a --- /dev/null +++ b/server/internal/metrics/CMakeLists.txt @@ -0,0 +1,28 @@ +project("MetricsLib") + +file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) +file(GLOB INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) + + +include_directories(${INCLUDE_DIRS}) +add_library(${PROJECT_NAME} ${SOURCES}) + +message("ANTLR4_LIB = ${ANTLR4_LIB}") +message("ANTLR4_LIB_INCLUDE_DIRS = ${ANTLR4_LIB_INCLUDE_DIRS}") + +target_include_directories(${PROJECT_NAME} PUBLIC ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES}) + + +set(METRICS_LIBRARY ${PROJECT_NAME}) +set(METRICS_LIBRARY ${METRICS_LIBRARY} PARENT_SCOPE) + + +set(METRICS_lib_INCLUDE_DIRS ${INCLUDE_DIRS}) +set(METRICS_lib_INCLUDE_DIRS ${METRICS_lib_INCLUDE_DIRS} PARENT_SCOPE) + + +enable_testing() +#if(BUILD_TESTS) +# add_subdirectory(tests) +#endif() \ No newline at end of file diff --git a/metrics/metrics_headers/TextMetricsLib.h b/server/internal/metrics/include/TextMetricsLib.h similarity index 100% rename from metrics/metrics_headers/TextMetricsLib.h rename to server/internal/metrics/include/TextMetricsLib.h diff --git a/metrics/metrics_headers/TokenMetricLib.h b/server/internal/metrics/include/TokenMetricLib.h similarity index 100% rename from metrics/metrics_headers/TokenMetricLib.h rename to server/internal/metrics/include/TokenMetricLib.h diff --git a/metrics/source/TextMetricImpl.cpp b/server/internal/metrics/src/TextMetricImpl.cpp similarity index 100% rename from metrics/source/TextMetricImpl.cpp rename to server/internal/metrics/src/TextMetricImpl.cpp diff --git a/metrics/source/TokenMetricImpl.cpp b/server/internal/metrics/src/TokenMetricImpl.cpp similarity index 100% rename from metrics/source/TokenMetricImpl.cpp rename to server/internal/metrics/src/TokenMetricImpl.cpp diff --git a/metrics/testProgs/code1.txt b/server/internal/metrics/testProgs/code1.txt similarity index 100% rename from metrics/testProgs/code1.txt rename to server/internal/metrics/testProgs/code1.txt diff --git a/metrics/testProgs/code2.txt b/server/internal/metrics/testProgs/code2.txt similarity index 100% rename from metrics/testProgs/code2.txt rename to server/internal/metrics/testProgs/code2.txt diff --git a/metrics/tests/CMakeLists.txt b/server/internal/metrics/tests/CMakeLists.txt similarity index 100% rename from metrics/tests/CMakeLists.txt rename to server/internal/metrics/tests/CMakeLists.txt diff --git a/metrics/tests/src/test-codes/code1.txt b/server/internal/metrics/tests/src/test-codes/code1.txt similarity index 100% rename from metrics/tests/src/test-codes/code1.txt rename to server/internal/metrics/tests/src/test-codes/code1.txt diff --git a/metrics/tests/src/text_metrics_tests.cpp b/server/internal/metrics/tests/src/text_metrics_tests.cpp similarity index 100% rename from metrics/tests/src/text_metrics_tests.cpp rename to server/internal/metrics/tests/src/text_metrics_tests.cpp diff --git a/server/internal/service/CMakeLists.txt b/server/internal/service/CMakeLists.txt index ed9f415..05699f7 100644 --- a/server/internal/service/CMakeLists.txt +++ b/server/internal/service/CMakeLists.txt @@ -10,8 +10,11 @@ add_library(${PROJECT_NAME} ${SOURCES}) message("ANTLR4_LIB = ${ANTLR4_LIB}") message("ANTLR4_LIB_INCLUDE_DIRS = ${ANTLR4_LIB_INCLUDE_DIRS}") -target_include_directories(${PROJECT_NAME} PUBLIC ${INCLUDE_DIRS} ${libEntities_INCLUDE_DIRS} ${libRepository_INCLUDE_DIRS} ${ANTLR4_LIB_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} ${libRepository_LIB} ${libEntities_LIB} ${ANTLR4_LIB}) +message("METRICS_lib_INCLUDE_DIRS=${METRICS_lib_INCLUDE_DIRS}") +message("METRICS_LIBRARY=${METRICS_LIBRARY}") + +target_include_directories(${PROJECT_NAME} PUBLIC ${INCLUDE_DIRS} ${libEntities_INCLUDE_DIRS} ${libRepository_INCLUDE_DIRS} ${ANTLR4_LIB_INCLUDE_DIRS} ${METRICS_lib_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${libRepository_LIB} ${libEntities_LIB} ${ANTLR4_LIB} ${METRICS_LIBRARY}) set(SERVICE_lib_LIBRARY ${PROJECT_NAME}) set(SERVICE_lib_LIBRARY ${SERVICE_lib_LIBRARY} PARENT_SCOPE) diff --git a/server/internal/service/include/SolutionService.h b/server/internal/service/include/SolutionService.h index a1c6880..86595fa 100644 --- a/server/internal/service/include/SolutionService.h +++ b/server/internal/service/include/SolutionService.h @@ -9,6 +9,7 @@ #include "ISolutionRepository.hpp" #include "ISolutionService.h" #include "ITaskRepository.hpp" +#include "TextMetricsLib.h" class SolutionService : ISolutionService { private: -- GitLab