You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2013/06/24 15:11:56 UTC
svn commit: r1496019 - in /incubator/celix/trunk: deployment_admin/
device_access/device_access/ examples/echo_service/client/
examples/echo_service/server/ examples/mongoose/
examples/osgi-in-action/chapter01-greeting-example/greeting/
examples/osgi-i...
Author: abroekhuis
Date: Mon Jun 24 13:11:55 2013
New Revision: 1496019
URL: http://svn.apache.org/r1496019
Log:
CELIX-72: Applied patch to include header files in CMake targets.
This inclusion is needed to see the header files in Xcode and Visual Studio. Whereas Eclipse simply lists all files in a directory, those other tools only list files which are explicitly added.
Modified:
incubator/celix/trunk/deployment_admin/CMakeLists.txt
incubator/celix/trunk/device_access/device_access/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
incubator/celix/trunk/examples/mongoose/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
incubator/celix/trunk/log_service/CMakeLists.txt
incubator/celix/trunk/log_writer/CMakeLists.txt
incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
incubator/celix/trunk/remote_services/example_service/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
Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -42,6 +42,16 @@ if (DEPLOYMENT_ADMIN)
private/src/log
private/src/log_store
private/src/log_sync
+
+ private/include/deployment_admin.h
+ private/include/deployment_package.h
+ private/include/ioapi.h
+ private/include/log.h
+ private/include/log_event.h
+ private/include/log_store.h
+ private/include/log_sync.h
+ private/include/miniunz.h
+ private/include/unzip.h
)
target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
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=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -26,6 +26,11 @@ bundle(device_manager SOURCES
private/src/device_manager
private/src/driver_loader
private/src/driver_matcher
+
+ private/include/device_manager.h
+ private/include/driver_attributes.h
+ private/include/driver_loader.h
+ private/include/driver_matcher.h
)
FILE(GLOB SERVICE_HEADERS public/include/*.h)
Modified: incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/client/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -17,7 +17,11 @@
bundle(echo_client SOURCES
private/src/echo_client_activator
- private/src/echo_client)
+ private/src/echo_client
+
+ private/include/echo_client_private.h
+)
+
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
Modified: incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/echo_service/server/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -17,7 +17,11 @@
bundle(echo_server SOURCES
private/src/echo_server_activator
- private/src/echo_server)
+ private/src/echo_server
+
+ private/include/echo_server_private.h
+)
+
include_directories("private/include")
include_directories("public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
Modified: incubator/celix/trunk/examples/mongoose/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/mongoose/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/mongoose/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -20,7 +20,13 @@ SET_TARGET_PROPERTIES(mongoose PROPERTIE
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-bundle(celix.mongoose SOURCES private/src/activator DIRECTORIES root)
+bundle(celix.mongoose SOURCES
+ private/src/activator
+
+ private/include/mongoose.h
+ DIRECTORIES root
+)
+
target_link_libraries(celix.mongoose celix_framework mongoose)
if(WIN32)
target_link_libraries(celix.mongoose wsock32)
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter01-greeting-example/greeting/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -15,7 +15,13 @@
# specific language governing permissions and limitations
# under the License.
-bundle(chapter01-greeting-example SOURCES private/src/activator private/src/greeting_impl)
+bundle(chapter01-greeting-example SOURCES
+ private/src/activator
+ private/src/greeting_impl
+
+ private/include/greeting_impl.h
+)
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("public/include")
include_directories("private/include")
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/circle/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -34,9 +34,12 @@ link_directories(${GTHR_LIBRARY_DIRS})
bundle(circle SOURCES
private/src/activator
private/src/circle_shape
+
+ private/include/circle_shape.h
FILES
private/src/circle.png
- )
+)
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
target_link_libraries(circle celix_framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/paint/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -40,9 +40,14 @@ bundle(chapter04-paint-example SOURCES
private/src/default_shape
private/src/shape_component
private/src/paint_frame
+
+ private/include/default_shape.h
+ private/include/paint_frame.h
+ private/include/shape_component.h
FILES
private/src/underc.png gtktest.glade
- )
+)
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
target_link_libraries(chapter04-paint-example celix_framework ${MODULE_LIBRARIES} ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/square/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -34,9 +34,12 @@ link_directories(${GTHR_LIBRARY_DIRS})
bundle(square SOURCES
private/src/activator
private/src/square_shape
+
+ private/include/square_shape.h
FILES
private/src/square.png
)
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
target_link_libraries(square celix_framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified: incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/osgi-in-action/chapter04-paint-example/triangle/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -34,9 +34,12 @@ link_directories(${GTHR_LIBRARY_DIRS})
bundle(triangle SOURCES
private/src/activator
private/src/triangle_shape
+
+ private/include/triangle_shape.h
FILES
private/src/triangle.png
- )
+)
+
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
target_link_libraries(triangle celix_framework ${GLIB_LIBRARIES} ${GTK_LIBRARIES} ${GTHR_LIBRARIES})
Modified: incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt (original)
+++ incubator/celix/trunk/examples/whiteboard/tracker_depman/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -15,7 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-bundle(tracker_depman SOURCES private/src/dependency_activator private/src/tracker)
+bundle(tracker_depman SOURCES
+ private/src/dependency_activator
+ private/src/tracker
+
+ private/include/tracker.h
+)
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/dependency_manager/public/include")
include_directories("../publisherService/public/include")
Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -28,7 +28,13 @@ if (LOG_SERVICE)
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
+ )
+
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")
Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -23,7 +23,10 @@ if (LOG_WRITER)
bundle(log_writer SOURCES
private/src/dependency_activator
- private/src/log_writer)
+ private/src/log_writer
+
+ private/include/log_writer.h
+ )
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/dependency_manager/public/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
Modified: incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/calc_shell/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -20,7 +20,12 @@ bundle(calc_shell SOURCES
private/src/sub_command
private/src/sqrt_command
private/src/calc_shell_activator
+
+ private/include/add_command.h
+ private/include/sqrt_command.h
+ private/include/sub_command.h
)
+
include_directories("${PROJECT_SOURCE_DIR}/remote_services/calc_shell/private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_service/public/include")
Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -30,6 +30,9 @@ SET_HEADERS("Bundle-Name: Apache Celix R
bundle(discovery SOURCES
private/src/discovery
private/src/discovery_activator
+
+ private/include/discovery.h
)
+
target_link_libraries(discovery celix_framework ${APRUTIL_LIBRARY} ${SLP_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -26,5 +26,8 @@ include_directories("${PROJECT_SOURCE_DI
bundle(example_endpoint SOURCES
private/src/example_endpoint_activator
private/src/example_endpoint_impl.c
+
+ private/include/example_endpoint_impl.h
)
+
target_link_libraries(example_endpoint celix_framework ${JANSSON_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -29,5 +29,8 @@ include_directories("${PROJECT_SOURCE_DI
bundle(example_proxy SOURCES
private/src/example_proxy_activator
private/src/example_proxy_impl.c
+
+ private/include/example_proxy_impl.h
)
+
target_link_libraries(example_proxy celix_framework ${JANSSON_LIBRARIES} ${CURL_LIBRARIES})
Modified: incubator/celix/trunk/remote_services/example_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_service/CMakeLists.txt?rev=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_service/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -23,6 +23,9 @@ include_directories("${PROJECT_SOURCE_DI
bundle(example SOURCES
private/src/example_impl
- private/src/example_activator
+ private/src/example_activator
+
+ private/include/example_impl.h
)
+
target_link_libraries(example celix_framework)
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=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -33,6 +33,12 @@ bundle(remote_service_admin SOURCES
private/src/export_registration_impl
private/src/import_registration_impl
private/src/remote_service_admin_activator
- private/src/mongoose.c
+ private/src/mongoose.c
+
+ private/include/export_registration_impl.h
+ private/include/import_registration_impl.h
+ private/include/mongoose.h
+ private/include/remote_service_admin_impl.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=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/topology_manager/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -24,5 +24,11 @@ include_directories("${PROJECT_SOURCE_DI
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)
+bundle(topology_manager SOURCES
+ private/src/topology_manager
+ private/src/activator
+
+ private/include/topology_manager.h
+)
+
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=1496019&r1=1496018&r2=1496019&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Mon Jun 24 13:11:55 2013
@@ -31,7 +31,19 @@ if (SHELL)
private/src/update_command
private/src/uninstall_command
private/src/log_command
- private/src/inspect_command)
+ private/src/inspect_command
+
+ private/include/inspect_command.h
+ private/include/install_command.h
+ private/include/log_command.h
+ private/include/ps_command.h
+ private/include/shell_private.h
+ private/include/start_command.h
+ private/include/stop_command.h
+ private/include/uninstall_command.h
+ private/include/update_command.h
+ )
+
include_directories("public/include")
include_directories("private/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")