Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/509 remove install of v2 headers #666

Merged
merged 16 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ See the License for the specific language governing permissions and
limitations under the License.
-->

# Noteworthy Changes for 3.0.0 (TBD)

## Backwards incompatible changes

- Celix C API without a `celix_` is removed from the utils and framework lib and no longer supported.
- Shell v2 api is removed and no longer supported.
- Logging v2 api is removed and no longer supported.
- Bonjour Shell bundle is removed and no longer supported.
- pubsub_serializer.h is removed and no longer supported. Use pubsub_message_serialization_service.h instead.

# Noteworthy Changes for 2.4.0 (2023-09-27)

## New Features
Expand Down
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ if (ENABLE_TESTING)
enable_testing()
endif()

option(CELIX_INSTALL_DEPRECATED_API "whether to install (and use) deprecated apis (i.e. header without a celix_ prefix." ON)
option(CELIX_USE_ZIP_INSTEAD_OF_JAR "Default Celix cmake command will use jar to package bundle (if found). This option enforces Celix to use zip instead." OFF)

option(CELIX_CXX14 "Build C++14 libraries and bundles. Note for tests C++ is always used." ON)
Expand All @@ -170,9 +169,9 @@ option(ENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11 "Test the Dependency Manager
option(ENABLE_TESTING_FOR_CXX14 "Test celix utils and framework C++ header for C++14 support" OFF)
option(ENABLE_CMAKE_WARNING_TESTS "Enable cmake warning tests to test warning prints" OFF)
option(ENABLE_TESTING_ON_CI "Whether to enable testing on CI. This influence allowed timing errors during unit tests" OFF)
option(ENABLE_DEPRECATED_WARNINGS "Enable compiler warnings for usage of deprecated functionality" OFF)

if (CELIX_INSTALL_DEPRECATED_API)
#ignore deprecated warnings
if (NOT ENABLE_DEPRECATED_WARNINGS)
set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}")
endif ()
Expand Down
6 changes: 0 additions & 6 deletions bundles/logging/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
15 changes: 1 addition & 14 deletions bundles/logging/log_helper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
42 changes: 0 additions & 42 deletions bundles/logging/log_helper/include_v1/log_helper.h

This file was deleted.

262 changes: 0 additions & 262 deletions bundles/logging/log_helper/src/log_helper.c

This file was deleted.

8 changes: 0 additions & 8 deletions bundles/logging/log_service_api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading