incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1372340 - in /incubator/celix/trunk: ./ build/ cmake/ deployment_admin/private/src/ framework/ log_service/ log_writer/ shell/ shell_tui/
Date Mon, 13 Aug 2012 09:22:04 GMT
Author: abroekhuis
Date: Mon Aug 13 09:22:03 2012
New Revision: 1372340

URL: http://svn.apache.org/viewvc?rev=1372340&view=rev
Log:
Updated several files while preparing for a release

Added:
    incubator/celix/trunk/DISCLAIMER
    incubator/celix/trunk/LICENSE
      - copied, changed from r1371483, incubator/celix/trunk/LICENSE.txt
    incubator/celix/trunk/NOTICE
    incubator/celix/trunk/cmake/installation.cmake
      - copied, changed from r1371483, incubator/celix/trunk/installation.cmake
Removed:
    incubator/celix/trunk/LICENSE.txt
    incubator/celix/trunk/build/.gitignore
    incubator/celix/trunk/framework/Doxyfile.in
    incubator/celix/trunk/installation.cmake
Modified:
    incubator/celix/trunk/BUILDING
    incubator/celix/trunk/CMakeLists.txt
    incubator/celix/trunk/cmake/Packaging.cmake
    incubator/celix/trunk/deployment_admin/private/src/log_store.c
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/log_service/CMakeLists.txt
    incubator/celix/trunk/log_writer/CMakeLists.txt
    incubator/celix/trunk/shell/CMakeLists.txt
    incubator/celix/trunk/shell_tui/CMakeLists.txt

Modified: incubator/celix/trunk/BUILDING
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/BUILDING?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/BUILDING (original)
+++ incubator/celix/trunk/BUILDING Mon Aug 13 09:22:03 2012
@@ -1,17 +1,68 @@
-To build:
+APACHE CELIX INCUBATION - BUILDING AND INSTALLATION OVERVIEW
 
-cd build
-## Run cmake and select the subprojects to be build
-## For commandline use "ccmake ..", for a GUI use "cmake-gui"
-## After running a first configure the subproject can be found by looking for "BUILD_{NAME}"
options.
-## After selection a new configure and generation is needed
-##
-## Note: Running a simple "cmake .." will only generate build files for the framework and
utils. 
-ccmake .. 
+Notes
+-----
 
-## Make builds all bundles, but deploys nothing
-make
+* Currently Apache Celix only builds and works on Unix/Linux like systems
+  (including MacOSX).
+* Apache Celix requires CMake for building, other requirements/dependencies are 
+  listed per subproject on http://incubator.apache.org/celix/subprojects.html
+* More information about the build system, and how to extend it, can be found at
+  the website: http://incubator.apache.org/celix/documentation.html
+	
+	
+Quick Start
+-----------
 
-## Deploying takes care of copying bundles to a target for testing
-make deploy
+  # Create a build directory next to the celix source directory
+  $ mkdir celix-build; cd celix-build
+  $ ccmake ../celix
+  
+  # Enable/Disable the required sub projects (BUILD_{NAME} entries)
+  # Optionally, enable advanced mode (t) and change CMAKE_INSTALL_PREFIX
+  # Run Configure (might be needed multiple times)
+  # Run Generate (this also returns to the shell)
+  $ make
+  
+  # To deploy the included examples
+  $ make deploy
+  # Navigate to <subproject>/deploy/<deployname>
+  $ sh run.sh
+  
+  # To install the release (framework, headers and bundles)
+  $ make install-release
+  
+  # To see a list of all available targets
+  $ make help
+  
+  
+Background information
+----------------------
 
+Apache Celix uses CMake to generate the build files needed for compilation.
+deployment and installation.
+
+* CMake (http://www.cmake.org)
+  CMake generated build files based on specific CMake files. To setup a build
+  a console (ccmake) and GUI (cmake-gui) method is provided. With these editors
+  include paths, installation prefix etc can be changed.
+  CMake stores the configuration in a cache, which is used during the build.
+  To keep the cache/build files separate from the source, a out-of-source build
+  is preferred. To start from scratch, the build directory can be deleted and
+  new build files can be generated.
+* Apache Celix Subprojects
+  Since Apache Celix provides a modular framework, it makes sense to provide the
+  available components as modules as well. To enable/disable these modules cmake
+  is used. In the GUI or console there are settings named BUILD_{NAME} which can
+  be switched on or off. On http://incubator.apache.org/celix/subprojects.html a
+  list of all subprojects is given.
+* Apache Celix deployment/installation
+  With a modular system it doesn't make sense to simply install everything to
+  the file system. Depending on the needs different version/modules can be 
+  needed.
+  To cater for this, Celix provides deployment support which takes care of 
+  copying the required bundles to a named target. A basic run script is 
+  created as well.
+  Installing the framework (and its dependencies) might make sense, every target
+  needs the framework. To install only the framework a dedicated target is 
+  available: make install-release.
\ No newline at end of file

Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -29,7 +29,9 @@ SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gn
 
 include(cmake/Includes.cmake)
 
-include(installation.cmake)  
+include(cmake/installation.cmake)
+
+include(UseDoxygen)  
 
 ## New sub project must use a buildoption to be able to enable/disable the project using
the CMake Editor
 ## Sub projects depending on another sub project automatically enable these dependencies

Added: incubator/celix/trunk/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/DISCLAIMER?rev=1372340&view=auto
==============================================================================
--- incubator/celix/trunk/DISCLAIMER (added)
+++ incubator/celix/trunk/DISCLAIMER Mon Aug 13 09:22:03 2012
@@ -0,0 +1,16 @@
+Apache Celix is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC. 
+
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision making process 
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness 
+or stability of the code, it does indicate that the project has yet to be 
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Celix project you
+can go to the following pages:
+
+http://incubator.apache.org/celix/
+http://incubator.apache.org/projects/celix.html
\ No newline at end of file

Copied: incubator/celix/trunk/LICENSE (from r1371483, incubator/celix/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/LICENSE?p2=incubator/celix/trunk/LICENSE&p1=incubator/celix/trunk/LICENSE.txt&r1=1371483&r2=1372340&rev=1372340&view=diff
==============================================================================
    (empty)

Added: incubator/celix/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/NOTICE?rev=1372340&view=auto
==============================================================================
--- incubator/celix/trunk/NOTICE (added)
+++ incubator/celix/trunk/NOTICE Mon Aug 13 09:22:03 2012
@@ -0,0 +1,6 @@
+Apache Celix
+Copyright [2012] The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Mon Aug 13 09:22:03 2012
@@ -132,16 +132,11 @@ MACRO(deploy)
 	GET_DIRECTORY_PROPERTY(PROPS ADDITIONAL_MAKE_CLEAN_FILES)
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles")
 	
-	message(${PROJECT_BINARY_DIR})
-	message(${DEPLOY_NAME})
-	message(${CMAKE_PROJECT_NAME})
-
 	# Generate an Eclipse launch file to be able to run the deployment from Eclipse	
 	string(REPLACE "/" ";" LIST ${PROJECT_BINARY_DIR})
 	list(LENGTH LIST len)
 	MATH(EXPR test "${len} - 1")
 	LIST(GET LIST ${test} last)
-	MESSAGE("${last}")
 
 	SET(CONTAINER_NAME ${DEPLOY_NAME})
 	SET(PROGRAM_NAME ${LAUNCHER})

Copied: incubator/celix/trunk/cmake/installation.cmake (from r1371483, incubator/celix/trunk/installation.cmake)
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/installation.cmake?p2=incubator/celix/trunk/cmake/installation.cmake&p1=incubator/celix/trunk/installation.cmake&r1=1371483&r2=1372340&rev=1372340&view=diff
==============================================================================
    (empty)

Modified: incubator/celix/trunk/deployment_admin/private/src/log_store.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/private/src/log_store.c?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/private/src/log_store.c (original)
+++ incubator/celix/trunk/deployment_admin/private/src/log_store.c Mon Aug 13 09:22:03 2012
@@ -23,7 +23,7 @@
  *  \author    	<a href="mailto:celix-dev@incubator.apache.org">Apache Celix Project
Team</a>
  *  \copyright	Apache License, Version 2.0
  */
-#include <stddef.h>
+#include <stdlib.h>
 #include <apr_general.h>
 
 #include <time.h>

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -23,7 +23,6 @@ if (FRAMEWORK) 
     find_package(ZLIB REQUIRED)
     
     include(CPackComponent)
-    include(UseDoxygen)
     
     cpack_add_component(framework
     	DISPLAY_NAME Framework

Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -34,5 +34,5 @@ if (LOG_SERVICE)
     
     FILE(GLOB files public/include/log_service.h)
     INSTALL(FILES ${files} DESTINATION include/celix/log_service COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_service.zip DESTINATION bundles COMPONENT
framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_service.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (LOG_SERVICE)

Modified: incubator/celix/trunk/log_writer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_writer/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/log_writer/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_writer/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -26,5 +26,5 @@ if (LOG_WRITER)
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     target_link_libraries(log_writer celix_framework dependency_manager)
     
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_writer.zip DESTINATION bundles COMPONENT
framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/log_writer.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (LOG_WRITER)
\ No newline at end of file

Modified: incubator/celix/trunk/shell/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/shell/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -39,5 +39,5 @@ if (SHELL)
     
     FILE(GLOB files public/include/shell.h public/include/command.h public/include/command_private.h)
     INSTALL(FILES ${files} DESTINATION include/celix/shell COMPONENT framework)
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell.zip DESTINATION bundles COMPONENT framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (SHELL)
\ No newline at end of file

Modified: incubator/celix/trunk/shell_tui/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/shell_tui/CMakeLists.txt?rev=1372340&r1=1372339&r2=1372340&view=diff
==============================================================================
--- incubator/celix/trunk/shell_tui/CMakeLists.txt (original)
+++ incubator/celix/trunk/shell_tui/CMakeLists.txt Mon Aug 13 09:22:03 2012
@@ -23,5 +23,5 @@ if (SHELL_TUI)
     
     package(shell_tui)
     
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell_tui.zip DESTINATION bundles COMPONENT
framework)
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/bundles/shell_tui.zip DESTINATION share/celix/bundles
COMPONENT framework)
 endif (SHELL_TUI)
\ No newline at end of file



Mime
View raw message