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/02/13 14:23:05 UTC
[2/2] celix git commit: CELIX-417: Fixes an issues in the
add_celix_docker command that create identical timestamp files
CELIX-417: Fixes an issues in the add_celix_docker command that create identical timestamp files
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/c3140163
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/c3140163
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/c3140163
Branch: refs/heads/develop
Commit: c31401633ab998c26e8d22aedd0d8c2b75e2f03b
Parents: 33e96eb
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Tue Feb 13 15:22:55 2018 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Tue Feb 13 15:22:55 2018 +0100
----------------------------------------------------------------------
cmake/cmake_celix/DockerPackaging.cmake | 2 +-
examples/celix-examples/dm_example/CMakeLists.txt | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/c3140163/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 37c08a3..1639beb 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -241,7 +241,7 @@ function(celix_docker_bundles)
get_target_property(IMP ${BUNDLE} BUNDLE_IMPORTED)
if (IMP) #An imported bundle target -> handle target without DEPENDS
string(MAKE_C_IDENTIFIER ${BUNDLE} BUNDLE_ID) #Create id with no special chars (e.g. for target like Celix::shell)
- set(OUT "${CMAKE_BINARY_DIR}/celix/gen/${CONTAINER_TARGET}-copy-bundle-for-target-${BUNDLE_ID}.timestamp")
+ set(OUT "${CMAKE_BINARY_DIR}/celix/gen/${DOCKER_TARGET}-copy-bundle-for-target-${BUNDLE_ID}.timestamp")
set(DEST "${LOC}/${BUNDLES_DIR}/$<TARGET_PROPERTY:${BUNDLE},BUNDLE_FILENAME>")
add_custom_command(OUTPUT ${OUT}
COMMAND ${CMAKE_COMMAND} -E touch ${OUT}
http://git-wip-us.apache.org/repos/asf/celix/blob/c3140163/examples/celix-examples/dm_example/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/celix-examples/dm_example/CMakeLists.txt b/examples/celix-examples/dm_example/CMakeLists.txt
index 9759702..a1135ed 100644
--- a/examples/celix-examples/dm_example/CMakeLists.txt
+++ b/examples/celix-examples/dm_example/CMakeLists.txt
@@ -38,6 +38,7 @@ if (TARGET Celix::dependency_manager_static AND TARGET Celix::dm_shell)
LOGHELPER_ENABLE_STDOUT_FALLBACK=true
)
+
add_celix_docker(dm_exmpl_base
NAME dmbase
IMAGE_NAME dmbase
@@ -59,5 +60,18 @@ if (TARGET Celix::dependency_manager_static AND TARGET Celix::dm_shell)
PROPERTIES
LOGHELPER_ENABLE_STDOUT_FALLBACK=true
)
+ add_celix_docker(dm_exmpl2
+ GROUP examples
+ BUNDLES
+ Celix::shell
+ Celix::shell_tui
+ Celix::dm_shell
+ dm_example_phase1
+ dm_example_phase2a
+ dm_example_phase2b
+ dm_example_phase3
+ PROPERTIES
+ LOGHELPER_ENABLE_STDOUT_FALLBACK=true
+ )
endif ()