Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3FF9F160C15 for ; Wed, 3 Jan 2018 10:18:59 +0100 (CET) Received: (qmail 31047 invoked by uid 500); 3 Jan 2018 09:18:58 -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 31038 invoked by uid 99); 3 Jan 2018 09:18:58 -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; Wed, 03 Jan 2018 09:18:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4AAF0DFDF4; Wed, 3 Jan 2018 09:18:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlenferink@apache.org To: commits@celix.apache.org Message-Id: <0ccc2f9eb75f42c083c62a90eb9d8210@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: celix git commit: CELIX-418: Added packed configuration for docker executables Date: Wed, 3 Jan 2018 09:18:58 +0000 (UTC) archived-at: Wed, 03 Jan 2018 09:18:59 -0000 Repository: celix Updated Branches: refs/heads/develop 9ff00c306 -> 6f78b6701 CELIX-418: Added packed configuration for docker executables Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/6f78b670 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/6f78b670 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/6f78b670 Branch: refs/heads/develop Commit: 6f78b67016d703325cbcee76b5a68fa953dac3b9 Parents: 9ff00c3 Author: Roy Lenferink Authored: Wed Jan 3 10:18:42 2018 +0100 Committer: Roy Lenferink Committed: Wed Jan 3 10:18:42 2018 +0100 ---------------------------------------------------------------------- cmake/cmake_celix/DockerPackaging.cmake | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/6f78b670/cmake/cmake_celix/DockerPackaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake index 0acd7cc..8b7d8ab 100644 --- a/cmake/cmake_celix/DockerPackaging.cmake +++ b/cmake/cmake_celix/DockerPackaging.cmake @@ -95,7 +95,33 @@ function(add_celix_docker) else () add_custom_command(OUTPUT ${LAUNCHER_SRC} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/celix/gen - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LAUNCHER_ORG} ${LAUNCHER_SRC} + ) + + if (DOCKER_CXX) + set(LAUNCHER_STAGE1 "${CMAKE_CURRENT_BINARY_DIR}/${DOCKER_TARGET}-docker-main-stage1.cc") + else() + set(LAUNCHER_STAGE1 "${CMAKE_CURRENT_BINARY_DIR}/${DOCKER_TARGET}-docker-main-stage1.c") + endif() + + file(GENERATE + OUTPUT "${LAUNCHER_STAGE1}" + CONTENT "#include + +int main(int argc, char *argv[]) { + const char * config = \"cosgi.auto.start.1=$, >\\n\\ +$,\\n\\ +>\"; + + properties_pt packedConfig = properties_loadFromString(config); + + return celixLauncher_launchWithArgsAndProps(argc, argv, packedConfig); +} +" + ) + + file(GENERATE + OUTPUT "${LAUNCHER_SRC}" + INPUT "${LAUNCHER_STAGE1}" ) add_executable(${DOCKER_TARGET} ${LAUNCHER_SRC})