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 2011/01/16 20:25:43 UTC
svn commit: r1059642 - in /incubator/celix/trunk: ./ celix/
dependency_manager/ framework/ framework/private/include/
framework/private/src/ hello_world/
Author: abroekhuis
Date: Sun Jan 16 19:25:41 2011
New Revision: 1059642
URL: http://svn.apache.org/viewvc?rev=1059642&view=rev
Log:
Updated directory structure
Added:
incubator/celix/trunk/framework/private/include/archive.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/archive.h
incubator/celix/trunk/framework/private/include/array_list.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/array_list.h
incubator/celix/trunk/framework/private/include/array_list_private.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/array_list_private.h
incubator/celix/trunk/framework/private/include/attribute.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/attribute.h
incubator/celix/trunk/framework/private/include/bundle.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle.h
incubator/celix/trunk/framework/private/include/bundle_activator.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_activator.h
incubator/celix/trunk/framework/private/include/bundle_archive.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_archive.h
incubator/celix/trunk/framework/private/include/bundle_cache.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_cache.h
incubator/celix/trunk/framework/private/include/bundle_context.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_context.h
incubator/celix/trunk/framework/private/include/bundle_state.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_state.h
incubator/celix/trunk/framework/private/include/capability.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/capability.h
incubator/celix/trunk/framework/private/include/cexcept.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/cexcept.h
incubator/celix/trunk/framework/private/include/component.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/component.h
incubator/celix/trunk/framework/private/include/constants.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/constants.h
incubator/celix/trunk/framework/private/include/filter.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/filter.h
incubator/celix/trunk/framework/private/include/framework.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/framework.h
incubator/celix/trunk/framework/private/include/hash_map.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/hash_map.h
incubator/celix/trunk/framework/private/include/hash_map_private.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/hash_map_private.h
incubator/celix/trunk/framework/private/include/hashtable.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable.h
incubator/celix/trunk/framework/private/include/hashtable_itr.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable_itr.h
incubator/celix/trunk/framework/private/include/hashtable_private.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable_private.h
incubator/celix/trunk/framework/private/include/hashtable_utility.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable_utility.h
incubator/celix/trunk/framework/private/include/headers.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/headers.h
incubator/celix/trunk/framework/private/include/ioapi.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/ioapi.h
incubator/celix/trunk/framework/private/include/linked_list_iterator.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/linked_list_iterator.h
incubator/celix/trunk/framework/private/include/linked_list_private.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/linked_list_private.h
incubator/celix/trunk/framework/private/include/linkedlist.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/linkedlist.h
incubator/celix/trunk/framework/private/include/manifest.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/manifest.h
incubator/celix/trunk/framework/private/include/manifest_parser.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/manifest_parser.h
incubator/celix/trunk/framework/private/include/module.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/module.h
incubator/celix/trunk/framework/private/include/properties.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/properties.h
incubator/celix/trunk/framework/private/include/requirement.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/requirement.h
incubator/celix/trunk/framework/private/include/resolver.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/resolver.h
incubator/celix/trunk/framework/private/include/service_reference.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_reference.h
incubator/celix/trunk/framework/private/include/service_registration.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_registration.h
incubator/celix/trunk/framework/private/include/service_registry.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_registry.h
incubator/celix/trunk/framework/private/include/service_tracker.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_tracker.h
incubator/celix/trunk/framework/private/include/unzip.h
- copied unchanged from r1049446, incubator/celix/trunk/celix/unzip.h
incubator/celix/trunk/framework/private/include/utils.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/utils.h
incubator/celix/trunk/framework/private/include/version.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/version.h
incubator/celix/trunk/framework/private/include/version_range.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/version_range.h
incubator/celix/trunk/framework/private/include/wire.h
- copied unchanged from r1055410, incubator/celix/trunk/celix/wire.h
incubator/celix/trunk/framework/private/src/array_list.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/array_list.c
incubator/celix/trunk/framework/private/src/attribute.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/attribute.c
incubator/celix/trunk/framework/private/src/bundle.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle.c
incubator/celix/trunk/framework/private/src/bundle_archive.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_archive.c
incubator/celix/trunk/framework/private/src/bundle_cache.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_cache.c
incubator/celix/trunk/framework/private/src/bundle_context.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/bundle_context.c
incubator/celix/trunk/framework/private/src/capability.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/capability.c
incubator/celix/trunk/framework/private/src/filter.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/filter.c
incubator/celix/trunk/framework/private/src/framework.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/framework.c
incubator/celix/trunk/framework/private/src/hash_map.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/hash_map.c
incubator/celix/trunk/framework/private/src/hashtable.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable.c
incubator/celix/trunk/framework/private/src/hashtable_itr.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable_itr.c
incubator/celix/trunk/framework/private/src/hashtable_utility.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/hashtable_utility.c
incubator/celix/trunk/framework/private/src/ioapi.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/ioapi.c
incubator/celix/trunk/framework/private/src/linked_list_iterator.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/linked_list_iterator.c
incubator/celix/trunk/framework/private/src/linkedlist.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/linkedlist.c
incubator/celix/trunk/framework/private/src/manifest.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/manifest.c
incubator/celix/trunk/framework/private/src/manifest_parser.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/manifest_parser.c
incubator/celix/trunk/framework/private/src/miniunz.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/miniunz.c
incubator/celix/trunk/framework/private/src/module.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/module.c
incubator/celix/trunk/framework/private/src/properties.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/properties.c
incubator/celix/trunk/framework/private/src/requirement.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/requirement.c
incubator/celix/trunk/framework/private/src/resolver.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/resolver.c
incubator/celix/trunk/framework/private/src/service_reference.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_reference.c
incubator/celix/trunk/framework/private/src/service_registration.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_registration.c
incubator/celix/trunk/framework/private/src/service_registry.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_registry.c
incubator/celix/trunk/framework/private/src/service_tracker.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/service_tracker.c
incubator/celix/trunk/framework/private/src/unzip.c
- copied unchanged from r1049446, incubator/celix/trunk/celix/unzip.c
incubator/celix/trunk/framework/private/src/utils.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/utils.c
incubator/celix/trunk/framework/private/src/version.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/version.c
incubator/celix/trunk/framework/private/src/version_range.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/version_range.c
incubator/celix/trunk/framework/private/src/wire.c
- copied unchanged from r1055410, incubator/celix/trunk/celix/wire.c
Removed:
incubator/celix/trunk/celix/
Modified:
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/Hello World.launch
incubator/celix/trunk/dependency_manager/CMakeLists.txt
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/hello_world/CMakeLists.txt
Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1059642&r1=1059641&r2=1059642&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Sun Jan 16 19:25:41 2011
@@ -23,19 +23,24 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
SET(CMAKE_BUILD_TYPE "Debug")
SET(CMAKE_C_FLAGS "-std=c99")
SET(CMAKE_C_FLAGS "-D_GNU_SOURCE")
+SET(CMAKE_INSTALL_COMPONENT "framework")
ADD_CUSTOM_TARGET(install-fw
${CMAKE_COMMAND}
-D "CMAKE_INSTALL_COMPONENT=framework"
- -D "CMAKE_INSTALL_PREFIX=framework"
- -P "celix/cmake_install.cmake"
- -P "launcher/cmake_install.cmake"
+ -D "CMAKE_INSTALL_PREFIX=test"
+ -P "cmake_install.cmake"
)
+include_directories("framework/private/include")
+include_directories("framework/public/include")
+include_directories("/opt/local/include")
+link_directories("/opt/local/lib")
+
+add_subdirectory(framework)
#include(CPackConfig.in)
include(Packaging.cmake)
-add_subdirectory(celix)
add_subdirectory(dependency_manager)
add_subdirectory(launcher)
add_subdirectory(test)
Modified: incubator/celix/trunk/Hello World.launch
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/Hello%20World.launch?rev=1059642&r1=1059641&r2=1059642&view=diff
==============================================================================
--- incubator/celix/trunk/Hello World.launch (original)
+++ incubator/celix/trunk/Hello World.launch Sun Jan 16 19:25:41 2011
@@ -1,7 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
+<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/launcher/launcher"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="celix"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
@@ -14,6 +27,6 @@
<listEntry value="4"/>
</listAttribute>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DYLD_LIBRARY_PATH" value="${workspace_loc:celix/build/celix}"/>
+<mapEntry key="DYLD_LIBRARY_PATH" value="${workspace_loc:celix/build/framework}"/>
</mapAttribute>
</launchConfiguration>
Modified: incubator/celix/trunk/dependency_manager/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/CMakeLists.txt?rev=1059642&r1=1059641&r2=1059642&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/CMakeLists.txt (original)
+++ incubator/celix/trunk/dependency_manager/CMakeLists.txt Sun Jan 16 19:25:41 2011
@@ -16,6 +16,4 @@
# under the License.
add_library(dependency_manager STATIC dependency_manager.c dependency_activator_base.c service_component.c service_dependency.c)
-
-include_directories("${PROJECT_SOURCE_DIR}/celix")
target_link_libraries(dependency_manager framework)
\ 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=1059642&r1=1059641&r2=1059642&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Sun Jan 16 19:25:41 2011
@@ -18,10 +18,8 @@ cmake_minimum_required(VERSION 2.8)
add_definitions(-DUSE_FILE32API)
aux_source_directory("private/src" SRC)
-
include_directories("private/include")
-include_directories("public/include")
add_library(framework SHARED ${SRC})
-target_link_libraries(framework z)
+target_link_libraries(framework z apr-1)
install(TARGETS framework LIBRARY DESTINATION lib COMPONENT framework)
Modified: incubator/celix/trunk/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hello_world/CMakeLists.txt?rev=1059642&r1=1059641&r2=1059642&view=diff
==============================================================================
--- incubator/celix/trunk/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/hello_world/CMakeLists.txt Sun Jan 16 19:25:41 2011
@@ -16,7 +16,6 @@
# under the License.
add_library(hello_world SHARED activator)
-include_directories("${PROJECT_SOURCE_DIR}/celix")
target_link_libraries(hello_world framework)
bundle(hello_world)