#509: Remove install and use of deprecated logging headers

apache · Oct 1, 2023 · 7ee448b · 7ee448b
1 parent 54e2d65
commit 7ee448b
Show file tree

Hide file tree

Showing 23 changed files with 2 additions and 1,696 deletions.
diff --git a/bundles/logging/CMakeLists.txt b/bundles/logging/CMakeLists.txt
@@ -21,12 +21,6 @@ add_subdirectory(log_helper)
 
 celix_subproject(LOG_SERVICE "Option to enable building the Log Service bundles" ON)
 if (LOG_SERVICE)
-    #Version 2 API (deprecated)
-    if (CELIX_INSTALL_DEPRECATED_API)
-        add_subdirectory(log_service_v2)
-    endif ()
-
-    #Version 3 API
     add_subdirectory(log_admin)
     add_subdirectory(log_writers)
 endif ()

diff --git a/bundles/logging/log_helper/CMakeLists.txt b/bundles/logging/log_helper/CMakeLists.txt
@@ -17,26 +17,13 @@
 
 celix_subproject(LOG_HELPER "Option to enable building the log helper library" ON)
 if (LOG_HELPER)
-    if (CELIX_INSTALL_DEPRECATED_API)
-        set(SOURCES src/celix_log_helper.c src/log_helper.c)
-    else ()
-        set(SOURCES src/celix_log_helper.c)
-    endif ()
-
-    add_library(log_helper STATIC ${SOURCES})
+    add_library(log_helper STATIC src/celix_log_helper.c)
     set_target_properties(log_helper PROPERTIES OUTPUT_NAME "celix_log_utils")
     target_include_directories(log_helper PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
             )
     target_link_libraries(log_helper PUBLIC Celix::log_service_api Celix::framework PRIVATE Celix::utils)
 
-    if (CELIX_INSTALL_DEPRECATED_API)
-        target_include_directories(log_helper PUBLIC
-                $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include_v1>
-                )
-        install(DIRECTORY include_v1/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper)
-    endif ()
-
     install(TARGETS log_helper EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT logging
             INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper)
     install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_helper COMPONENT logging)

diff --git a/bundles/logging/log_helper/include_v1/log_helper.h b/bundles/logging/log_helper/include_v1/log_helper.h
diff --git a/bundles/logging/log_helper/src/log_helper.c b/bundles/logging/log_helper/src/log_helper.c
diff --git a/bundles/logging/log_service_api/CMakeLists.txt b/bundles/logging/log_service_api/CMakeLists.txt
@@ -23,14 +23,6 @@ if (LOG_SERVICE_API)
             )
     target_link_libraries(log_service_api INTERFACE Celix::utils)
 
-    if (CELIX_INSTALL_DEPRECATED_API)
-        target_link_libraries(log_service_api INTERFACE Celix::framework)
-        target_include_directories(log_service_api INTERFACE
-                $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include_v2>
-                )
-        install(DIRECTORY include_v2/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_service)
-    endif ()
-
     install(TARGETS log_service_api EXPORT celix
             INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_service)
     install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/log_service)