incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1527972 - in /incubator/celix/trunk: cmake/ dependency_manager/ deployment_admin/ device_access/device_access/ device_access/driver_locator/ examples/osgi-in-action/chapter04-paint-example/ framework/ log_service/ log_writer/ remote_servic...
Date Tue, 01 Oct 2013 08:48:12 GMT
Author: abroekhuis
Date: Tue Oct  1 08:48:12 2013
New Revision: 1527972

URL: http://svn.apache.org/r1527972
Log:
CELIX-75: Added install macro for installation of bundles, headers and additional resources.
The following targets are now available:
* make install-{bundle name} // install a single bundle
* make install-bundles // installs all (enabled) bundles
* make install-framework // installs the framework
* make install-all // installs the (enabled) bundles and framework

Modified:
    incubator/celix/trunk/cmake/CPackConfig.in
    incubator/celix/trunk/cmake/Packaging.cmake
    incubator/celix/trunk/cmake/installation.cmake
    incubator/celix/trunk/dependency_manager/CMakeLists.txt
    incubator/celix/trunk/deployment_admin/CMakeLists.txt
    incubator/celix/trunk/device_access/device_access/CMakeLists.txt
    incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/deploy.cmake
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/log_service/CMakeLists.txt
    incubator/celix/trunk/log_writer/CMakeLists.txt
    incubator/celix/trunk/remote_services/CMakeLists.txt
    incubator/celix/trunk/remote_services/deploy.cmake
    incubator/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
    incubator/celix/trunk/remote_services/discovery_slp/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
    incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
    incubator/celix/trunk/remote_shell/CMakeLists.txt
    incubator/celix/trunk/shell/CMakeLists.txt
    incubator/celix/trunk/shell_tui/CMakeLists.txt

Modified: incubator/celix/trunk/cmake/CPackConfig.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfig.in?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfig.in (original)
+++ incubator/celix/trunk/cmake/CPackConfig.in Tue Oct  1 08:48:12 2013
@@ -17,7 +17,7 @@
 
 SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "@BUNDLE_BIN_DIR@;@INT_BUNDLE_NAME@;@INT_BUNDLE_NAME@;/")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@BUNDLE_BIN_DIR@;@INT_BUNDLE_NAME@;@INT_BUNDLE_NAME_INSTALL@;/")
 SET(CPACK_PACKAGE_DESCRIPTION "@BUNDLE_DESCRIPTION@")
 SET(CPACK_PACKAGE_FILE_NAME "@INT_BUNDLE_NAME@")
 SET(CPACK_PACKAGE_NAME "@INT_BUNDLE_NAME@")

Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Tue Oct  1 08:48:12 2013
@@ -22,6 +22,50 @@ IF(NOT CPACK_COMMAND)
 	MESSAGE(FATAL_ERROR "Need CPack!")
 ENDIF(NOT CPACK_COMMAND)
 
+include(CPackComponent)
+
+macro( CELIX_ADD_COMPONENT_GROUP _group )
+  set( _readVariable )
+  set( _parentGroup )
+  foreach( _i ${ARGN} )
+    if( _readVariable )
+      set( ${_readVariable} "${_i}" )
+      break()
+    else( _readVariable )
+      if( "${_i}" STREQUAL PARENT_GROUP )
+        set( _readVariable _parentGroup )
+      endif( "${_i}" STREQUAL PARENT_GROUP )
+    endif( _readVariable )
+  endforeach( _i ${ARGN} )
+
+  cpack_add_component_group( ${_group} ${ARGN} )
+  add_custom_target( install-${_group} )
+  if( _parentGroup )
+    add_dependencies( install-${_parentGroup} install-${_group} )
+  endif( _parentGroup )
+endmacro( CELIX_ADD_COMPONENT_GROUP _group )
+
+macro( CELIX_ADD_COMPONENT _component )
+  set( _readVariable )
+  set( _group )
+  foreach( _i ${ARGN} )
+    if( _readVariable )
+      set( ${_readVariable} "${_i}" )
+      break()
+    else( _readVariable )
+      if( "${_i}" STREQUAL GROUP )
+        set( _readVariable _group )
+      endif( "${_i}" STREQUAL GROUP )
+    endif( _readVariable )
+  endforeach( _i ${ARGN} )
+
+  cpack_add_component( ${_component} ${ARGN} )
+  add_custom_target( install-${_component}
+                     COMMAND ${CMAKE_COMMAND} -DCOMPONENT=${_component} -P
+"${CMAKE_BINARY_DIR}/cmake_install.cmake" )
+  add_dependencies( install-${_group} install-${_component} )
+endmacro( CELIX_ADD_COMPONENT _component _group )
+
 find_program(JAR_COMMAND jar)
 if(JAR_COMMAND)
 	message(STATUS "Using JAR to repack bundles, bundles can be used by Apache ACE")
@@ -31,6 +75,9 @@ endif(JAR_COMMAND)
 
 SET(CPACK_GENERATOR "ZIP")
 
+celix_add_component_group(all)
+celix_add_component_group(bundles PARENT_GROUP all)
+
 MACRO(SET_HEADER header content)
 	SET(INT_${header} "${content}")
 	string(STRIP ${INT_${header}} INT_${header})
@@ -42,7 +89,7 @@ MACRO(SET_HEADERS content)
 ENDMACRO(SET_HEADERS)
 
 MACRO(bundle)
-    PARSE_ARGUMENTS(BUNDLE "SOURCES;FILES;DIRECTORIES" "" ${ARGN})
+    PARSE_ARGUMENTS(BUNDLE "SOURCES;FILES;DIRECTORIES;INSTALL_FILES" "INSTALL" ${ARGN})
     LIST(GET BUNDLE_DEFAULT_ARGS 0 INT_BUNDLE_NAME)
     
 	add_library(${INT_BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
@@ -58,16 +105,18 @@ MACRO(bundle)
 		set(INT_BUNDLE_DESCRIPTION "${INT_BUNDLE_SYMBOLICNAME} bundle")
 	endif (NOT INT_BUNDLE_DESCRIPTION)
 	
+	set(INT_BUNDLE_NAME_INSTALL ${INT_BUNDLE_NAME}_install)
+	
 	SET(__bundleManifest ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF)
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/manifest.in ${__bundleManifest} @ONLY)
-	install (FILES ${__bundleManifest} DESTINATION ./META-INF COMPONENT ${INT_BUNDLE_NAME})
+	install (FILES ${__bundleManifest} DESTINATION ./META-INF COMPONENT ${INT_BUNDLE_NAME_INSTALL})
     
-	install (TARGETS ${INT_BUNDLE_NAME} DESTINATION . COMPONENT ${INT_BUNDLE_NAME})
+	install (TARGETS ${INT_BUNDLE_NAME} DESTINATION . COMPONENT ${INT_BUNDLE_NAME_INSTALL})
     if (BUNDLE_FILES)
-	    install (FILES ${BUNDLE_FILES} DESTINATION . COMPONENT ${INT_BUNDLE_NAME})
+	    install (FILES ${BUNDLE_FILES} DESTINATION . COMPONENT ${INT_BUNDLE_NAME_INSTALL})
     endif(BUNDLE_FILES)
     if (BUNDLE_DIRECTORIES)
-	    install (DIRECTORY ${BUNDLE_DIRECTORIES} DESTINATION . COMPONENT ${INT_BUNDLE_NAME})
+	    install (DIRECTORY ${BUNDLE_DIRECTORIES} DESTINATION . COMPONENT ${INT_BUNDLE_NAME_INSTALL})
     endif(BUNDLE_DIRECTORIES)
 
 	SET(__bundleConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${INT_BUNDLE_NAME}-bundle.cmake)
@@ -92,8 +141,44 @@ MACRO(bundle)
 		)
 	endif(JAR_COMMAND)
 	
+	if (BUNDLE_INSTALL)
+		CELIX_ADD_COMPONENT(${INT_BUNDLE_NAME}
+	    	DISPLAY_NAME ${INT_BUNDLE_SYMBOLICNAME}
+	        DESCRIPTION ${INT_BUNDLE_DESCRIPTION}
+	        GROUP bundles
+	    )
+	    add_dependencies( install-${INT_BUNDLE_NAME} ${INT_BUNDLE_NAME} )
+	    
+	    if (BUNDLE_INSTALL_FILES)
+		    install (FILES ${BUNDLE_INSTALL_FILES} DESTINATION include/celix/${INT_BUNDLE_NAME}
COMPONENT ${INT_BUNDLE_NAME})
+	    endif(BUNDLE_INSTALL_FILES)
+	    
+	    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip DESTINATION share/celix/bundles
COMPONENT ${INT_BUNDLE_NAME})
+    endif(BUNDLE_INSTALL)
+	
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip)
 ENDMACRO(bundle)
+
+MACRO(install_bundle)
+    PARSE_ARGUMENTS(BUNDLE "HEADERS;RESOURCES" "" ${ARGN})
+    LIST(GET BUNDLE_DEFAULT_ARGS 0 INT_BUNDLE_NAME)
+    
+	CELIX_ADD_COMPONENT(${INT_BUNDLE_NAME}
+    	DISPLAY_NAME ${INT_BUNDLE_NAME}
+        DESCRIPTION ${INT_BUNDLE_NAME}
+        GROUP bundles
+    )
+    add_dependencies( install-${INT_BUNDLE_NAME} ${INT_BUNDLE_NAME} )
+    
+    if (BUNDLE_HEADERS)
+	    install (FILES ${BUNDLE_HEADERS} DESTINATION include/celix/${INT_BUNDLE_NAME} COMPONENT
${INT_BUNDLE_NAME})
+    endif(BUNDLE_HEADERS)
+    if (BUNDLE_RESOURCES)
+	    install (FILES ${BUNDLE_RESOURCES} DESTINATION share/celix/${INT_BUNDLE_NAME} COMPONENT
${INT_BUNDLE_NAME})
+    endif(BUNDLE_RESOURCES)
+    
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip DESTINATION share/celix/bundles
COMPONENT ${INT_BUNDLE_NAME})
+ENDMACRO(install_bundle)
 	
 MACRO(package)
     PARSE_ARGUMENTS(PACKAGE "FILES;DIRECTORIES" "" ${ARGN})
@@ -262,4 +347,3 @@ MACRO(PARSE_ARGUMENTS prefix arg_names o
   SET(${prefix}_${current_arg_name} ${current_arg_list})
 ENDMACRO(PARSE_ARGUMENTS)
 
-

Modified: incubator/celix/trunk/cmake/installation.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/installation.cmake?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/installation.cmake (original)
+++ incubator/celix/trunk/cmake/installation.cmake Tue Oct  1 08:48:12 2013
@@ -32,5 +32,4 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cma
 ADD_CUSTOM_TARGET(package-release
   ${CPACK_COMMAND} --config "CPackConfig-Installation.cmake"
   )
-ADD_CUSTOM_TARGET(install-release COMMAND ${CMAKE_COMMAND} -DCOMPONENT=framework -P cmake_install.cmake)
   

Modified: incubator/celix/trunk/dependency_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/dependency_manager/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -29,6 +29,12 @@ if (DEPENDENCY_MANAGER) 
       endif(CMAKE_UNAME)
     endif(UNIX AND NOT WIN32)
     
+    CELIX_ADD_COMPONENT(dependency_manager
+    	DISPLAY_NAME Dependency Manager
+        DESCRIPTION "The Apache Celix dependency manager (static) library"
+        GROUP all
+    )
+    
     add_library(dependency_manager STATIC 
     	private/src/dependency_manager 
     	private/src/dependency_activator_base 
@@ -38,7 +44,17 @@ if (DEPENDENCY_MANAGER) 
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     target_link_libraries(dependency_manager celix_framework)
     
-    FILE(GLOB files public/include/dependency_activator_base.h public/include/service.h public/include/dependency_manager.h
public/include/service_component_private.h public/include/service_component.h public/include/service_dependency.h)
-    INSTALL(FILES ${files} DESTINATION include/celix/dependency_manager COMPONENT framework)
-    install(TARGETS dependency_manager DESTINATION lib COMPONENT framework)
+    install(
+    	FILES
+    		public/include/dependency_activator_base.h 
+    		public/include/service.h public/include/dependency_manager.h 
+    		public/include/service_component_private.h 
+    		public/include/service_component.h 
+    		public/include/service_dependency.h 
+		DESTINATION 
+			include/celix/dependency_manager 
+		COMPONENT 
+			dependency_manager
+	)
+    install(TARGETS dependency_manager DESTINATION lib COMPONENT dependency_manager)
 endif (DEPENDENCY_MANAGER)

Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -54,7 +54,10 @@ if (DEPLOYMENT_ADMIN)
         private/include/unzip.h
     )
     
-    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
+    install_bundle(deployment_admin
+    	HEADERS
+    		public/include/resource_processor.h
+	)
     
-    install(FILES public/include/resource_processor.h DESTINATION include/celix/deployment_admin)
+    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
 endif (DEPLOYMENT_ADMIN)

Modified: incubator/celix/trunk/device_access/device_access/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -33,17 +33,14 @@ bundle(device_manager SOURCES 
     private/include/driver_matcher.h
 )
 
-FILE(GLOB SERVICE_HEADERS public/include/*.h)
-
-#bundle_add(device_manager ${SERVICE_HEADERS} DESTINATION services)
-#bundle_add(device_manager 
-#	public/include DESTINATION public/include
-#	PATTERN .svn EXCLUDE)
-
-#bundle_install(device_manager COMPONENT device_access)
-
-install(FILES ${SERVICE_HEADERS} DESTINATION include/celix/device_access)
-
+install_bundle(device_manager
+	HEADERS
+		public/include/device.h
+		public/include/driver_locator.h
+		public/include/driver_selector.h
+		public/include/driver.h
+		public/include/match.h
+)
 
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")

Modified: incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt Tue Oct  1 08:48:12
2013
@@ -25,9 +25,7 @@ bundle(driver_locator SOURCES 
 	private/src/driver_locator
 )
 
-#bundle_install(driver_locator COMPONENT device_access)
-
-package(driver_locator)
+install_bundle(driver_locator)
 
 include_directories(${PROJECT_SOURCE_DIR}/device_access/device_access/public/include)
 include_directories(private/include)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/deploy.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/deploy.cmake?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/deploy.cmake (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/deploy.cmake Tue
Oct  1 08:48:12 2013
@@ -14,6 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-if(PKG_CONFIG_EXECUTABLE)
-	deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square triangle
shell shell_tui log_service log_writer)
-endif(PKG_CONFIG_EXECUTABLE)
\ No newline at end of file
+is_enabled(EXAMPLES)
+if (EXAMPLES)
+	if(PKG_CONFIG_EXECUTABLE)
+		deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square triangle
shell shell_tui log_service log_writer)
+	endif(PKG_CONFIG_EXECUTABLE)
+endif (EXAMPLES)
\ No newline at end of file

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -23,10 +23,16 @@ if (FRAMEWORK) 
     
     include(CPackComponent)
     
-    cpack_add_component(framework
+    #cpack_add_component(framework
+    #	DISPLAY_NAME Framework
+    #    DESCRIPTION "The Apache Celix framework library"
+    #    REQUIRED
+    #)
+    
+    CELIX_ADD_COMPONENT(framework
     	DISPLAY_NAME Framework
         DESCRIPTION "The Apache Celix framework library"
-        REQUIRED
+        GROUP all
     )
     
     add_definitions(-DUSE_FILE32API)

Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -21,28 +21,28 @@ if (LOG_SERVICE)
 	SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_log_service")
 	SET_HEADERS("Bundle-Name: Apache Celix Log Service")
 	
-    bundle(log_service SOURCES
-    	private/src/log
-    	private/src/log_entry
-    	private/src/log_factory  
-    	private/src/log_service_impl 
-    	private/src/log_service_activator
-    	private/src/log_reader_service_impl
-        
-        private/include/log.h
-        private/include/log_factory.h
-        private/include/log_reader_service_impl.h
-        private/include/log_service_impl.h
+    bundle(log_service 
+    	SOURCES
+			private/src/log
+			private/src/log_entry
+			private/src/log_factory  
+			private/src/log_service_impl 
+			private/src/log_service_activator
+			private/src/log_reader_service_impl
+		    
+		    private/include/log.h
+		    private/include/log_factory.h
+		    private/include/log_reader_service_impl.h
+		    private/include/log_service_impl.h
+    )
+    
+    install_bundle(log_service
+        HEADERS
+        	public/include/log_service.h
     )
     
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/log_service/private/include")
     target_link_libraries(log_service celix_framework)
-    
-    package(log_service FILES public/include/log_service.h)
-    
-    FILE(GLOB files public/include/log_service.h)
-    INSTALL(FILES ${files} DESTINATION include/celix/log_service COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/log_service/log_service.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (LOG_SERVICE)

Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -27,11 +27,12 @@ if (LOG_WRITER)
     
         private/include/log_writer.h    
     )
+    
+    install_bundle(log_writer)
+    
 	include_directories("private/include")
     include_directories("${PROJECT_SOURCE_DIR}/dependency_manager/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     target_link_libraries(log_writer celix_framework dependency_manager)
-    
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/log_writer/log_writer.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (LOG_WRITER)
\ No newline at end of file

Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -32,7 +32,7 @@ if (REMOTE_SERVICE_ADMIN)
     add_subdirectory(topology_manager)
     add_subdirectory(remote_service_admin)
     add_subdirectory(discovery_slp)
-    #add_subdirectory(discovery_bonjour)
+    add_subdirectory(discovery_bonjour)
     
     add_subdirectory(example_service)
     add_subdirectory(example_endpoint)

Modified: incubator/celix/trunk/remote_services/deploy.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/deploy.cmake?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/deploy.cmake (original)
+++ incubator/celix/trunk/remote_services/deploy.cmake Tue Oct  1 08:48:12 2013
@@ -16,8 +16,8 @@
 # under the License.
 is_enabled(REMOTE_SERVICE_ADMIN)
 if (REMOTE_SERVICE_ADMIN)
-	#deploy("remote-services" BUNDLES discovery_bonjour topology_manager remote_service_admin
example example_endpoint shell shell_tui log_service log_writer)
-	#deploy("remote-services-client" BUNDLES topology_manager remote_service_admin example_proxy
shell shell_tui log_service log_writer calc_shell discovery_bonjour)
+	deploy("remote-services-bj" BUNDLES discovery_bonjour topology_manager remote_service_admin
example example_endpoint shell shell_tui log_service log_writer)
+	deploy("remote-services-bj-client" BUNDLES topology_manager remote_service_admin example_proxy
shell shell_tui log_service log_writer calc_shell discovery_bonjour)
 	
 	deploy("remote-services" BUNDLES discovery_slp topology_manager remote_service_admin example
example_endpoint shell shell_tui log_service log_writer)
 	deploy("remote-services-client" BUNDLES topology_manager remote_service_admin example_proxy
shell shell_tui log_service log_writer calc_shell discovery_slp)

Modified: incubator/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt Tue Oct  1 08:48:12
2013
@@ -32,6 +32,8 @@ 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})
 

Modified: incubator/celix/trunk/remote_services/discovery_slp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery_slp/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery_slp/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery_slp/CMakeLists.txt Tue Oct  1 08:48:12
2013
@@ -32,6 +32,8 @@ 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})
 

Modified: incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt Tue Oct  1 08:48:12
2013
@@ -40,5 +40,13 @@ bundle(remote_service_admin SOURCES 
     private/include/mongoose.h
     private/include/remote_service_admin_impl.h
 )
+    
+install_bundle(remote_service_admin
+	HEADERS
+	    public/include/remote_endpoint_impl.h
+		public/include/remote_endpoint.h
+		public/include/remote_proxy.h
+		public/include/remote_service_admin.h
+)
 
 target_link_libraries(remote_service_admin celix_framework ${APRUTIL_LIBRARY} ${JANSSON_LIBRARIES})

Modified: incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt Tue Oct  1 08:48:12
2013
@@ -31,4 +31,6 @@ bundle(topology_manager SOURCES
     private/include/topology_manager.h
 )
 
+install_bundle(topology_manager)
+
 target_link_libraries(topology_manager celix_framework ${APRUTIL_LIBRARY})

Modified: incubator/celix/trunk/remote_shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_shell/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/remote_shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_shell/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -29,16 +29,12 @@ if (REMOTE_SHELL)
 		private/include/remote_shell.h
 		private/include/connection_listener.h
 	)
+	
+	install_bundle(remote_shell)
  
     include_directories("private/include")
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/shell/public/include")
     
     target_link_libraries(remote_shell celix_framework ${APRUTIL_LIBRARY})
-    
-    package(remote_shell)
-    
-    #INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/remote_shell.zip DESTINATION share/celix/bundles
COMPONENT framework)
-    
-    #deploy("remote_shell" BUNDLES shell remote_shell shell_tui log_service)
 endif (REMOTE_SHELL)
\ No newline at end of file

Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -46,6 +46,13 @@ if (SHELL)
         private/include/update_command.h
         private/include/help_command.h
     )
+    
+    install_bundle(shell
+    	HEADERS
+    		public/include/shell.h public/include/command.h public/include/command_impl.h
+    	RESOURCES 
+    		public/src/command.c
+	)
 
 	include_directories("public/include")
 	include_directories("private/include")
@@ -53,10 +60,4 @@ if (SHELL)
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 	include_directories(${CURL_INCLUDE_DIRS})
     target_link_libraries(shell celix_framework ${CURL_LIBRARIES})
-    
-    package(shell FILES public/include/shell.h public/include/command.h public/include/command_impl.h
public/src/command.c)
-    
-    FILE(GLOB files public/include/shell.h public/include/command.h public/include/command_impl.h
public/src/command.c)
-    INSTALL(FILES ${files} DESTINATION include/celix/shell COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/shell/shell.zip DESTINATION share/celix/bundles COMPONENT
framework)
 endif (SHELL)
\ No newline at end of file

Modified: incubator/celix/trunk/shell_tui/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/CMakeLists.txt?rev=1527972&r1=1527971&r2=1527972&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Tue Oct  1 08:48:12 2013
@@ -20,12 +20,14 @@ if (SHELL_TUI)
 	SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_shell_tui")
 	SET_HEADERS("Bundle-Name: Apache Celix Shell TUI") 
 
-    bundle(shell_tui SOURCES private/src/shell_tui)
+    bundle(shell_tui 
+    	SOURCES 
+    		private/src/shell_tui
+	)
+	
+	install_bundle(shell_tui)
+	
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/shell/public/include")
     target_link_libraries(shell_tui celix_framework)
-    
-    package(shell_tui)
-    
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/shell_tui/shell_tui.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (SHELL_TUI)
\ No newline at end of file



Mime
View raw message