celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1632018 - in /celix/trunk: cmake/cmake_celix/Packaging.cmake examples/deploy.cmake examples/hello_world/CMakeLists.txt
Date Wed, 15 Oct 2014 13:33:33 GMT
Author: abroekhuis
Date: Wed Oct 15 13:33:33 2014
New Revision: 1632018

URL: http://svn.apache.org/r1632018
Log:
Updated macros to use symbolic name as bundle name.

Modified:
    celix/trunk/cmake/cmake_celix/Packaging.cmake
    celix/trunk/examples/deploy.cmake
    celix/trunk/examples/hello_world/CMakeLists.txt

Modified: celix/trunk/cmake/cmake_celix/Packaging.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/cmake/cmake_celix/Packaging.cmake?rev=1632018&r1=1632017&r2=1632018&view=diff
==============================================================================
--- celix/trunk/cmake/cmake_celix/Packaging.cmake (original)
+++ celix/trunk/cmake/cmake_celix/Packaging.cmake Wed Oct 15 13:33:33 2014
@@ -82,7 +82,7 @@ add_custom_target(bundles ALL)
 
 MACRO(CHECK_HEADERS)
     if (NOT BUNDLE_SYMBOLICNAME)
-        MESSAGE(FATAL_ERROR "Bundle Symbolic Name not set, please set it using \"SET(BUNDLE_SYMBOLIC_NAME
\"bundle_symbolic_name\")\".")
+        MESSAGE(FATAL_ERROR "Bundle Symbolic Name not set, please set it using \"SET(BUNDLE_SYMBOLICNAME
\"bundle_symbolic_name\")\".")
     endif (NOT BUNDLE_SYMBOLICNAME)
     
     if (NOT BUNDLE_VERSION)
@@ -164,6 +164,11 @@ MACRO(bundle)
     
     PROCESS_MANIFEST_HEADERS()
     
+    if (NOT _BUNDLE_NAME)
+      message(STATUS "NO bundle name set, using symbolic name")
+      SET(_BUNDLE_NAME ${BUNDLE_SYMBOLICNAME})
+    endif(NOT _BUNDLE_NAME)
+    
     set(_BUNDLE_NAME_INSTALL ${_BUNDLE_NAME}_install)
     
     if(_BUNDLE_SOURCES)

Modified: celix/trunk/examples/deploy.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/examples/deploy.cmake?rev=1632018&r1=1632017&r2=1632018&view=diff
==============================================================================
--- celix/trunk/examples/deploy.cmake (original)
+++ celix/trunk/examples/deploy.cmake Wed Oct 15 13:33:33 2014
@@ -19,7 +19,7 @@ if (EXAMPLES)
 	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 org.apache.incubator.celix.helloworld hello_world_test
log_service)
+	deploy("hello_world" BUNDLES shell shell_tui apache_celix_examples_hello_world hello_world_test
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)

Modified: celix/trunk/examples/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1632018&r1=1632017&r2=1632018&view=diff
==============================================================================
--- celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ celix/trunk/examples/hello_world/CMakeLists.txt Wed Oct 15 13:33:33 2014
@@ -32,7 +32,7 @@ BUNDLE_PRIVATE_LIBRARY(private
     LINK_LIBRARIES celix_framework org.apache.incubator.celix.helloworld.sub
     )
     
-BUNDLE(org.apache.incubator.celix.helloworld
+BUNDLE(
     ACTIVATOR "apache_celix_examples_hello_world-private"
     PRIVATE_LIBRARIES "private"
     EXPORT_LIBRARIES org.apache.incubator.celix.helloworld.sub



Mime
View raw message