You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/11/14 11:32:34 UTC
celix git commit: CELIX-414: Adds some additonal variables to
FindCelix
Repository: celix
Updated Branches:
refs/heads/develop c28213989 -> 988ecf417
CELIX-414: Adds some additonal variables to FindCelix
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/988ecf41
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/988ecf41
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/988ecf41
Branch: refs/heads/develop
Commit: 988ecf4173e442ce5a547d1e2be0f88bc780df3b
Parents: c282139
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Nov 14 12:26:36 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Nov 14 12:26:47 2017 +0100
----------------------------------------------------------------------
CMakeLists.txt | 3 +++
cmake/FindCELIX.cmake | 7 +++++--
cmake/cmake_celix/DeployPackaging.cmake | 5 +++--
dfi/private/src/json_serializer.c | 3 +++
launcher/CMakeLists.txt | 3 ++-
pubsub/mock/CMakeLists.txt | 2 ++
.../discovery/private/src/endpoint_descriptor_reader.c | 4 ----
7 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e26fcf9..dec1dff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,9 @@ set(CELIX_FOUND true)
set(CELIX_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/framework/public/include ${CMAKE_SOURCE_DIR}/utils/public/include)
set(CELIX_LIBRARIES celix_framework celix_utils celix_dfi)
set(CELIX_LAUNCHER celix)
+set(CELIX_FRAMEWORK_LIBRARY celix_framework)
+set(CELIX_UTILS_LIBRARY celix_utils)
+set(CELIX_DFI_LIBRARY celix_dfi)
#TODO CELIX_BUNDLES_DIR this will not work, maybe only use var (e.g. ${CELIX_SHELL_BUNDLE}) for bundles
set(CELIX_DM_LIB dependency_manager_so)
set(CELIX_DM_STATIC_LIB dependency_manager_static)
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/cmake/FindCELIX.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindCELIX.cmake b/cmake/FindCELIX.cmake
index 43fba99..3f67c50 100644
--- a/cmake/FindCELIX.cmake
+++ b/cmake/FindCELIX.cmake
@@ -22,8 +22,11 @@
# Once done this will define
# CELIX_FOUND - System has Apache Celix
# CELIX_INCLUDE_DIRS - The Apache Celix include directories
-# CELIX_LIBRARIES - The libraries needed to use Apache Celix
+# CELIX_LIBRARIES - The libraries needed to use Apache Celix (framework,utils and dfi)
# CELIX_LAUNCHER - The path to the celix launcher
+# CELIX_FRAMEWORK_LIBRARY - The path to the celix framework library
+# CELIX_UTILS_LIBRARY - The path to the celix utils library
+# CELIX_DFI_LIBRARY - The path to the celix dfi libary
#
#
# CELIX_BUNDLES_DIR - The path where the Celix provided bundles are installed
@@ -111,7 +114,7 @@ include(FindPackageHandleStandardArgs)
# if all listed variables are TRUE
find_package_handle_standard_args(CELIX DEFAULT_MSG
CELIX_FRAMEWORK_LIBRARY CELIX_UTILS_LIBRARY CELIX_DFI_LIBRARY CELIX_DM_LIB CELIX_DM_STATIC_LIB CELIX_DM_STATIC_CXX_LIB CELIX_INCLUDE_DIR CELIX_LAUNCHER CELIX_CMAKECELIX_FILE)
-mark_as_advanced(CELIX_INCLUDE_DIR CELIX_ETCD_INCLUDE_DIR CELIX_FRAMEWORK_LIBRARY CELIX_UTILS_LIBRARY CELIX_LAUNCHER CELIX_CMAKECELIX_FILE)
+mark_as_advanced(CELIX_INCLUDE_DIR CELIX_ETCD_INCLUDE_DIR CELIX_CMAKECELIX_FILE)
if(CELIX_FOUND)
set(CELIX_LIBRARIES ${CELIX_FRAMEWORK_LIBRARY} ${CELIX_UTILS_LIBRARY} ${CELIX_DFI_LIBRARY})
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/cmake/cmake_celix/DeployPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DeployPackaging.cmake b/cmake/cmake_celix/DeployPackaging.cmake
index 3f75d37..d4cd8d3 100644
--- a/cmake/cmake_celix/DeployPackaging.cmake
+++ b/cmake/cmake_celix/DeployPackaging.cmake
@@ -82,8 +82,9 @@ function(add_celix_container)
include_directories(${CELIX_INCLUDE_DIRS})
add_executable(${CONTAINER_TARGET} ${LAUNCHER_SRC})
set_target_properties(${CONTAINER_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CONTAINER_LOC})
- #TODO SETUP CELIX_LIBRARIES AND INCLUDE DIRS for celix project and celix using projects !!
- target_link_libraries(${CONTAINER_TARGET} ${CELIX_LIBRARIES})
+ target_link_libraries(${CONTAINER_TARGET} ${CELIX_FRAMEWORK_LIBRARY} ${CELIX_UTILS_LIBRARY})
+ #TODO easy setup to link with additiona libs, i.e.
+ #target_link_libraries(${CONTAINER_TARGET} ${CELIX_DEFAULT_CONTAINER_LINK_LIBRARIES})
#generate config.properties
set(STAGE1_PROPERTIES "${CMAKE_CURRENT_BINARY_DIR}/${CONTAINER_TARGET}-container-config-stage1.properties")
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/dfi/private/src/json_serializer.c
----------------------------------------------------------------------
diff --git a/dfi/private/src/json_serializer.c b/dfi/private/src/json_serializer.c
index c1cd339..4b78aeb 100644
--- a/dfi/private/src/json_serializer.c
+++ b/dfi/private/src/json_serializer.c
@@ -57,6 +57,9 @@ int jsonSerializer_deserialize(dyn_type *type, const char *input, void **result)
LOG_ERROR("Error parsing json input '%s'. Error is: %s\n", input, error.text);
}
+ if (status != OK) {
+ LOG_ERROR("Error cannot deserialize json. Input is '%s'\n", input);
+ }
return status;
}
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/launcher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 0505f7b..8d4ba36 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -42,7 +42,8 @@ if (LAUNCHER)
if (CPPUTEST_FOUND)
#Test running which start celix and run CppUTest RUN_ALL_TESTS.
#Using this test running it is possible to create bundles containing CppUTests.
- include_directories(celix_test_runner ${CPPUTEST_INCLUDE_DIRS})
+ include_directories(celix_test_runner)
+ include_directories(SYSTEM ${CPPUTEST_INCLUDE_DIRS})
add_executable(celix_test_runner
private/src/celix_test_runner.cpp
)
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/pubsub/mock/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/mock/CMakeLists.txt b/pubsub/mock/CMakeLists.txt
index 189ddc2..6313987 100644
--- a/pubsub/mock/CMakeLists.txt
+++ b/pubsub/mock/CMakeLists.txt
@@ -21,6 +21,8 @@ if (CPPUTEST_FOUND)
include_directories(
../api
api
+ )
+ include_directories(SYSTEM
${CPPUTEST_INCLUDE_DIR}
)
http://git-wip-us.apache.org/repos/asf/celix/blob/988ecf41/remote_services/discovery/private/src/endpoint_descriptor_reader.c
----------------------------------------------------------------------
diff --git a/remote_services/discovery/private/src/endpoint_descriptor_reader.c b/remote_services/discovery/private/src/endpoint_descriptor_reader.c
index d8139bc..ea176bf 100644
--- a/remote_services/discovery/private/src/endpoint_descriptor_reader.c
+++ b/remote_services/discovery/private/src/endpoint_descriptor_reader.c
@@ -169,10 +169,6 @@ celix_status_t endpointDescriptorReader_parseDocument(endpoint_descriptor_reader
inProperty = false;
if (propertyValue != NULL) {
- if (propertyType != VALUE_TYPE_STRING && strcmp(OSGI_RSA_ENDPOINT_SERVICE_ID, (char*) propertyName)) {
- logHelper_log(*reader->loghelper, OSGI_LOGSERVICE_WARNING, "ENDPOINT_DESCRIPTOR_READER: Only single-valued string supported for %s\n", propertyName);
- }
-
endpointDescriptorReader_addSingleValuedProperty(endpointProperties, propertyName, propertyValue);
}