Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C3C2619C1C for ; Mon, 11 Apr 2016 12:00:11 +0000 (UTC) Received: (qmail 22070 invoked by uid 500); 11 Apr 2016 12:00:11 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 21985 invoked by uid 500); 11 Apr 2016 12:00:11 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 21555 invoked by uid 99); 11 Apr 2016 12:00:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2016 12:00:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5C40EAB4B; Mon, 11 Apr 2016 12:00:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Mon, 11 Apr 2016 12:00:30 -0000 Message-Id: In-Reply-To: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> References: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] celix git commit: CELIX-335: Fix for deploying bundles using absolute paths CELIX-335: Fix for deploying bundles using absolute paths Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/ea9a5a8d Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/ea9a5a8d Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/ea9a5a8d Branch: refs/heads/master Commit: ea9a5a8dea580bf050073765559e6b2ec00c8bbf Parents: 3a45281 Author: Pepijn Noltes Authored: Fri Feb 5 21:30:30 2016 +0100 Committer: Pepijn Noltes Committed: Fri Feb 5 21:30:30 2016 +0100 ---------------------------------------------------------------------- cmake/cmake_celix/Packaging.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/ea9a5a8d/cmake/cmake_celix/Packaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake index 0521261..3cb1b71 100644 --- a/cmake/cmake_celix/Packaging.cmake +++ b/cmake/cmake_celix/Packaging.cmake @@ -556,7 +556,7 @@ function(deploy_bundles_dir) foreach(BUNDLE IN ITEMS ${BD_BUNDLES}) if (IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE}) get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME) - set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}.zip") + set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}") add_custom_command(OUTPUT ${OUT} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BUNDLE} ${OUT} COMMENT "Copying bundle '${BUNDLE}' to '${DEPLOY_LOC}/${BD_DIR_NAME}'" @@ -591,7 +591,7 @@ function(deploy_bundles) if(COPY) if(IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE}) get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME) - list(APPEND BUNDLES ${BUNDLE_FILENAME}) + list(APPEND BUNDLES "bundles/${BUNDLE_FILENAME}") else() #assuming target list(APPEND BUNDLES "bundles/${BUNDLE}.zip") endif() @@ -604,7 +604,7 @@ function(deploy_bundles) endif() endforeach() - if(DEPLOY_COPY) + if(COPY) deploy_bundles_dir(${DEPLOY_NAME} DIR_NAME bundles BUNDLES ${ARGN}) endif()