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 deprecated cmake functions #678

Merged
merged 3 commits into from
Oct 29, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ limitations under the License.
- pubsub_serializer.h is removed and no longer supported. Use pubsub_message_serialization_service.h instead.
- C++11 support for dm is removed. C++14 is now the minimum required version.
- C++17 string_view support is removed from the utils and framework lib.
- Apache Celix CMake bundle functions without a celix_ prefix or infix are removed.
- Apache Celix CMake support for creating docker images and creating runtimes dirs is removed.
- Support and usage of "service.lang" service property is removed.

# Noteworthy Changes for 2.4.0 (2023-09-27)
Expand Down
2 changes: 1 addition & 1 deletion cmake/celix_project/ApacheRat.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ if (ENABLE_APACHE_RAT)
else(Java_Runtime_FOUND)
MESSAGE(STATUS "Java not found, cannot execute Apache RAT checks")
endif(Java_Runtime_FOUND)
endif ()
endif ()
60 changes: 0 additions & 60 deletions cmake/cmake_celix/BundlePackaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ function(check_bundle BUNDLE)
endif ()
endfunction()


function(add_bundle)
message(DEPRECATION "add_bundle is deprecated, use add_celix_bundle instead.")
add_celix_bundle(${ARGN})
endfunction()

#[[
Add a Celix bundle to the project.

Expand Down Expand Up @@ -391,11 +385,6 @@ function(add_celix_bundle)
celix_bundle_headers(${BUNDLE_TARGET_NAME} ${BUNDLE_HEADERS})
endfunction()

function(bundle_export_libs)
message(DEPRECATION "bundle_export_libs is deprecated, use celix_bundle_export_libs instead.")
celix_bundle_export_libs(${ARGN})
endfunction()

#[[
Adds a export lib to the Celix bundle.

Expand All @@ -407,11 +396,6 @@ function(celix_bundle_export_libs)
celix_bundle_libs(${BUNDLE} "EXPORT" TRUE ${ARGN})
endfunction()

function(bundle_private_libs)
message(DEPRECATION "bundle_private_libs is deprecated, use celix_bundle_private_libs instead.")
celix_bundle_private_libs(${ARGN})
endfunction()

#[[
Add libraries to a bundle.

Expand Down Expand Up @@ -452,10 +436,6 @@ function(celix_bundle_private_libs)
celix_bundle_libs(${BUNDLE} "PRIVATE" FALSE ${ARGN})
endfunction()

function(bundle_libs)
message(DEPRECATION "bundle_libs is deprecated, use celix_bundle_libs instead.")
celix_bundle_libs(${ARGN})
endfunction()
function(celix_bundle_libs)
#0 is bundle TARGET
#1 is TYPE, e.g PRIVATE,EXPORT or IMPORT
Expand Down Expand Up @@ -544,11 +524,6 @@ function(celix_bundle_libs)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_LIB_TARGETS" "${LIB_TARGETS}")
endfunction()

function(bundle_import_libs)
message(DEPRECATION "bundle_import_libs is deprecated, use celix_bundle_import_libs instead.")
celix_bundle_import_libs(${ARGN})
endfunction()

#[[
Adds a import lib to the Celix bundle.

Expand Down Expand Up @@ -580,11 +555,6 @@ function(celix_bundle_import_libs)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_IMPORT_LIBS" "${LIBS}")
endfunction()

function(bundle_files)
message(DEPRECATION "bundle_files is deprecated, use celix_bundle_files instead.")
celix_bundle_files(${ARGN})
endfunction()

#[[
Add files to the target bundle.

Expand Down Expand Up @@ -767,11 +737,6 @@ function(celix_bundle_add_files)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_DEPEND_TARGETS" "${DEPS}")
endfunction()

function(bundle_headers)
message(DEPRECATION "bundle_headers is deprecated, use celix_bundle_headers instead.")
celix_bundle_headers(${ARGN})
endfunction()

#[[
Append the provided headers to the target bundle manifest.

Expand All @@ -798,11 +763,6 @@ function(celix_bundle_headers)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_HEADERS" "${HEADERS}")
endfunction()

function(bundle_symbolic_name)
message(DEPRECATION "bundle_symbolic_name is deprecated, use celix_bundle_symbolic_name instead.")
celix_bundle_symbolic_name(${ARGN})
endfunction()

#[[
Set bundle symbolic name

Expand Down Expand Up @@ -845,11 +805,6 @@ function(celix_get_bundle_symbolic_name)
endif ()
endfunction()

function(bundle_name)
message(DEPRECATION "bundle_name is deprecated, use celix_bundle_name instead.")
celix_bundle_name(${ARGN})
endfunction()

#[[
Set bundle name

Expand All @@ -861,11 +816,6 @@ function(celix_bundle_name BUNDLE NAME)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_NAME" ${NAME})
endfunction()

function(bundle_version)
message(DEPRECATION "bundle_version is deprecated, use celix_bundle_version instead.")
celix_bundle_version(${ARGN})
endfunction()

#[[
Set bundle version

Expand All @@ -877,11 +827,6 @@ function(celix_bundle_version BUNDLE VERSION)
set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_VERSION" ${VERSION})
endfunction()

function(bundle_description)
message(DEPRECATION "bundle_description is deprecated, use celix_bundle_description instead.")
celix_bundle_description(${ARGN})
endfunction()

#[[
Set bundle description

Expand Down Expand Up @@ -967,11 +912,6 @@ function(celix_get_bundle_file)
endif ()
endfunction()

function(install_bundle)
message(DEPRECATION "install_bundle is deprecated, use install_celix_bundle instead.")
install_celix_bundle(${ARGN})
endfunction()

#[[
Install bundle when 'make install' is executed.

Expand Down
Loading
Loading