Author: abroekhuis
Date: Tue Jul 19 12:07:16 2011
New Revision: 1148287
URL: http://svn.apache.org/viewvc?rev=1148287&view=rev
Log:
Updated several files to use correct error handling style. Fixed the
launcher/framework to not crash when quitting using sigint.
Added:
incubator/celix/trunk/documents/
incubator/celix/trunk/documents/Celix.graffle
incubator/celix/trunk/documents/memory_pools.png
Modified:
incubator/celix/trunk/.cproject
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/dependency_manager/dependency_activator_base.h
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/framework/private/include/attribute.h
incubator/celix/trunk/framework/private/include/bundle.h
incubator/celix/trunk/framework/private/include/bundle_archive.h
incubator/celix/trunk/framework/private/include/bundle_revision.h
incubator/celix/trunk/framework/private/include/component.h
incubator/celix/trunk/framework/private/include/framework.h
incubator/celix/trunk/framework/private/include/headers.h
incubator/celix/trunk/framework/private/include/utils.h
incubator/celix/trunk/framework/private/include/version.h
incubator/celix/trunk/framework/private/include/version_range.h
incubator/celix/trunk/framework/private/src/attribute.c
incubator/celix/trunk/framework/private/src/bundle.c
incubator/celix/trunk/framework/private/src/bundle_archive.c
incubator/celix/trunk/framework/private/src/bundle_revision.c
incubator/celix/trunk/framework/private/src/capability.c
incubator/celix/trunk/framework/private/src/framework.c
incubator/celix/trunk/framework/private/src/requirement.c
incubator/celix/trunk/framework/private/src/utils.c
incubator/celix/trunk/launcher/launcher.c
incubator/celix/trunk/shell/install_command.c
incubator/celix/trunk/shell/ps_command.c
Modified: incubator/celix/trunk/.cproject
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/.cproject?rev=1148287&r1=1148286&r2=1148287&view=diff
==============================================================================
--- incubator/celix/trunk/.cproject (original)
+++ incubator/celix/trunk/.cproject Tue Jul 19 12:07:16 2011
@@ -100,7 +100,7 @@
<buildTargets>
<target name="all" path=""
targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
- <buildArguments>-j4 -C
/Users/alexander/Documents/Projects/Celix/celix/build</buildArguments>
+ <buildArguments>-j4 -C
${workspace_loc:/celix}/build</buildArguments>
<buildTarget>all</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>false</useDefaultCommand>
@@ -116,6 +116,7 @@
</target>
<target name="run cmake" path=""
targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>cmake</buildCommand>
+ <buildArguments/>
<buildTarget>-E chdir
${workspace_loc:/celix}/build cmake -G "Unix Makefiles" ../</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>false</useDefaultCommand>
Modified: incubator/celix/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1148287&r1=1148286&r2=1148287&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Tue Jul 19 12:07:16 2011
@@ -44,12 +44,15 @@ include_directories(${APR_INCLUDE_DIR})
include_directories("framework/private/include")
include_directories("framework/public/include")
+add_subdirectory(libtst)
+add_subdirectory(libtst-2.0)
+
add_subdirectory(utils)
add_subdirectory(framework)
+add_subdirectory(launcher)
include(Packaging.cmake)
add_subdirectory(dependency_manager)
-add_subdirectory(launcher)
add_subdirectory(test)
add_subdirectory(shell)
Modified: incubator/celix/trunk/dependency_manager/dependency_activator_base.h
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/dependency_manager/dependency_activator_base.h?rev=1148287&r1=1148286&r2=1148287&view=diff
==============================================================================
--- incubator/celix/trunk/dependency_manager/dependency_activator_base.h
(original)
+++ incubator/celix/trunk/dependency_manager/dependency_activator_base.h Tue
Jul 19 12:07:16 2011
@@ -34,7 +34,7 @@ void * dm_create(BUNDLE_CONTEXT context)
void dm_init(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER
manager);
void dm_destroy(void * userData, BUNDLE_CONTEXT context, DEPENDENCY_MANAGER
manager);
-SERVICE dependencyActivatorBase_createService();
+SERVICE dependencyActivatorBase_createService(void);
SERVICE_DEPENDENCY
dependencyActivatorBase_createServiceDependency(DEPENDENCY_MANAGER manager);
#endif /* DEPENDENCY_ACTIVATOR_BASE_H_ */
