celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: Fixes a issue in the runtime shell script generation.
Date Thu, 22 Mar 2018 14:41:49 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 857e8129f -> 2a50dd28c


Fixes a issue in the runtime shell script generation.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2a50dd28
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2a50dd28
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2a50dd28

Branch: refs/heads/develop
Commit: 2a50dd28cff34d5a713efbf2fd552f521a4983f4
Parents: 857e812
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Mar 22 15:41:17 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Mar 22 15:41:17 2018 +0100

----------------------------------------------------------------------
 cmake/cmake_celix/DeployPackaging.cmake | 2 +-
 cmake/cmake_celix/Runtimes.cmake        | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/2a50dd28/cmake/cmake_celix/DeployPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DeployPackaging.cmake b/cmake/cmake_celix/DeployPackaging.cmake
index ab49c1f..a16ff25 100644
--- a/cmake/cmake_celix/DeployPackaging.cmake
+++ b/cmake/cmake_celix/DeployPackaging.cmake
@@ -112,7 +112,7 @@ $<JOIN:$<TARGET_PROPERTY:${CONTAINER_TARGET},CONTAINER_EMBEDDED_PROPERTIES>,\\n\
     else ()
         #LAUNCHER already set
         add_custom_target(${CONTAINER_TARGET}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAUNCHER} ${CONTAINER_LOC}/${CONTAINER_TARGET}
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAUNCHER} ${CONTAINER_LOC}/${CONTAINER_NAME}
         )
     endif ()
 

http://git-wip-us.apache.org/repos/asf/celix/blob/2a50dd28/cmake/cmake_celix/Runtimes.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Runtimes.cmake b/cmake/cmake_celix/Runtimes.cmake
index 40c9586..753992f 100644
--- a/cmake/cmake_celix/Runtimes.cmake
+++ b/cmake/cmake_celix/Runtimes.cmake
@@ -49,7 +49,6 @@ function(add_runtime)
         COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_PROPERTY:${RUNTIME_TARGET_NAME},RUNTIME_LOC>
         COMMAND chmod +x $<TARGET_PROPERTY:${RUNTIME_TARGET_NAME},RUNTIME_LOC>/start.sh
         COMMAND chmod +x $<TARGET_PROPERTY:${RUNTIME_TARGET_NAME},RUNTIME_LOC>/stop.sh
-        #TODO DEPENDS  "$<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_TARGET_DEPS>" ${DEPLOY_FILE_TARGETS}
         DEPENDS  ${START_SCRIPT} ${STOP_SCRIPT} ${SETUP_SCRIPT}
         WORKING_DIRECTORY "${RUNTIME_LOC}"
         COMMENT "Creating runtime ${RUNTIME_TARGET_NAME}" VERBATIM
@@ -97,7 +96,6 @@ function(add_runtime)
     )
 
 
-    #replaces list of $<TARGET_PROPERTY:<DEPLOY_NAME>,DEPLOY_LOC>, only needed
for common
     file(GENERATE
         OUTPUT "${COMMON_SCRIPT}"
         INPUT "${CMAKE_CURRENT_BINARY_DIR}/common.sh.${RUNTIME_TARGET_NAME}.in.2"
@@ -159,7 +157,7 @@ function(runtime_deployment_wait_for)
     list(GET ARGN 0 RUNTIME_NAME)
     list(GET ARGN 1 DEPLOYMENT)
 
-    set_target_properties(${RUNTIME_NAME} PROPERTIES "RUNTIME_WAIT_FOR_DEPLOYMENT" "$<TARGET_PROPERTY:${DEPLOYMENT},DEPLOY_LOC>")
+    set_target_properties(${RUNTIME_NAME} PROPERTIES "RUNTIME_WAIT_FOR_DEPLOYMENT" "$<TARGET_PROPERTY:${DEPLOYMENT},CONTAINER_LOC>")
     set_target_properties(${RUNTIME_NAME} PROPERTIES "RUNTIME_WAIT_FOR_COMMAND" "")
 endfunction()
 


Mime
View raw message