You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2018/01/18 17:05:15 UTC
[12/19] celix git commit: CELIX-412: Updates version and
RELEASE_NOTES for 2.1.0 release
CELIX-412: Updates version and RELEASE_NOTES for 2.1.0 release
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8821cfa6
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8821cfa6
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8821cfa6
Branch: refs/heads/feature/CELIX-417-cmake-refactor
Commit: 8821cfa63998e0972c519be4e603b11997cf994c
Parents: efed212
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Thu Jan 11 11:10:08 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Thu Jan 11 11:10:08 2018 +0100
----------------------------------------------------------------------
NOTICE | 2 +-
RELEASE_NOTES | 39 +++++++++++++---------------
cmake/cmake_celix/DockerPackaging.cmake | 12 ++++++---
dependency_manager/CMakeLists.txt | 1 +
dependency_manager_cxx/CMakeLists.txt | 5 ++--
dfi/CMakeLists.txt | 1 +
etcdlib/CMakeLists.txt | 3 ++-
shell/CMakeLists.txt | 2 +-
8 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 1f09306..2ec7f66 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Celix
-Copyright [2016] The Apache Software Foundation
+Copyright [2018] The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 480389f..0987fc7 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,23 +1,19 @@
-Release Notes for 2.0.0
+Release Notes for 2.1.0
Remarks:
- * Components that are 2.0.0 are
- - Framework
- - Utils
- - Shell
-* Components that are 1.0.0
- - Shell TUI
- - Log Service
- - Log Writer
- - Launcher
- - C Dependency Manager
- - C++ Dependency Manager
+* Library versions:
+ - Celix Framework library: 2.1.0
+ - Celix Utils library: 2.1.0
+ - Dependency Manager:
+ - C : 1.1.0
+ - C++ : 2.0.0
+ - Celix DFI library: 1.1.0
+ - Celix etcdlib: 1.0.0
-
-* Components and version
+* Bundle versions:
- Shell Tui: 1.1.0
- Shell Bonjour: 0.1.0
- - Shell: 2.0.0
+ - Shell: 2.1.0
- Remote Shell: 0.0.2
- Log Writer: 1.1.0
- Log Service: 1.1.0
@@ -25,6 +21,7 @@ Remarks:
- Device Access: 0.0.2
- Deployment Admin: 0.0.2
- Config Admin: 0.0.1
+ - Dm Shell Bundle: 1.0.0
- Remote Services
- Remote Service Admin Dfi: 0.9.0
- Remote Service Admin HTTP: 0.9.0
@@ -32,9 +29,9 @@ Remarks:
- Topology Manager: 0.9.0
- ETCD Discovery: 0.9.0
- Configured Discovery: 0.9.0
- - C Dependency Manager: 1.0.0
- - C++ Dependency Manager: 1.0.0
-
-Misc:
- - Utils: 2.0.0
- - Dfi: 1.0.0
+ - PubSub
+ - PubSubAdmin UDP Multicast : 1.0.0
+ - PubSubAdmin ZMQ : 1.0.0
+ - PubSub ETCD Discovery: 1.0.0
+ - PubSub Topology Manager: 1.0.0
+ - PubSub JSON Serializer : 1.0.0
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 8b7d8ab..e0ffe5e 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -16,9 +16,15 @@
# under the License.
##### setup docker target
-add_custom_target(celix-build-docker-dirs ALL
- DEPENDS $<TARGET_PROPERTY:celix-build-docker-dirs,DOCKER_DEPS>
-)
+if (APPLE) #create filesystem script is not working on mac os, exclude target from ALL
+ add_custom_target(celix-build-docker-dirs
+ DEPENDS $<TARGET_PROPERTY:celix-build-docker-dirs,DOCKER_DEPS>
+ )
+else ()
+ add_custom_target(celix-build-docker-dirs ALL
+ DEPENDS $<TARGET_PROPERTY:celix-build-docker-dirs,DOCKER_DEPS>
+ )
+endif ()
set_target_properties(celix-build-docker-dirs PROPERTIES "DOCKER_DEPS" "") #initial empty deps list
add_custom_target(celix-build-docker-images)
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/dependency_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
index 842f608..931789a 100644
--- a/dependency_manager/CMakeLists.txt
+++ b/dependency_manager/CMakeLists.txt
@@ -49,6 +49,7 @@ if (DEPENDENCY_MANAGER)
private/src/dm_activator
)
set_target_properties(dependency_manager_static PROPERTIES SOVERSION 1)
+ set_target_properties(dependency_manager_static PROPERTIES VERSION 1.1.0)
add_library(dependency_manager_so SHARED
private/src/dm_component_impl
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/dependency_manager_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager_cxx/CMakeLists.txt b/dependency_manager_cxx/CMakeLists.txt
index c113fa3..55b02ca 100644
--- a/dependency_manager_cxx/CMakeLists.txt
+++ b/dependency_manager_cxx/CMakeLists.txt
@@ -36,14 +36,15 @@ if (DEPENDENCY_MANAGER_CXX)
${PROJECT_SOURCE_DIR}/utils/public/include
)
- add_library( dependency_manager_cxx_static STATIC
+ add_library(dependency_manager_cxx_static STATIC
${CMAKE_SOURCE_DIR}/dependency_manager/private/src/dm_component_impl
${CMAKE_SOURCE_DIR}/dependency_manager/private/src/dm_service_dependency
${CMAKE_SOURCE_DIR}/dependency_manager/private/src/dm_event
${CMAKE_SOURCE_DIR}/dependency_manager/private/src/dm_dependency_manager_impl
src/dm_activator.cc
)
- #set_target_properties(dependency_manager_cxx_static PROPERTIES SOVERSION 1)
+ set_target_properties(dependency_manager_cxx_static PROPERTIES SOVERSION 1)
+ set_target_properties(dependency_manager_cxx_static PROPERTIES VERSION 2.0.0)
if (APPLE)
target_link_libraries(dependency_manager_cxx_static celix_framework "-undefined dynamic_lookup")
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/dfi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dfi/CMakeLists.txt b/dfi/CMakeLists.txt
index 3fd196b..676277c 100644
--- a/dfi/CMakeLists.txt
+++ b/dfi/CMakeLists.txt
@@ -54,6 +54,7 @@ add_library(celix_dfi SHARED
${MEMSTREAM_INCLUDES}
)
set_target_properties(celix_dfi PROPERTIES "SOVERSION" 1)
+set_target_properties(celix_dfi PROPERTIES "VERSION" 1.1.0)
target_link_libraries(celix_dfi celix_utils ${FFI_LIBRARIES} ${JANSSON_LIBRARY})
install(TARGETS celix_dfi DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT framework)
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/etcdlib/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/etcdlib/CMakeLists.txt b/etcdlib/CMakeLists.txt
index fd72d79..1904dea 100644
--- a/etcdlib/CMakeLists.txt
+++ b/etcdlib/CMakeLists.txt
@@ -52,7 +52,8 @@ add_library(etcdlib SHARED
private/src/etcd.c
)
-set_target_properties(etcdlib PROPERTIES "SOVERSION" 1)
+set_target_properties(etcdlib PROPERTIES SOVERSION 1)
+set_target_properties(etcdlib PROPERTIES VERSION 1.0.0)
target_link_libraries(etcdlib ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
add_library(etcdlib_static STATIC
http://git-wip-us.apache.org/repos/asf/celix/blob/8821cfa6/shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 974d2ff..11a16c1 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -20,7 +20,7 @@ if (SHELL)
add_bundle(shell
SYMBOLIC_NAME "apache_celix_shell"
- VERSION "2.0.0"
+ VERSION "2.1.0"
NAME "Apache Celix Shell"
SOURCES