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 2018/02/07 15:34:39 UTC
celix git commit: CELIX-417: Changes the isntall location of the
remote service admin include dir for backwards compatibility
Repository: celix
Updated Branches:
refs/heads/develop f98801160 -> 24bad0e41
CELIX-417: Changes the isntall location of the remote service admin include dir for backwards compatibility
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/24bad0e4
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/24bad0e4
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/24bad0e4
Branch: refs/heads/develop
Commit: 24bad0e414d006f89923ab8470a5552553946068
Parents: f988011
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Feb 7 16:34:28 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Feb 7 16:34:28 2018 +0100
----------------------------------------------------------------------
pubsub/pubsub_admin_udp_mc/src/topic_publication.c | 2 ++
remote_services/remote_services_api/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/24bad0e4/pubsub/pubsub_admin_udp_mc/src/topic_publication.c
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/src/topic_publication.c b/pubsub/pubsub_admin_udp_mc/src/topic_publication.c
index 79a2698..3aa2c30 100644
--- a/pubsub/pubsub_admin_udp_mc/src/topic_publication.c
+++ b/pubsub/pubsub_admin_udp_mc/src/topic_publication.c
@@ -169,6 +169,8 @@ celix_status_t pubsub_topicPublicationStart(bundle_context_pt bundle_context,top
properties_pt props = properties_create();
properties_set(props,PUBSUB_PUBLISHER_SCOPE,properties_get(pubEP->endpoint_props, PUBSUB_ENDPOINT_SCOPE));
properties_set(props,PUBSUB_PUBLISHER_TOPIC,properties_get(pubEP->endpoint_props, PUBSUB_ENDPOINT_TOPIC));
+ properties_set(props,"service.version", PUBSUB_PUBLISHER_SERVICE_VERSION);
+
status = bundleContext_registerServiceFactory(bundle_context,PUBSUB_PUBLISHER_SERVICE_NAME,factory,props,&(pub->svcFactoryReg));
http://git-wip-us.apache.org/repos/asf/celix/blob/24bad0e4/remote_services/remote_services_api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_services_api/CMakeLists.txt b/remote_services/remote_services_api/CMakeLists.txt
index 71f3306..a092f59 100644
--- a/remote_services/remote_services_api/CMakeLists.txt
+++ b/remote_services/remote_services_api/CMakeLists.txt
@@ -18,11 +18,11 @@
add_library(remote_services_api INTERFACE)
target_include_directories(remote_services_api INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
- $<INSTALL_INTERFACE:include/celix/remote_services>
+ $<INSTALL_INTERFACE:include/celix/remote_service_admin>
)
install(TARGETS remote_services_api EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT rsa)
-install(DIRECTORY include/ DESTINATION include/celix/remote_services COMPONENT rsa)
+install(DIRECTORY include/ DESTINATION include/celix/remote_service_admin COMPONENT rsa)
#Setup target aliases to match external usage
add_library(Celix::remote_services_api ALIAS remote_services_api)