celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject svn commit: r1626776 - in /celix/trunk/remote_services: deploy.cmake discovery_bonjour/CMakeLists.txt discovery_slp/CMakeLists.txt
Date Mon, 22 Sep 2014 13:55:44 GMT
Author: bpetri
Date: Mon Sep 22 13:55:44 2014
New Revision: 1626776

URL: http://svn.apache.org/r1626776
Log:
CELIX-153: add cmake config options for discovery_bonjour and discovery_slp

Modified:
    celix/trunk/remote_services/deploy.cmake
    celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
    celix/trunk/remote_services/discovery_slp/CMakeLists.txt

Modified: celix/trunk/remote_services/deploy.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/deploy.cmake?rev=1626776&r1=1626775&r2=1626776&view=diff
==============================================================================
--- celix/trunk/remote_services/deploy.cmake (original)
+++ celix/trunk/remote_services/deploy.cmake Mon Sep 22 13:55:44 2014
@@ -16,16 +16,6 @@
 # under the License.
 is_enabled(REMOTE_SERVICE_ADMIN)
 if (REMOTE_SERVICE_ADMIN)
-	deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer 
-	                            ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-	deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin_http shell
shell_tui log_service log_writer calculator_shell discovery_bonjour
-	                                   ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-
-	deploy("remote-services-slp" BUNDLES discovery_slp topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
-	                             ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-	deploy("remote-services-slp-client" BUNDLES topology_manager remote_service_admin_http shell
shell_tui log_service log_writer calculator_shell discovery_slp
-	                                    ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-
     deploy("remote-services-cfg" BUNDLES discovery_configured topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
                                  ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
     deploy("remote-services-cfg-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_configured
@@ -34,23 +24,42 @@ if (REMOTE_SERVICE_ADMIN)
 	#TODO for remote-service-client the discovery should be added as last. If this is not done,

 	#discovery will discover services before the topology manager is registered as 
 	#endpoint listener and services will be lost. This needs further study.
-endif (REMOTE_SERVICE_ADMIN)
 
-is_enabled(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
-if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
-    is_enabled(RSA_BUNDLES_DISCOVERY_SHM)
-    if (RSA_BUNDLES_DISCOVERY_SHM)
-        deploy("remote-services-shm" BUNDLES discovery_shm topology_manager remote_service_admin_shm
calculator shell shell_tui log_service log_writer 
+    is_enabled(RSA_BUNDLES_DISCOVERY_BONJOUR)
+    if (RSA_BUNDLES_DISCOVERY_BONJOUR)
+        deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer 
+                                    ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
+        deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_bonjour
+                                           ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
+    endif (RSA_BUNDLES_DISCOVERY_BONJOUR)
+
+
+    is_enabled(RSA_BUNDLES_DISCOVERY_SLP)
+    if (RSA_BUNDLES_DISCOVERY_SLP)
+        deploy("remote-services-slp" BUNDLES discovery_slp topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
                                      ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-        deploy("remote-services-shm-client" BUNDLES topology_manager remote_service_admin_shm
shell shell_tui log_service log_writer calculator_shell discovery_shm
+        deploy("remote-services-slp-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_slp
                                             ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-    endif (RSA_BUNDLES_DISCOVERY_SHM)
-endif (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+    endif (RSA_BUNDLES_DISCOVERY_SLP)
 
-is_enabled(RSA_BUNDLES_DISCOVERY_ETCD)
-if (RSA_BUNDLES_DISCOVERY_ETCD)
-    deploy("remote-services-etcd" BUNDLES discovery_etcd topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
-                                 ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
-    deploy("remote-services-etcd-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_etcd
-                                        ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
-endif (RSA_BUNDLES_DISCOVERY_ETCD)
+
+    is_enabled(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+    if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+        is_enabled(RSA_BUNDLES_DISCOVERY_SHM)
+        if (RSA_BUNDLES_DISCOVERY_SHM)
+            deploy("remote-services-shm" BUNDLES discovery_shm topology_manager remote_service_admin_shm
calculator shell shell_tui log_service log_writer 
+                                         ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
+            deploy("remote-services-shm-client" BUNDLES topology_manager remote_service_admin_shm
shell shell_tui log_service log_writer calculator_shell discovery_shm
+                                                ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
+        endif (RSA_BUNDLES_DISCOVERY_SHM)
+    endif (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
+
+    is_enabled(RSA_BUNDLES_DISCOVERY_ETCD)
+    if (RSA_BUNDLES_DISCOVERY_ETCD)
+        deploy("remote-services-etcd" BUNDLES discovery_etcd topology_manager remote_service_admin_http
calculator shell shell_tui log_service log_writer
+                                     ENDPOINTS org.apache.celix.calc.api.Calculator_endpoint)
+        deploy("remote-services-etcd-client" BUNDLES topology_manager remote_service_admin_http
shell shell_tui log_service log_writer calculator_shell discovery_etcd
+                                            ENDPOINTS org.apache.celix.calc.api.Calculator_proxy)
+    endif (RSA_BUNDLES_DISCOVERY_ETCD)
+
+endif (REMOTE_SERVICE_ADMIN)

Modified: celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt?rev=1626776&r1=1626775&r2=1626776&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt Mon Sep 22 13:55:44 2014
@@ -14,26 +14,28 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+celix_subproject(RSA_BUNDLES_DISCOVERY_BONJOUR "Option to enable building the Discovery BONJOUR
bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+if (RSA_BUNDLES_DISCOVERY_BONJOUR)
+	#TODO find_package(DNS-SD REQUIRED)
+
+	include_directories("/usr/include") #TODO check if this has impact on the generated project
indexer paths
+	include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_bonjour/private/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+	include_directories(private/include)
+
+	SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_bonjour")
+	SET_HEADERS("Bundle-Name: Apache Celix RSA BONJOUR Discovery")
+
+	bundle(discovery_bonjour SOURCES 
+		private/src/discovery.c
+		private/src/discovery_activator.c
+	)
+	    
+	install_bundle(discovery_bonjour)
 
-#TODO find_package(DNS-SD REQUIRED)
-
-include_directories("/usr/include") #TODO check if this has impact on the generated project
indexer paths
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_bonjour/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories(private/include)
-
-SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_bonjour")
-SET_HEADERS("Bundle-Name: Apache Celix RSA BONJOUR Discovery")
-
-bundle(discovery_bonjour SOURCES 
-	private/src/discovery.c
-	private/src/discovery_activator.c
-)
-    
-install_bundle(discovery_bonjour)
-
-target_link_libraries(discovery_bonjour celix_framework ${APRUTIL_LIBRARY}) # TODO ${SLP_LIBRARIES})
+	target_link_libraries(discovery_bonjour celix_framework ${APRUTIL_LIBRARY}) # TODO ${SLP_LIBRARIES})
 
+endif (RSA_BUNDLES_DISCOVERY_BONJOUR)

Modified: celix/trunk/remote_services/discovery_slp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_slp/CMakeLists.txt?rev=1626776&r1=1626775&r2=1626776&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_slp/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_slp/CMakeLists.txt Mon Sep 22 13:55:44 2014
@@ -15,25 +15,28 @@
 # specific language governing permissions and limitations
 # under the License.
 
-find_package(Slp REQUIRED)
+celix_subproject(RSA_BUNDLES_DISCOVERY_SLP "Option to enable building the Discovery SLP bundle"
ON DEPS LAUNCHER topology_manager remote_service_admin)
+if (RSA_BUNDLES_DISCOVERY_SLP)
+	find_package(Slp REQUIRED)
+
+	include_directories(${SLP_INCLUDE_DIRS})
+	include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_slp/private/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+	include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+	include_directories("private/include")
+
+	SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_slp")
+	SET_HEADERS("Bundle-Name: Apache Celix RSA SLP Discovery")
+
+	bundle(discovery_slp SOURCES 
+		private/src/discovery 
+		private/src/discovery_activator
+	)
+	    
+	install_bundle(discovery_slp)
 
-include_directories(${SLP_INCLUDE_DIRS})
-include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery_slp/private/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-include_directories("private/include")
-
-SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_slp")
-SET_HEADERS("Bundle-Name: Apache Celix RSA SLP Discovery")
-
-bundle(discovery_slp SOURCES 
-	private/src/discovery 
-	private/src/discovery_activator
-)
-    
-install_bundle(discovery_slp)
-
-target_link_libraries(discovery_slp celix_framework ${APRUTIL_LIBRARY} ${SLP_LIBRARIES})
+	target_link_libraries(discovery_slp celix_framework ${APRUTIL_LIBRARY} ${SLP_LIBRARIES})
 
+endif (RSA_BUNDLES_DISCOVERY_SLP)



Mime
View raw message