celix git commit: CELIX-335: Move deploy timestamp file to CMAKE_CURRENT_BINARY_DIR. Update run.sh to reuse existing (DY)LD_LIBRARY_PATH

2016-02-03 Thread pnoltes 
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-335_deploy_refactoring edf549c01 -> 89eaab323


CELIX-335: Move deploy timestamp file to CMAKE_CURRENT_BINARY_DIR. Update 
run.sh to reuse existing (DY)LD_LIBRARY_PATH


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

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: 89eaab3239545f22c66ded58af8f176a686f0246
Parents: edf549c
Author: Pepijn Noltes 
Authored: Wed Feb 3 09:40:00 2016 +0100
Committer: Pepijn Noltes 
Committed: Wed Feb 3 09:40:00 2016 +0100

--
 cmake/cmake_celix/Packaging.cmake | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/89eaab32/cmake/cmake_celix/Packaging.cmake
--
diff --git a/cmake/cmake_celix/Packaging.cmake 
b/cmake/cmake_celix/Packaging.cmake
index bde696b..3fcf070 100644
--- a/cmake/cmake_celix/Packaging.cmake
+++ b/cmake/cmake_celix/Packaging.cmake
@@ -464,13 +464,15 @@ function(add_deploy)
 
 
 ## Setup deploy custom target and config.properties file
+set(TIMESTAMP_FILE 
"${CMAKE_CURRENT_BINARY_DIR}/${DEPLOY_TARGET}-timestamp")
+
 add_custom_target(${DEPLOY_TARGET}
-DEPENDS  "${DEPLOY_LOCATION}/timestamp"
+DEPENDS ${TIMESTAMP_FILE}
 )
 add_dependencies(deploy ${DEPLOY_TARGET})
 
-add_custom_command(OUTPUT ${DEPLOY_LOCATION}/timestamp
-COMMAND ${CMAKE_COMMAND} -E touch ${DEPLOY_LOCATION}/timestamp
+add_custom_command(OUTPUT "${TIMESTAMP_FILE}"
+COMMAND ${CMAKE_COMMAND} -E touch ${TIMESTAMP_FILE}
 DEPENDS  "$" 
"${DEPLOY_LOCATION}/config.properties" "${DEPLOY_LOCATION}/run.sh" 
 WORKING_DIRECTORY "${DEPLOY_LOCATION}"
 COMMENT "Deploying ${DEPLOY_PRINT_NAME}" VERBATIM
@@ -501,14 +503,14 @@ 
$,
 if(APPLE) 
 file(GENERATE
 OUTPUT ${DEPLOY_LOCATION}/run.sh
-CONTENT "export 
DYLD_LIBRARY_PATH=$:$:$
+CONTENT "export 
DYLD_LIBRARY_PATH=$:$:$:\${DYLD_LIBRARY_PATH}
 $ $@
 "
 )
 else() 
 file(GENERATE
 OUTPUT ${DEPLOY_LOCATION}/run.sh
-CONTENT "export 
LD_LIBRARY_PATH=$:$:$
+CONTENT "export 
LD_LIBRARY_PATH=$:$:$:\${LD_LIBRARY_PATH}
 $ $@
 "
 )

celix git commit: CELIX-335: Update in cmake command documentation

2016-02-03 Thread pnoltes 
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-335_deploy_refactoring 89eaab323 -> 8a8292bd7


CELIX-335: Update in cmake command documentation


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

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: 8a8292bd7c173baa4bfb9774f204a7ee1f078c09
Parents: 89eaab3
Author: Pepijn Noltes 
Authored: Wed Feb 3 09:57:58 2016 +0100
Committer: Pepijn Noltes 
Committed: Wed Feb 3 09:57:58 2016 +0100

--
 documents/cmake_commands/readme.md | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/8a8292bd/documents/cmake_commands/readme.md
--
diff --git a/documents/cmake_commands/readme.md 
b/documents/cmake_commands/readme.md
index e9f994e..30d863e 100644
--- a/documents/cmake_commands/readme.md
+++ b/documents/cmake_commands/readme.md
@@ -165,6 +165,15 @@ add_deploy(
 )
 ```
 
+The provided bundle targets for a deployment do not have to exists (yet).
+This removes the need for correctly ordening the add_bundle commands so that 
all bundle target are present before an add_deploy command.
+If the bundle target is never added CMake will give an error:
+```
+  Error evaluating generator expression:
+
+$
+```
+
 - If COPY is provided the selected bundles will be copied in a bundles dir and 
the generated config.properties will use relative paths to the bundle 
locations. Default bundles will not be copied and the generated 
config.properties will use absolute references to the bundle locations.
 - If GROUP is provided the deployment will be grouped in the provided group 
name. 
 - If NAME is provided that name will be used for the deployment dir. Default 
the deploy target name will be used.