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 2012/08/08 15:41:15 UTC
svn commit: r1370761 - in /incubator/celix/trunk: CMakeLists.txt KEYS
LICENSE.txt cmake/CPackConfig-Installation.in cmake/Packaging.cmake
framework/CMakeLists.txt installation.cmake
Author: abroekhuis
Date: Wed Aug 8 13:41:10 2012
New Revision: 1370761
URL: http://svn.apache.org/viewvc?rev=1370761&view=rev
Log:
Moved installation instructions to separate files
Added:
incubator/celix/trunk/KEYS
incubator/celix/trunk/LICENSE.txt
incubator/celix/trunk/installation.cmake
Modified:
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/cmake/CPackConfig-Installation.in
incubator/celix/trunk/cmake/Packaging.cmake
incubator/celix/trunk/framework/CMakeLists.txt
Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1370761&r1=1370760&r2=1370761&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Wed Aug 8 13:41:10 2012
@@ -25,25 +25,11 @@ cmake_policy(SET CMP0012 NEW)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
SET(CMAKE_BUILD_TYPE "Debug")
-#SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs")
SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS}")
-#SET(LDFLAGS "-fprofile-arcs -ftest-coverage")
-SET(CMAKE_INSTALL_COMPONENT "framework")
-GET_FILENAME_COMPONENT(__cmake_path ${CMAKE_COMMAND} PATH)
-FIND_PROGRAM(CPACK_COMMAND cpack ${__cmake_path})
-MESSAGE(STATUS "Found CPack at: ${CPACK_COMMAND}")
-IF(NOT CPACK_COMMAND)
- MESSAGE(FATAL_ERROR "Need CPack!")
-ENDIF(NOT CPACK_COMMAND)
-
-SET(INSTALL_FW "${PROJECT_BINARY_DIR};Celix Framework;framework;/")
-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigFW.in CPackConfigFW.cmake @ONLY)
-ADD_CUSTOM_TARGET(install-fw
- ${CPACK_COMMAND} --config "CPackConfigFW.cmake"
- )
+include(cmake/Includes.cmake)
-include(cmake/Includes.cmake)
+include(installation.cmake)
## 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
@@ -62,6 +48,3 @@ add_subdirectory(dependency_manager)
add_subdirectory(launcher)
add_subdirectory(framework)
add_subdirectory(utils)
-
-
-#enable_testing()
Added: incubator/celix/trunk/KEYS
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/KEYS?rev=1370761&view=auto
==============================================================================
--- incubator/celix/trunk/KEYS (added)
+++ incubator/celix/trunk/KEYS Wed Aug 8 13:41:10 2012
@@ -0,0 +1,70 @@
+pub 4096R/D6D06E09 2012-08-08
+uid Alexander Broekhuis (CODE SIGNING KEY) <ab...@apache.org>
+sig 3 D6D06E09 2012-08-08 Alexander Broekhuis (CODE SIGNING KEY) <ab...@apache.org>
+sub 4096R/EB686AF9 2012-08-08
+sig D6D06E09 2012-08-08 Alexander Broekhuis (CODE SIGNING KEY) <ab...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+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
+=Zm9I
+-----END PGP PUBLIC KEY BLOCK-----
Added: incubator/celix/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/LICENSE.txt?rev=1370761&view=auto
==============================================================================
--- incubator/celix/trunk/LICENSE.txt (added)
+++ incubator/celix/trunk/LICENSE.txt Wed Aug 8 13:41:10 2012
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+#TODO Additional licenses
Modified: incubator/celix/trunk/cmake/CPackConfig-Installation.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfig-Installation.in?rev=1370761&r1=1370760&r2=1370761&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfig-Installation.in (original)
+++ incubator/celix/trunk/cmake/CPackConfig-Installation.in Wed Aug 8 13:41:10 2012
@@ -1,12 +1,29 @@
+# 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.
+
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-SET(CPACK_GENERATOR "ZIP")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "@INSTALL_FW@")
-set(CPACK_PACKAGE_NAME "Framework")
-SET(CPACK_PACKAGE_DESCRIPTION "Package description")
-SET(CPACK_PACKAGE_FILE_NAME "framework")
+SET(CPACK_GENERATOR "ZIP;STGZ")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@PROJECT_BINARY_DIR@;Apache Celix;framework;/")
+set(CPACK_PACKAGE_NAME "Apache Celix")
+SET(CPACK_PACKAGE_DESCRIPTION "Package containing a release for Apache Celix")
+SET(CPACK_PACKAGE_FILE_NAME "apache.celix-@FRAMEWORK_MAJOR@.@FRAMEWORK_MINOR@.@FRAMEWORK_PATCH@")
set(CPACK_PACKAGE_VENDOR "incubator.apache.org/celix")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Framework")
-set(CPACK_PACKAGE_VERSION "0.0.1")
-set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
\ No newline at end of file
+set(CPACK_PACKAGE_VERSION_MAJOR "@FRAMEWORK_MAJOR@")
+set(CPACK_PACKAGE_VERSION_MINOR "@FRAMEWORK_MINOR@")
+set(CPACK_PACKAGE_VERSION_PATCH "@FRAMEWORK_PATCH@")
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/LICENSE.txt")
Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1370761&r1=1370760&r2=1370761&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Wed Aug 8 13:41:10 2012
@@ -94,12 +94,7 @@ MACRO(deploy)
SET(DEPLOY_COMPONENT deploy_${DEPLOY_NAME})
SET(__deployTarget deploy_${DEPLOY_NAME})
- #SET(__deployConfig ${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${DEPLOY_NAME}-deploy.cmake)
- #SET(DEPLOY_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME})
- #CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigDeploy.in ${__deployConfig} @ONLY)
- #install(FILES ${EXT_DIR}/celix/* DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
-
SET(BUNDLES "")
SET(DEPS)
FOREACH(BUNDLE ${DEPLOY_BUNDLES})
@@ -114,10 +109,7 @@ MACRO(deploy)
SET(DEPS ${DEPS};${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE}.zip)
ENDFOREACH(BUNDLE)
ADD_CUSTOM_TARGET(${__deployTarget}
- #mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
- # cd ${CMAKE_CURRENT_BINARY_DIR}/deploy \;
- # ${CPACK_COMMAND} --config "${__deployConfig}"
- DEPENDS ${DEPS} launcher
+ DEPENDS ${DEPS} celix
COMMENT "Deploy target ${DEPLOY_NAME}")
ADD_DEPENDENCIES(deploy ${__deployTarget})
@@ -139,11 +131,6 @@ 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")
-
- #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME} DESTINATION . COMPONENT ${DEPLOY_COMPONENT})
- #ADD_CUSTOM_TARGET(clean_${__packageTarget}
- # rm ${PROJECT_BINARY_DIR}/packages/IBS-${PACKAGE_NAME}
- #)
ENDMACRO(deploy)
MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1370761&r1=1370760&r2=1370761&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Wed Aug 8 13:41:10 2012
@@ -25,7 +25,7 @@ if (FRAMEWORK)
include(UseDoxygen)
cpack_add_component(framework
- DISPLAY_NAME framework
+ DISPLAY_NAME Framework
DESCRIPTION "The Apache Celix framework library"
REQUIRED
)
Added: incubator/celix/trunk/installation.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/installation.cmake?rev=1370761&view=auto
==============================================================================
--- incubator/celix/trunk/installation.cmake (added)
+++ incubator/celix/trunk/installation.cmake Wed Aug 8 13:41:10 2012
@@ -0,0 +1,36 @@
+# 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.
+
+# Set version
+SET(FRAMEWORK_MAJOR "0")
+SET(FRAMEWORK_MINOR "0")
+SET(FRAMEWORK_PATCH "1-incubation")
+
+SET(CMAKE_INSTALL_COMPONENT "Framework")
+GET_FILENAME_COMPONENT(__cmake_path ${CMAKE_COMMAND} PATH)
+FIND_PROGRAM(CPACK_COMMAND cpack ${__cmake_path})
+MESSAGE(STATUS "Found CPack at: ${CPACK_COMMAND}")
+IF(NOT CPACK_COMMAND)
+ MESSAGE(FATAL_ERROR "Need CPack!")
+ENDIF(NOT CPACK_COMMAND)
+
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfig-Installation.in CPackConfig-Installation.cmake @ONLY)
+ADD_CUSTOM_TARGET(package-release
+ ${CPACK_COMMAND} --config "CPackConfig-Installation.cmake"
+ )
+ADD_CUSTOM_TARGET(install-release COMMAND ${CMAKE_COMMAND} -DCOMPONENT=framework -P cmake_install.cmake)
+