incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1417375 - in /incubator/celix/trunk: ./ cmake/ deployment_admin/ device_access/example/ examples/ examples/osgi-in-action/chapter04-paint-example/ remote_services/
Date Wed, 05 Dec 2012 12:01:22 GMT
Author: abroekhuis
Date: Wed Dec  5 12:01:20 2012
New Revision: 1417375

URL: http://svn.apache.org/viewvc?rev=1417375&view=rev
Log:
Concurrent build

Modified:
    incubator/celix/trunk/CMakeLists.txt
    incubator/celix/trunk/cmake/Packaging.cmake
    incubator/celix/trunk/deployment_admin/CMakeLists.txt
    incubator/celix/trunk/device_access/example/CMakeLists.txt
    incubator/celix/trunk/examples/CMakeLists.txt
    incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/CMakeLists.txt
    incubator/celix/trunk/remote_services/CMakeLists.txt

Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Wed Dec  5 12:01:20 2012
@@ -52,3 +52,5 @@ add_subdirectory(dependency_manager)
 add_subdirectory(launcher)
 add_subdirectory(framework)
 add_subdirectory(utils)
+
+deploy("hello_world" BUNDLES shell shell_tui hello_world log_service)

Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Wed Dec  5 12:01:20 2012
@@ -31,8 +31,6 @@ endif(JAR_COMMAND)
 
 SET(CPACK_GENERATOR "ZIP")
 
-file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/bundles ${PROJECT_BINARY_DIR}/packages)
-
 MACRO(SET_HEADER header content)
 	SET(INT_${header} "${content}")
 	string(STRIP ${INT_${header}} INT_${header})
@@ -48,6 +46,7 @@ MACRO(bundle)
     LIST(GET BUNDLE_DEFAULT_ARGS 0 INT_BUNDLE_NAME)
     
 	add_library(${INT_BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
+	set_property(TARGET ${INT_BUNDLE_NAME} PROPERTY BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip")

 	
 	if (NOT INT_BUNDLE_SYMBOLICNAME)
 		set(INT_BUNDLE_SYMBOLICNAME ${INT_BUNDLE_NAME})
@@ -79,21 +78,21 @@ MACRO(bundle)
 		ADD_CUSTOM_COMMAND(TARGET ${INT_BUNDLE_NAME}
 		POST_BUILD
 			COMMAND ${CPACK_COMMAND} ARGS -C Debug --config ${__bundleConfig}
-			COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/ziptojar
-			COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/ziptojar ${JAR_COMMAND} -xf ${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip
-			COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/ziptojar ${JAR_COMMAND} -cfm ${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip
META-INF/MANIFEST.MF .
-			COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/ziptojar
-			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bundles
+			COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/ziptojar
+			COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}/ziptojar ${JAR_COMMAND}
-xf ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip
+			COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}/ziptojar ${JAR_COMMAND}
-cfm ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip META-INF/MANIFEST.MF .
+			COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/ziptojar
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 		)
 	else(JAR_COMMAND)
 		ADD_CUSTOM_COMMAND(TARGET ${INT_BUNDLE_NAME}
 		POST_BUILD
 			COMMAND ${CPACK_COMMAND} ARGS -C Debug --config ${__bundleConfig}
-			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bundles
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 		)
 	endif(JAR_COMMAND)
 	
-	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip)
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${INT_BUNDLE_NAME}.zip)
 ENDMACRO(bundle)
 	
 MACRO(package)
@@ -102,7 +101,9 @@ MACRO(package)
 	
 	SET(PACKAGE_COMPONENT package_${PACKAGE_NAME})
 	
-	install (FILES ${PROJECT_BINARY_DIR}/bundles/${PACKAGE_NAME}.zip DESTINATION . COMPONENT
${PACKAGE_COMPONENT})
+	get_property(bundle_file TARGET ${INT_BUNDLE_NAME} PROPERTY BUNDLE)
+	
+	install (FILES ${bundle_file} DESTINATION . COMPONENT ${PACKAGE_COMPONENT})
 	
 	if (PACKAGE_FILES)
 	    install (FILES ${PACKAGE_FILES} DESTINATION . COMPONENT ${PACKAGE_COMPONENT})
@@ -115,13 +116,12 @@ MACRO(package)
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigPKG.in ${__packageConfig} @ONLY)
 	ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_NAME}
 		POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/packages
 		COMMAND	${CPACK_COMMAND} --config "${__packageConfig}"
-		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/packages
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	)
 	
 	GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
-	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${PROJECT_BINARY_DIR}/packages/${PACKAGE_NAME}_pkg.zip")
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}-dev.zip")
 ENDMACRO(package)
 
 
@@ -137,8 +137,9 @@ MACRO(deploy)
 	SET(DEPS)
 	FOREACH(BUNDLE ${DEPLOY_BUNDLES})
 		SET(DEP_NAME ${DEPLOY_NAME}_${BUNDLE}) 
+		get_property(bundle_file TARGET ${BUNDLE} PROPERTY BUNDLE)
 		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
-      		COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/bundles/${BUNDLE}.zip 
+      		COMMAND ${CMAKE_COMMAND} -E copy ${bundle_file} 
       			${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip
   			DEPENDS ${BUNDLE}
   			COMMENT "Deploying ${BUNDLE} to ${DEPLOY_NAME}"

Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Wed Dec  5 12:01:20 2012
@@ -48,5 +48,5 @@ if (DEPLOYMENT_ADMIN)
     
     install(FILES public/include/resource_processor.h DESTINATION include/celix/deployment_admin)
     
-    deploy("deployment-admin" BUNDLES deployment_admin shell shell_tui log_service log_writer)
+    # deploy("deployment-admin" BUNDLES deployment_admin shell shell_tui log_service log_writer)
 endif (DEPLOYMENT_ADMIN)

Modified: incubator/celix/trunk/device_access/example/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/CMakeLists.txt?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/CMakeLists.txt Wed Dec  5 12:01:20 2012
@@ -22,5 +22,5 @@ if(DEVICE_ACCESS_EXAMPLE)
 	add_subdirectory(consuming_driver)
 	add_subdirectory(refining_driver)
 	
-	deploy("device_access_example" BUNDLES device_manager driver_locator shell shell_tui log_service
base_driver base_driver word_consumingdriver char_refiningdriver)
+	# deploy("device_access_example" BUNDLES device_manager driver_locator shell shell_tui log_service
base_driver base_driver word_consumingdriver char_refiningdriver)
 endif(DEVICE_ACCESS_EXAMPLE)
\ No newline at end of file

Modified: incubator/celix/trunk/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/CMakeLists.txt?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/examples/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/CMakeLists.txt Wed Dec  5 12:01:20 2012
@@ -27,11 +27,11 @@ if (EXAMPLES)
     add_subdirectory(osgi-in-action/chapter01-greeting-example)
     add_subdirectory(osgi-in-action/chapter04-paint-example)
     
-    deploy(chapter01-greeting-example BUNDLES shell shell_tui log_service chapter01-greeting-example-client
chapter01-greeting-example)
-    deploy(chapter04-correct-listener BUNDLES shell shell_tui log_service chapter04-correct-listener)
+    #deploy(chapter01-greeting-example BUNDLES shell shell_tui log_service chapter01-greeting-example-client
chapter01-greeting-example)
+    #deploy(chapter04-correct-listener BUNDLES shell shell_tui log_service chapter04-correct-listener)
     
-    deploy("hello_world" BUNDLES shell shell_tui hello_world log_service)
-    deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
-    deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service
log_writer)
-    deploy("echo" BUNDLES echo_server echo_client shell shell_tui log_service log_writer)
+    #deploy("hello_world" BUNDLES shell shell_tui hello_world log_service)
+    #deploy("wb" BUNDLES tracker publisherA publisherB shell shell_tui log_service log_writer)
+    #deploy("wb_dp" BUNDLES tracker_depman publisherA publisherB shell shell_tui log_service
log_writer)
+    #deploy("echo" BUNDLES echo_server echo_client shell shell_tui log_service log_writer)
 endif(EXAMPLES)

Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/CMakeLists.txt?rev=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/CMakeLists.txt Wed
Dec  5 12:01:20 2012
@@ -22,7 +22,7 @@ if(PKG_CONFIG_EXECUTABLE)
 	add_subdirectory(square)
 	add_subdirectory(triangle)
 	
-	deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square triangle
shell shell_tui log_service log_writer)
+	#deploy("chapter04-paint-example" BUNDLES chapter04-paint-example circle square triangle
shell shell_tui log_service log_writer)
 else(PKG_CONFIG_EXECUTABLE)
 	MESSAGE("No GTK found, not building the Paint Example")	
 endif(PKG_CONFIG_EXECUTABLE)
\ 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=1417375&r1=1417374&r2=1417375&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Wed Dec  5 12:01:20 2012
@@ -40,6 +40,6 @@ if (REMOTE_SERVICE_ADMIN)
     add_subdirectory(example_proxy)
     add_subdirectory(calc_shell)
     
-    deploy("remote-services" BUNDLES discovery topology_manager remote_service_admin example
shell shell_tui log_service log_writer)
-    deploy("remote-services-client" BUNDLES discovery topology_manager remote_service_admin
shell shell_tui log_service log_writer calc_shell)
+    #deploy("remote-services" BUNDLES discovery topology_manager remote_service_admin example
shell shell_tui log_service log_writer)
+    #deploy("remote-services-client" BUNDLES discovery topology_manager remote_service_admin
shell shell_tui log_service log_writer calc_shell)
 endif (REMOTE_SERVICE_ADMIN)



Mime
View raw message