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 9F13419C14 for ; Mon, 11 Apr 2016 12:00:11 +0000 (UTC) Received: (qmail 21968 invoked by uid 500); 11 Apr 2016 12:00:11 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 21871 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 21430 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 C4B19DFF13; 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:22 -0000 Message-Id: In-Reply-To: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> References: <3aba73c7f879491bb1a81d4d4f94f182@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] celix git commit: Merge branch 'feature/CELIX-335_deploy_refactoring' into develop Merge branch 'feature/CELIX-335_deploy_refactoring' into develop Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9934f752 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9934f752 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9934f752 Branch: refs/heads/master Commit: 9934f75275c7de4d50088b7f87256a1bd5ba3047 Parents: b815e68 ef2d16f Author: Pepijn Noltes Authored: Fri Feb 5 09:37:35 2016 +0100 Committer: Pepijn Noltes Committed: Fri Feb 5 09:37:35 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 5 +- CMakeLists.txt | 10 +- cmake/CMakeCelix.cmake | 1 + cmake/UseDoxygen.cmake | 4 +- cmake/cmake_celix/CPackConfig-Installation.in | 29 - cmake/cmake_celix/CPackConfig.in | 25 - cmake/cmake_celix/CPackConfigPKG.in | 25 - cmake/cmake_celix/Dependencies.cmake | 37 +- cmake/cmake_celix/Manifest.template.in | 10 + cmake/cmake_celix/NOTE | 4 +- cmake/cmake_celix/Packaging.cmake | 1048 ++++++++++-------- cmake/cmake_celix/PackagingLegacy.cmake | 108 ++ cmake/cmake_celix/RunConfig.in | 37 +- cmake/cmake_celix/config.properties.in | 2 - cmake/cmake_celix/installation.cmake | 30 - cmake/cmake_celix/manifest.in | 2 - cmake/cmake_celix/run.sh.in | 2 - config_admin/CMakeLists.txt | 3 + .../example_test/CMakeLists.txt | 7 +- .../example_test2/CMakeLists.txt | 6 +- config_admin/deploy.cmake | 23 - config_admin/service/CMakeLists.txt | 7 +- dependency_manager/CMakeLists.txt | 40 +- .../private/src/dm_activator_base.c | 9 +- .../public/include/dm_activator.h | 40 + .../public/include/dm_activator_base.h | 41 - deployment_admin/CMakeLists.txt | 60 +- deployment_admin/deploy.cmake | 24 - device_access/CMakeLists.txt | 2 +- device_access/deploy.cmake | 21 - device_access/device_access/CMakeLists.txt | 32 +- device_access/driver_locator/CMakeLists.txt | 14 +- device_access/example/CMakeLists.txt | 11 +- .../example/base_driver/CMakeLists.txt | 14 +- .../example/consuming_driver/CMakeLists.txt | 14 +- .../example/refining_driver/CMakeLists.txt | 14 +- dfi/CMakeLists.txt | 8 +- documents/building/readme.md | 104 ++ documents/cmake_commands/readme.md | 210 ++++ .../getting_started/getting_started_img1.png | Bin 0 -> 46250 bytes .../getting_started/getting_started_img2.png | Bin 0 -> 55615 bytes .../getting_started/getting_started_img3.png | Bin 0 -> 127686 bytes documents/getting_started/readme.md | 216 ++++ documents/memory_pools.png | Bin 74273 -> 0 bytes documents/subprojects/readme.md | 23 + event_admin/CMakeLists.txt | 6 +- event_admin/deploy.cmake | 23 - event_admin/event_admin/CMakeLists.txt | 10 +- event_admin/event_handler/CMakeLists.txt | 9 +- event_admin/event_publisher/CMakeLists.txt | 10 +- examples/CMakeLists.txt | 14 + examples/deploy.cmake | 34 - examples/dm_example/CMakeLists.txt | 15 + examples/dm_example/deploy.cmake | 32 - examples/dm_example/phase1/CMakeLists.txt | 26 +- .../phase1/private/src/phase1_activator.c | 2 +- .../dm_example/phase1/private/src/phase1_cmp.c | 2 +- examples/dm_example/phase2a/CMakeLists.txt | 22 +- .../phase2a/private/src/phase2a_activator.c | 2 +- examples/dm_example/phase2b/CMakeLists.txt | 24 +- .../phase2b/private/src/phase2b_activator.c | 2 +- .../phase2b/private/src/phase2b_cmp.c | 2 +- examples/dm_example/phase3/CMakeLists.txt | 24 +- .../phase3/private/src/phase3_activator.c | 2 +- examples/echo_service/client/CMakeLists.txt | 16 +- examples/echo_service/server/CMakeLists.txt | 16 +- examples/embedding/CMakeLists.txt | 8 - examples/hello_world/CMakeLists.txt | 41 +- examples/hello_world_test/CMakeLists.txt | 80 +- .../hello_world_test/private/src/activator.c | 3 - examples/hello_world_test/private/src/test.c | 32 + examples/hello_world_test/public/include/test.h | 34 + examples/locking/CMakeLists.txt | 8 + examples/locking/benchmark/CMakeLists.txt | 9 +- examples/locking/deploy.cmake | 26 - examples/locking/math_provider/CMakeLists.txt | 11 +- .../modified_bool_benchmark/CMakeLists.txt | 5 +- examples/locking/mutex_benchmark/CMakeLists.txt | 11 +- .../locking/reference_benchmark/CMakeLists.txt | 5 +- .../locking/start_stop_benchmark/CMakeLists.txt | 5 +- examples/mongoose/CMakeLists.txt | 17 +- .../client/CMakeLists.txt | 5 +- .../greeting/CMakeLists.txt | 5 +- .../chapter04-correct-listener/CMakeLists.txt | 3 +- .../chapter04-correct-lookup/CMakeLists.txt | 5 +- .../chapter04-paint-example/CMakeLists.txt | 2 + .../circle/CMakeLists.txt | 2 +- .../chapter04-paint-example/deploy.cmake | 22 - .../paint/CMakeLists.txt | 2 +- .../square/CMakeLists.txt | 2 +- .../triangle/CMakeLists.txt | 2 +- .../producer_consumer/consumer/CMakeLists.txt | 8 +- .../producer_consumer/database/CMakeLists.txt | 8 +- .../producer_consumer/producer/CMakeLists.txt | 8 +- examples/whiteboard/publisherA/CMakeLists.txt | 4 +- examples/whiteboard/publisherB/CMakeLists.txt | 5 +- examples/whiteboard/tracker/CMakeLists.txt | 5 +- .../whiteboard/tracker_depman/CMakeLists.txt | 9 +- .../private/src/dependency_activator.c | 2 +- framework/CMakeLists.txt | 14 +- .../test_bundle1/CMakeLists.txt | 7 +- framework/private/src/framework.c | 32 +- framework/private/src/manifest.c | 3 +- framework/private/src/utils.c | 17 + framework/public/include/constants.h | 2 - framework/public/include/utils.h | 1 + log_service/CMakeLists.txt | 11 +- log_writer/log_writer_stdout/CMakeLists.txt | 18 +- log_writer/log_writer_syslog/CMakeLists.txt | 10 +- .../discovery_configured/CMakeLists.txt | 9 +- remote_services/discovery_etcd/CMakeLists.txt | 11 +- remote_services/discovery_shm/CMakeLists.txt | 10 +- remote_services/examples/CMakeLists.txt | 69 ++ .../examples/calculator_endpoint/CMakeLists.txt | 7 +- .../calculator_endpoint2/CMakeLists.txt | 7 +- .../examples/calculator_proxy/CMakeLists.txt | 7 +- .../examples/calculator_proxy2/CMakeLists.txt | 7 +- .../examples/calculator_service/CMakeLists.txt | 12 +- .../examples/calculator_shell/CMakeLists.txt | 17 +- remote_services/examples/deploy.cmake | 65 -- .../remote_service_admin/CMakeLists.txt | 5 - .../remote_service_admin_dfi/rsa/CMakeLists.txt | 10 +- .../rsa_tst/CMakeLists.txt | 20 +- .../rsa_tst/bundle/CMakeLists.txt | 16 +- .../remote_service_admin_http/CMakeLists.txt | 10 +- .../private/test/CMakeLists.txt | 20 +- .../remote_service_admin_shm/CMakeLists.txt | 9 +- .../private/test/CMakeLists.txt | 26 +- .../private/test/client.properties.in | 2 +- remote_services/topology_manager/CMakeLists.txt | 10 +- .../topology_manager/tms_tst/CMakeLists.txt | 28 +- .../tms_tst/bundle/CMakeLists.txt | 14 +- .../tms_tst/disc_mock/CMakeLists.txt | 7 +- remote_shell/CMakeLists.txt | 28 +- remote_shell/deploy.cmake | 20 - scr/scr/CMakeLists.txt | 2 +- scr/test/CMakeLists.txt | 2 +- shell/CMakeLists.txt | 37 +- shell_bonjour/CMakeLists.txt | 7 +- shell_bonjour/deploy.cmake | 25 - shell_tui/CMakeLists.txt | 11 +- utils/CMakeLists.txt | 2 + 142 files changed, 2110 insertions(+), 1546 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/9934f752/config_admin/CMakeLists.txt ----------------------------------------------------------------------