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/01/30 19:19:39 UTC
[43/50] [abbrv] celix git commit: CELIX-412: Refactors usage of
add_bundle and add_deploy to add_celix_bundle and add_celix_container
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/remote_service_admin_http/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_http/CMakeLists.txt b/remote_services/remote_service_admin_http/CMakeLists.txt
index cc1b99a..a1b756e 100644
--- a/remote_services/remote_service_admin_http/CMakeLists.txt
+++ b/remote_services/remote_service_admin_http/CMakeLists.txt
@@ -30,7 +30,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_HTTP)
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
- add_bundle(remote_service_admin_http
+ add_celix_bundle(remote_service_admin_http
VERSION 0.9.0
SYMBOLIC_NAME "apache_celix_remote_service_admin_http"
NAME "Apache Celix Remote Service Admin HTTP"
@@ -43,7 +43,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_HTTP)
${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
)
- install_bundle(remote_service_admin_http)
+ install_celix_bundle(remote_service_admin_http)
target_link_libraries(remote_service_admin_http celix_framework ${CURL_LIBRARIES} ${UUID})
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/remote_service_admin_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_shm/CMakeLists.txt b/remote_services/remote_service_admin_shm/CMakeLists.txt
index ab7a1c3..51105f0 100644
--- a/remote_services/remote_service_admin_shm/CMakeLists.txt
+++ b/remote_services/remote_service_admin_shm/CMakeLists.txt
@@ -29,7 +29,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
- add_bundle(remote_service_admin_shm
+ add_celix_bundle(remote_service_admin_shm
VERSION 0.9.0
SYMBOLIC_NAME "apache_celix_remote_service_admin_shm"
NAME "Apache Celix Remote Service Admin SHM"
@@ -42,7 +42,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
)
- install_bundle(remote_service_admin_shm
+ install_celix_bundle(remote_service_admin_shm
HEADERS
${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/public/include/remote_service_admin_shm.h
)
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/CMakeLists.txt b/remote_services/topology_manager/CMakeLists.txt
index 46a3bac..69d14ed 100644
--- a/remote_services/topology_manager/CMakeLists.txt
+++ b/remote_services/topology_manager/CMakeLists.txt
@@ -24,7 +24,7 @@ if (RSA_TOPOLOGY_MANAGER)
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/topology_manager/public/include")
- add_bundle(topology_manager SOURCES
+ add_celix_bundle(topology_manager SOURCES
private/src/topology_manager
private/src/scope
private/src/activator
@@ -39,7 +39,7 @@ if (RSA_TOPOLOGY_MANAGER)
"Apache Celix RS Topology Manager"
)
- install_bundle(topology_manager)
+ install_celix_bundle(topology_manager)
if (ENABLE_TESTING)
find_package(CppUTest REQUIRED)
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
index 6e269f5..df49a95 100644
--- a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
${PROJECT_SOURCE_DIR}/utils/public/include
)
-add_bundle(topology_manager_test_bundle
+add_celix_bundle(topology_manager_test_bundle
VERSION 0.0.1
SOURCES
tst_activator.c
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
index a19efc7..cb88a21 100644
--- a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
+++ b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(
)
-add_bundle(topology_manager_disc_mock_bundle
+add_celix_bundle(topology_manager_disc_mock_bundle
VERSION 0.0.1
SOURCES
disc_mock_activator.c
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/remote_shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_shell/CMakeLists.txt b/remote_shell/CMakeLists.txt
index 7c37d13..aac0366 100644
--- a/remote_shell/CMakeLists.txt
+++ b/remote_shell/CMakeLists.txt
@@ -17,7 +17,7 @@
celix_subproject(REMOTE_SHELL "Option to enable building the Remote Shell bundles" ON DEPS LAUNCHER SHELL_TUI)
if (REMOTE_SHELL)
- add_bundle(remote_shell
+ add_celix_bundle(remote_shell
SYMBOLIC_NAME "apache_celix_remote_shell"
VERSION "0.0.2"
NAME: "Apache Celix Remote Shell"
@@ -33,7 +33,7 @@ if (REMOTE_SHELL)
private/include/connection_listener.h
)
- install_bundle(remote_shell)
+ install_celix_bundle(remote_shell)
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -42,5 +42,5 @@ if (REMOTE_SHELL)
target_link_libraries(remote_shell celix_framework)
- add_deploy("remote_shell_deploy" NAME "remote_shell" BUNDLES shell remote_shell shell_tui log_service)
+ add_celix_container("remote_shell_deploy" NAME "remote_shell" BUNDLES shell remote_shell shell_tui log_service)
endif (REMOTE_SHELL)
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 11a16c1..a2bf88e 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -18,7 +18,7 @@ celix_subproject(SHELL "Option to enable building the Shell bundles" ON DEPS LAU
if (SHELL)
find_package(CURL REQUIRED)
- add_bundle(shell
+ add_celix_bundle(shell
SYMBOLIC_NAME "apache_celix_shell"
VERSION "2.1.0"
NAME "Apache Celix Shell"
@@ -41,7 +41,7 @@ if (SHELL)
)
- install_bundle(shell
+ install_celix_bundle(shell
HEADERS
public/include/shell.h public/include/command.h public/include/shell_constants.h
)
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/shell_bonjour/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shell_bonjour/CMakeLists.txt b/shell_bonjour/CMakeLists.txt
index 300fef0..e12d250 100644
--- a/shell_bonjour/CMakeLists.txt
+++ b/shell_bonjour/CMakeLists.txt
@@ -36,7 +36,7 @@ if (SHELL_BONJOUR)
set(MEMSTREAM_SOURCES ${PROJECT_SOURCE_DIR}/utils/private/src/memstream/open_memstream.c ${PROJECT_SOURCE_DIR}/utils/private/src/memstream/fmemopen.c)
include_directories(${PROJECT_SOURCE_DIR}/utils/public/include/memstream)
endif()
- add_bundle(bonjour_shell
+ add_celix_bundle(bonjour_shell
VERSION "1.0.0"
SOURCES
private/src/activator.c
@@ -46,7 +46,7 @@ if (SHELL_BONJOUR)
target_link_libraries(bonjour_shell celix_framework celix_utils ${LIBXML2_LIBRARIES} ${DNS_SD_LIB})
- add_deploy("bonjour_shell_deploy" BUNDLES
+ add_celix_container("bonjour_shell_deploy" BUNDLES
shell
bonjour_shell
PROPERTIES "bonjour.shell.id=Apache Celix"
http://git-wip-us.apache.org/repos/asf/celix/blob/68775a04/shell_tui/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shell_tui/CMakeLists.txt b/shell_tui/CMakeLists.txt
index 0216261..35153fe 100644
--- a/shell_tui/CMakeLists.txt
+++ b/shell_tui/CMakeLists.txt
@@ -17,7 +17,7 @@
celix_subproject(SHELL_TUI "Option to enable building the Shell Textual User Interface bundles" ON DEPS LAUNCHER SHELL)
if (SHELL_TUI)
- add_bundle(shell_tui
+ add_celix_bundle(shell_tui
SYMBOLIC_NAME "apache_celix_shell_tui"
VERSION "1.1.0"
NAME "Apache Celix Shell TUI"
@@ -27,7 +27,7 @@ if (SHELL_TUI)
private/src/history
)
- install_bundle(shell_tui)
+ install_celix_bundle(shell_tui)
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")