celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1646168 - in /celix/trunk/dependency_manager_2: ./ CMakeLists.txt private/ private/include/ private/include/dm_component.h private/include/dm_component_state_listener.h private/include/dm_dependency.h private/include/dm_dependency_manager.h
Date Wed, 17 Dec 2014 08:21:47 GMT
Author: abroekhuis
Date: Wed Dec 17 08:21:46 2014
New Revision: 1646168

URL: http://svn.apache.org/r1646168
Log:
Start work for new DM

Added:
    celix/trunk/dependency_manager_2/
    celix/trunk/dependency_manager_2/CMakeLists.txt
    celix/trunk/dependency_manager_2/private/
    celix/trunk/dependency_manager_2/private/include/
    celix/trunk/dependency_manager_2/private/include/dm_component.h
    celix/trunk/dependency_manager_2/private/include/dm_component_state_listener.h
    celix/trunk/dependency_manager_2/private/include/dm_dependency.h
    celix/trunk/dependency_manager_2/private/include/dm_dependency_manager.h

Added: celix/trunk/dependency_manager_2/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/CMakeLists.txt?rev=1646168&view=auto
==============================================================================
--- celix/trunk/dependency_manager_2/CMakeLists.txt (added)
+++ celix/trunk/dependency_manager_2/CMakeLists.txt Wed Dec 17 08:21:46 2014
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+celix_subproject(DEPENDENCY_MANAGER "Option to build the dependency manager static library"
"OFF" DEPS framework)
+if (DEPENDENCY_MANAGER) 
+    # Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
+    if(UNIX AND NOT WIN32)
+      find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+      if(CMAKE_UNAME)
+        exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+        set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type
(i386 and x86_64)")
+         if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+          add_definitions(-fPIC)
+        endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+      endif(CMAKE_UNAME)
+    endif(UNIX AND NOT WIN32)
+    
+    CELIX_ADD_COMPONENT(dependency_manager
+    	DISPLAY_NAME Dependency Manager
+        DESCRIPTION "The Apache Celix dependency manager (static) library"
+        GROUP all
+    )
+    
+    add_library(dependency_manager STATIC 
+    	private/src/dependency_manager 
+    	private/src/dependency_activator_base 
+    	private/src/service_component
+    	private/src/service_dependency)
+   	include_directories("public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+    target_link_libraries(dependency_manager celix_framework)
+    
+    install(
+    	FILES
+    		public/include/dependency_activator_base.h 
+    		public/include/service.h public/include/dependency_manager.h 
+    		public/include/service_component_private.h 
+    		public/include/service_component.h 
+    		public/include/service_dependency.h 
+		DESTINATION 
+			include/celix/dependency_manager 
+		COMPONENT 
+			dependency_manager
+	)
+    install(TARGETS dependency_manager DESTINATION lib COMPONENT dependency_manager)
+endif (DEPENDENCY_MANAGER)

Added: celix/trunk/dependency_manager_2/private/include/dm_component.h
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/include/dm_component.h?rev=1646168&view=auto
==============================================================================
--- celix/trunk/dependency_manager_2/private/include/dm_component.h (added)
+++ celix/trunk/dependency_manager_2/private/include/dm_component.h Wed Dec 17 08:21:46 2014
@@ -0,0 +1,34 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements.  See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership.  The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * component.h
+ *
+ *  \date       22 Feb 2014
+ *  \author     <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
+ *  \copyright  Apache License, Version 2.0
+ */
+
+#ifndef COMPONENT_H_
+#define COMPONENT_H_
+
+typedef struct dm_component *dm_component_pt;
+
+
+
+#endif /* COMPONENT_H_ */

Added: celix/trunk/dependency_manager_2/private/include/dm_component_state_listener.h
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/include/dm_component_state_listener.h?rev=1646168&view=auto
==============================================================================
--- celix/trunk/dependency_manager_2/private/include/dm_component_state_listener.h (added)
+++ celix/trunk/dependency_manager_2/private/include/dm_component_state_listener.h Wed Dec
17 08:21:46 2014
@@ -0,0 +1,39 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements.  See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership.  The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * dm_component_state_listener.h
+ *
+ *  \date       22 Feb 2014
+ *  \author     <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
+ *  \copyright  Apache License, Version 2.0
+ */
+
+#ifndef DM_COMPONENT_STATE_LISTENER_H_
+#define DM_COMPONENT_STATE_LISTENER_H_
+
+enum dm_component_state {
+    DM_INACTIVE,
+    DM_WAITING_FOR_REQUIRED,
+    DM_INSTANTIATED_AND_WAITING_FOR_REQUIRED,
+    DM_TRACKING_OPTIONAL,
+};
+
+
+
+#endif /* DM_COMPONENT_STATE_LISTENER_H_ */

Added: celix/trunk/dependency_manager_2/private/include/dm_dependency.h
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/include/dm_dependency.h?rev=1646168&view=auto
==============================================================================
--- celix/trunk/dependency_manager_2/private/include/dm_dependency.h (added)
+++ celix/trunk/dependency_manager_2/private/include/dm_dependency.h Wed Dec 17 08:21:46 2014
@@ -0,0 +1,34 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements.  See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership.  The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * dm_dependency.h
+ *
+ *  \date       22 Feb 2014
+ *  \author     <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
+ *  \copyright  Apache License, Version 2.0
+ */
+
+#ifndef DM_DEPENDENCY_H_
+#define DM_DEPENDENCY_H_
+
+
+
+
+
+#endif /* DM_DEPENDENCY_H_ */

Added: celix/trunk/dependency_manager_2/private/include/dm_dependency_manager.h
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/private/include/dm_dependency_manager.h?rev=1646168&view=auto
==============================================================================
--- celix/trunk/dependency_manager_2/private/include/dm_dependency_manager.h (added)
+++ celix/trunk/dependency_manager_2/private/include/dm_dependency_manager.h Wed Dec 17 08:21:46
2014
@@ -0,0 +1,34 @@
+/**
+ *Licensed to the Apache Software Foundation (ASF) under one
+ *or more contributor license agreements.  See the NOTICE file
+ *distributed with this work for additional information
+ *regarding copyright ownership.  The ASF licenses this file
+ *to you under the Apache License, Version 2.0 (the
+ *"License"); you may not use this file except in compliance
+ *with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *Unless required by applicable law or agreed to in writing,
+ *software distributed under the License is distributed on an
+ *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ *specific language governing permissions and limitations
+ *under the License.
+ */
+/*
+ * dm_dependency_manager.h
+ *
+ *  \date       22 Feb 2014
+ *  \author     <a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
+ *  \copyright  Apache License, Version 2.0
+ */
+
+#ifndef DM_DEPENDENCY_MANAGER_H_
+#define DM_DEPENDENCY_MANAGER_H_
+
+
+
+
+
+#endif /* DM_DEPENDENCY_MANAGER_H_ */



Mime
View raw message