Author: abroekhuis
Date: Thu Nov 15 13:51:51 2012
New Revision: 1409780
URL: http://svn.apache.org/viewvc?rev=1409780&view=rev
Log:
CELIX-40: Refactored bundle creation so that the manifest is generated
Removed:
incubator/celix/trunk/deployment_admin/META-INF/MANIFEST.MF
incubator/celix/trunk/device_access/device_access/META-INF/MANIFEST.MF
incubator/celix/trunk/device_access/driver_locator/META-INF/MANIFEST.MF
incubator/celix/trunk/device_access/example/base_driver/META-INF/MANIFEST.MF
incubator/celix/trunk/device_access/example/consuming_driver/META-INF/MANIFEST.MF
incubator/celix/trunk/device_access/example/refining_driver/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/echo_service/client/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/echo_service/server/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/hello_world/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/mongoose/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/client/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-listener/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-correct-lookup/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/whiteboard/publisherA/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/whiteboard/publisherB/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/whiteboard/tracker/META-INF/MANIFEST.MF
incubator/celix/trunk/examples/whiteboard/tracker_depman/META-INF/MANIFEST.MF
incubator/celix/trunk/log_service/META-INF/MANIFEST.MF
incubator/celix/trunk/log_writer/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/calc_shell/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/discovery/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/example_endpoint/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/example_proxy/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/example_service/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/remote_service_admin/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/remote_service_admin_http/META-INF/MANIFEST.MF
incubator/celix/trunk/remote_services/topology_manager/META-INF/MANIFEST.MF
incubator/celix/trunk/shell/META-INF/MANIFEST.MF
incubator/celix/trunk/shell_tui/META-INF/MANIFEST.MF
Modified:
incubator/celix/trunk/cmake/CPackConfig.in
incubator/celix/trunk/cmake/CPackConfigPKG.in
incubator/celix/trunk/cmake/NOTE
incubator/celix/trunk/cmake/Packaging.cmake
incubator/celix/trunk/cmake/manifest.in
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/device_access/example/base_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
incubator/celix/trunk/examples/hello_world/CMakeLists.txt
incubator/celix/trunk/log_service/CMakeLists.txt
incubator/celix/trunk/log_writer/CMakeLists.txt
incubator/celix/trunk/rat-excludes.txt
incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
incubator/celix/trunk/remote_services/topology_manager/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=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfig.in (original)
+++ incubator/celix/trunk/cmake/CPackConfig.in Thu Nov 15 13:51:51 2012
@@ -17,13 +17,9 @@
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS
"@BUNDLE_BIN_DIR@;@BUNDLE_NAME@;@BUNDLE_NAME@;/")
-SET(CPACK_MODULE_PATH "")
-SET(CPACK_PACKAGE_DESCRIPTION "Package description")
-SET(CPACK_PACKAGE_FILE_NAME "@BUNDLE_NAME@")
-SET(CPACK_PACKAGE_NAME "@CPACK_PACKAGE_NAME@")
-SET(CPACK_PACKAGE_VERSION "@IBS_VERSION@")
-SET(CPACK_SYSTEM_NAME "@CPACK_SYSTEM_NAME@")
-SET(CPACK_TOPLEVEL_TAG "@CPACK_TOPLEVEL_TAG@")
+SET(CPACK_INSTALL_CMAKE_PROJECTS
"@BUNDLE_BIN_DIR@;@INT_BUNDLE_NAME@;@INT_BUNDLE_NAME@;/")
+SET(CPACK_PACKAGE_DESCRIPTION "@BUNDLE_DESCRIPTION@")
+SET(CPACK_PACKAGE_FILE_NAME "@INT_BUNDLE_NAME@")
+SET(CPACK_PACKAGE_NAME "@INT_BUNDLE_NAME@")
+SET(CPACK_PACKAGE_VERSION "@BUNDLE_VERSION@")
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "0")
-#set(CPACK_INSTALLED_DIRECTORIES "@BUNDLE_SOURCE_DIR@/META-INF;/META-INF")
Modified: incubator/celix/trunk/cmake/CPackConfigPKG.in
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfigPKG.in?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfigPKG.in (original)
+++ incubator/celix/trunk/cmake/CPackConfigPKG.in Thu Nov 15 13:51:51 2012
@@ -17,21 +17,9 @@
SET(CPACK_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CPACK_GENERATOR "@CPACK_GENERATOR@")
-SET(CPACK_INSTALL_CMAKE_PROJECTS
"@BUNDLE_BIN_DIR@;@BUNDLE_NAME@;@PACKAGE_COMPONENT@;/")
-SET(CPACK_MODULE_PATH "")
-SET(CPACK_PACKAGE_DESCRIPTION "Package description")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PACKAGE_NAME@_pkg")
-SET(CPACK_PACKAGE_FILE_NAME "@PACKAGE_NAME@_pkg")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "IBS")
-SET(CPACK_PACKAGE_NAME "@CPACK_PACKAGE_NAME@")
-SET(CPACK_PACKAGE_VENDOR "HPA")
-SET(CPACK_PACKAGE_VERSION "@IBS_VERSION@")
-SET(CPACK_PACKAGE_VERSION_MAJOR "@IBS_MAJOR@")
-SET(CPACK_PACKAGE_VERSION_MINOR "@IBS_MINOR@")
-SET(CPACK_PACKAGE_VERSION_PATCH "@IBS_PATCH@")
-SET(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/cpack/License.txt")
-SET(CPACK_RESOURCE_FILE_README "@PROJECT_SOURCE_DIR@/cpack/Readme.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "@PROJECT_SOURCE_DIR@/cpack/Welcome.txt")
-SET(CPACK_SYSTEM_NAME "@CPACK_SYSTEM_NAME@")
-SET(CPACK_TOPLEVEL_TAG "@CPACK_TOPLEVEL_TAG@")
+SET(CPACK_INSTALL_CMAKE_PROJECTS
"@BUNDLE_BIN_DIR@;@INT_BUNDLE_NAME@;@PACKAGE_COMPONENT@;/")
+SET(CPACK_PACKAGE_DESCRIPTION "@INT_BUNDLE_SYMBOLICNAME@ Package")
+SET(CPACK_PACKAGE_FILE_NAME "@PACKAGE_NAME@-dev")
+SET(CPACK_PACKAGE_NAME "@PACKAGE_NAME@")
+SET(CPACK_PACKAGE_VERSION "@BUNDLE_VERSION@")
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "0")
Modified: incubator/celix/trunk/cmake/NOTE
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/NOTE?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/NOTE (original)
+++ incubator/celix/trunk/cmake/NOTE Thu Nov 15 13:51:51 2012
@@ -21,5 +21,6 @@ The following templates do not include t
* config.properties.in
* run.sh.in
* RunConfig.in
+* manifest.in
This note is added to explicitly mention that the same licensing applies to
these files as to any other having the header.
\ No newline at end of file
Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Thu Nov 15 13:51:51 2012
@@ -26,53 +26,58 @@ 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})
+ENDMACRO(SET_HEADER)
+
+MACRO(SET_HEADERS content)
+ SET(INT_BUNDLE_EXTRAHEADER "${INT_BUNDLE_EXTRAHEADER}\n${content}")
+ string(STRIP ${INT_BUNDLE_EXTRAHEADER} INT_BUNDLE_EXTRAHEADER)
+ENDMACRO(SET_HEADERS)
+
MACRO(bundle)
PARSE_ARGUMENTS(BUNDLE "SOURCES;FILES;DIRECTORIES" "" ${ARGN})
- LIST(GET BUNDLE_DEFAULT_ARGS 0 BUNDLE_NAME)
+ LIST(GET BUNDLE_DEFAULT_ARGS 0 INT_BUNDLE_NAME)
- add_library(${BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
+ add_library(${INT_BUNDLE_NAME} SHARED ${BUNDLE_SOURCES})
- if (NOT BUNDLE_SYMBOLICNAME)
- set(BUNDLE_SYMBOLICNAME ${BUNDLE_NAME})
- endif (NOT BUNDLE_SYMBOLICNAME)
- if (NOT BUNDLE_VERSION)
- set(VERSION ${DEFAULT_VERSION})
- endif (NOT BUNDLE_VERSION)
- if (BUNDLE_EXTRAHEADERS)
- set(BUNDLE_EXTRAHEADERS_STR)
- foreach(ITEM ${BUNDLE_EXTRAHEADERS})
- set(BUNDLE_EXTRAHEADERS_STR "${BUNDLE_EXTRAHEADERS_STR}\n${ITEM}")
- endforeach()
- string(STRIP ${BUNDLE_EXTRAHEADERS_STR} BUNDLE_EXTRAHEADERS_STR)
- endif (BUNDLE_EXTRAHEADERS)
+ if (NOT INT_BUNDLE_SYMBOLICNAME)
+ set(INT_BUNDLE_SYMBOLICNAME ${INT_BUNDLE_NAME})
+ endif (NOT INT_BUNDLE_SYMBOLICNAME)
+ if (NOT INT_BUNDLE_VERSION)
+ set(INT_BUNDLE_VERSION ${DEFAULT_VERSION})
+ endif (NOT INT_BUNDLE_VERSION)
+ if (NOT INT_BUNDLE_DESCRIPTION)
+ set(INT_BUNDLE_DESCRIPTION "${INT_BUNDLE_SYMBOLICNAME} bundle")
+ endif (NOT INT_BUNDLE_DESCRIPTION)
- SET(__bundleManifest ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST_TEST.MF)
+ 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
${BUNDLE_NAME})
+ install (FILES ${__bundleManifest} DESTINATION ./META-INF COMPONENT
${INT_BUNDLE_NAME})
- install (DIRECTORY META-INF DESTINATION . COMPONENT ${BUNDLE_NAME}
FILES_MATCHING PATTERN "*" PATTERN ".svn" EXCLUDE)
- install (TARGETS ${BUNDLE_NAME} DESTINATION . COMPONENT ${BUNDLE_NAME})
+ install (TARGETS ${INT_BUNDLE_NAME} DESTINATION . COMPONENT
${INT_BUNDLE_NAME})
if (BUNDLE_FILES)
- install (FILES ${BUNDLE_FILES} DESTINATION . COMPONENT
${BUNDLE_NAME})
+ install (FILES ${BUNDLE_FILES} DESTINATION . COMPONENT
${INT_BUNDLE_NAME})
endif(BUNDLE_FILES)
if (BUNDLE_DIRECTORIES)
- install (DIRECTORY ${BUNDLE_DIRECTORIES} DESTINATION . COMPONENT
${BUNDLE_NAME})
+ install (DIRECTORY ${BUNDLE_DIRECTORIES} DESTINATION . COMPONENT
${INT_BUNDLE_NAME})
endif(BUNDLE_DIRECTORIES)
- SET(__bundleConfig
${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${BUNDLE_NAME}-bundle.cmake)
+ SET(__bundleConfig
${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${INT_BUNDLE_NAME}-bundle.cmake)
SET(BUNDLE_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfig.in
${__bundleConfig} @ONLY)
- ADD_CUSTOM_COMMAND(TARGET ${BUNDLE_NAME}
+ ADD_CUSTOM_COMMAND(TARGET ${INT_BUNDLE_NAME}
POST_BUILD
COMMAND ${CPACK_COMMAND} ARGS --config ${__bundleConfig}
COMMAND mkdir -p ${PROJECT_BINARY_DIR}/ziptojar \;
cd ${PROJECT_BINARY_DIR}/ziptojar \;
- jar -xf
${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip \;
- jar -cfm
${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip META-INF/MANIFEST.MF . \;
+ jar -xf
${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip \;
+ jar -cfm
${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip META-INF/MANIFEST.MF . \;
rm -rf ${PROJECT_BINARY_DIR}/ziptojar/*
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bundles
)
- SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${PROJECT_BINARY_DIR}/bundles/${BUNDLE_NAME}.zip)
+ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${PROJECT_BINARY_DIR}/bundles/${INT_BUNDLE_NAME}.zip)
ENDMACRO(bundle)
MACRO(package)
Modified: incubator/celix/trunk/cmake/manifest.in
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/manifest.in?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/manifest.in (original)
+++ incubator/celix/trunk/cmake/manifest.in Thu Nov 15 13:51:51 2012
@@ -1,4 +1,5 @@
-Bundle-SymbolicName: @BUNDLE_SYMBOLICNAME@
-Bundle-Version: @BUNDLE_VERSION@
-library: @BUNDLE_NAME@
-@BUNDLE_EXTRAHEADERS_STR@
+Bundle-SymbolicName: @INT_BUNDLE_SYMBOLICNAME@
+Bundle-Description: @INT_BUNDLE_DESCRIPTION@
+Bundle-Version: @INT_BUNDLE_VERSION@
+library: @INT_BUNDLE_NAME@
+@INT_BUNDLE_EXTRAHEADER@
Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Thu Nov 15 13:51:51
2012
@@ -22,6 +22,9 @@ if (DEPLOYMENT_ADMIN)
add_definitions(-DUSE_FILE32API)
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_deployment_admin")
+ SET_HEADERS("Bundle-Name: Apache Celix Deployment Admin")
+
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/private/include")
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=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Thu Nov 15
13:51:51 2012
@@ -17,6 +17,9 @@
find_package(APR REQUIRED)
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_device_manager")
+SET_HEADERS("Bundle-Name: Apache Celix Device Access Device Manager")
+
bundle(device_manager SOURCES
private/src/activator
private/src/driver_attributes
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=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt Thu Nov
15 13:51:51 2012
@@ -17,6 +17,9 @@
find_package(APR REQUIRED)
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_driver_locator")
+SET_HEADERS("Bundle-Name: Apache Celix Device Access Driver Locator")
+
bundle(driver_locator SOURCES
private/src/activator
private/src/driver_locator
Modified: incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt Thu
Nov 15 13:51:51 2012
@@ -17,6 +17,9 @@
find_package(APR REQUIRED)
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_base_driver_example")
+SET_HEADERS("Bundle-Name: Apache Celix Device Access Base Driver Example")
+
bundle(base_driver SOURCES
private/src/activator
private/src/base_driver
Modified:
incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
Thu Nov 15 13:51:51 2012
@@ -17,6 +17,9 @@
find_package(APR REQUIRED)
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_word_consuming_driver_example")
+SET_HEADERS("Bundle-Name: Apache Celix Device Access Word Consuming Driver
Example")
+
bundle(word_consumingdriver SOURCES
private/src/activator
private/src/consuming_driver
Modified:
incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
(original)
+++ incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
Thu Nov 15 13:51:51 2012
@@ -17,6 +17,9 @@
find_package(APR REQUIRED)
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_char_refining_driver_example")
+SET_HEADERS("Bundle-Name: Apache Celix Device Access Char Refining Driver
Example")
+
bundle(char_refiningdriver SOURCES
private/src/activator
private/src/refining_driver
Modified: incubator/celix/trunk/examples/hello_world/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/examples/hello_world/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/examples/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/hello_world/CMakeLists.txt Thu Nov 15
13:51:51 2012
@@ -15,6 +15,9 @@
# specific language governing permissions and limitations
# under the License.
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_examples_hello_world")
+SET_HEADERS("Bundle-Name: Apache Celix Shell TUI")
+
bundle(hello_world SOURCES private/src/activator)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
target_link_libraries(hello_world celix_framework)
Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Thu Nov 15 13:51:51 2012
@@ -17,9 +17,10 @@
celix_subproject(LOG_SERVICE "Option to enable building the Log Service
bundles" "OFF" DEPS framework)
if (LOG_SERVICE)
- SET(BUNDLE_SYMBOLICNAME "Log Service")
- SET(BUNDLE_VERSION 0.0.1-incubation)
- SET(BUNDLE_EXTRAHEADERS "Test: TEST" "Bla: bla")
+
+ 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
Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Thu Nov 15 13:51:51 2012
@@ -17,6 +17,10 @@
celix_subproject(LOG_WRITER "Option to enable building the Log Writer bundle"
"OFF" DEPS FRAMEWORK LOG_SERVICE DEPENDENCY_MANAGER)
if (LOG_WRITER)
+
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_log_writer")
+ SET_HEADERS("Bundle-Name: Apache Celix Log Writer")
+
bundle(log_writer SOURCES
private/src/dependency_activator
private/src/log_writer)
Modified: incubator/celix/trunk/rat-excludes.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/rat-excludes.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/rat-excludes.txt (original)
+++ incubator/celix/trunk/rat-excludes.txt Thu Nov 15 13:51:51 2012
@@ -20,14 +20,11 @@
- Doxygen scripts for CMake (Doxyfile.in, UseDoxygen.cmake)
Also there are several files which can't have a license.
- - *.MF Manifest files cannot contain comments
- *.in Input files used by CMake to generate files for deployment,
should not contain comments.
- .project Eclipse project file, not in the release but generated by CMake.
Excluded to prevent false positives when using RAT on a dev tree.
-(.*).MF
-
Todo: Why doesn't RAT exclude these files when using a full path?
cmake/config.properties.in
cmake/run.sh.in
Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Thu Nov 15
13:51:51 2012
@@ -25,6 +25,10 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
link_directories("/opt/local/lib")
+
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_slp")
+SET_HEADERS("Bundle-Name: Apache Celix RSA SLP Discovery")
+
bundle(discovery SOURCES
private/src/discovery
private/src/discovery_activator
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=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
Thu Nov 15 13:51:51 2012
@@ -25,6 +25,9 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin")
+SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin")
+
bundle(remote_service_admin SOURCES
private/src/remote_service_admin_impl
private/src/export_registration_impl
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=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt Thu
Nov 15 13:51:51 2012
@@ -21,5 +21,8 @@ include_directories("${PROJECT_SOURCE_DI
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rs_topology_manager")
+SET_HEADERS("Bundle-Name: Apache Celix RS Topology Manager")
+
bundle(topology_manager SOURCES private/src/topology_manager
private/src/activator)
target_link_libraries(topology_manager celix_framework remote_services_utils
${APRUTIL_LIBRARY})
Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Thu Nov 15 13:51:51 2012
@@ -17,6 +17,9 @@
celix_subproject(SHELL "Option to enable building the Shell bundles" "OFF"
DEPS LAUNCHER LOG_SERVICE)
if (SHELL)
find_package(CURL REQUIRED)
+
+ SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_shell")
+ SET_HEADERS("Bundle-Name: Apache Celix Shell")
bundle(shell SOURCES
private/src/shell
Modified: incubator/celix/trunk/shell_tui/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/CMakeLists.txt?rev=1409780&r1=1409779&r2=1409780&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Thu Nov 15 13:51:51 2012
@@ -16,6 +16,10 @@
# under the License.
celix_subproject(SHELL_TUI "Option to enable building the Shell Textual User
Interface bundles" OFF DEPS LAUNCHER SHELL)
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)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/shell/public/include")
