Repository: celix Updated Branches: refs/heads/develop b815e68fc -> b19a8f6be
http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt index e4093b7..17a0c02 100644 --- a/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt +++ b/remote_services/remote_service_admin_dfi/rsa/CMakeLists.txt @@ -27,11 +27,11 @@ include_directories( ${PROJECT_SOURCE_DIR}/remote_services/examples/calculator_service/public/include ) -SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_dfi") -SET(BUNDLE_VERSION "0.0.1") -SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin Dynamic Function Interface (DFI)") - -bundle(remote_service_admin_dfi SOURCES +add_bundle(remote_service_admin_dfi + VERSION 0.0.1 + SYMBOLIC_NAME "apache_celix_remote_service_admin_dfi" + NAME "Apache Celix Remote Service Admin Dynamic Function Interface (DFI)" + SOURCES private/src/remote_service_admin_dfi.c private/src/remote_service_admin_activator.c private/src/export_registration_dfi.c http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt index 140aa54..ac845e6 100644 --- a/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt +++ b/remote_services/remote_service_admin_dfi/rsa_tst/CMakeLists.txt @@ -39,12 +39,12 @@ add_executable(test_rsa_dfi ) target_link_libraries(test_rsa_dfi celix_framework celix_utils ${CURL_LIBRARIES} ${CPPUTEST_LIBRARY}) -get_property(rsa_bundle_file TARGET remote_service_admin_dfi PROPERTY BUNDLE) -get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE) -get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE) -get_property(discovery_configured_bundle_file TARGET discovery_configured PROPERTY BUNDLE) -get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE) -get_property(tst_bundle_file TARGET rsa_dfi_tst_bundle PROPERTY BUNDLE) +get_property(rsa_bundle_file TARGET remote_service_admin_dfi PROPERTY BUNDLE_FILE) +get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE_FILE) +get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE_FILE) +get_property(discovery_configured_bundle_file TARGET discovery_configured PROPERTY BUNDLE_FILE) +get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE) +get_property(tst_bundle_file TARGET rsa_dfi_tst_bundle PROPERTY BUNDLE_FILE) configure_file(config.properties.in config.properties @ONLY) configure_file(client.properties.in client.properties @ONLY) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt b/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt index c75b341..d172087 100644 --- a/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt +++ b/remote_services/remote_service_admin_dfi/rsa_tst/bundle/CMakeLists.txt @@ -22,16 +22,16 @@ include_directories( ${PROJECT_SOURCE_DIR}/remote_services/examples/calculator_service/public/include ) -SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_dfi_tst_bundle") -SET(BUNDLE_VERSION "0.0.1") -SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin DFI test bundle") - -bundle(rsa_dfi_tst_bundle +add_bundle(rsa_dfi_tst_bundle + VERSION 0.0.1 SOURCES tst_activator.c +) - FILES - ${PROJECT_SOURCE_DIR}/remote_services/examples/calculator_service/public/include/org.apache.celix.calc.api.Calculator2.descriptor +bundle_files(rsa_dfi_tst_bundle + ${PROJECT_SOURCE_DIR}/remote_services/examples/calculator_service/public/include/org.apache.celix.calc.api.Calculator2.descriptor + DESTINATION . ) -target_link_libraries(rsa_dfi_tst_bundle ${CPPUTEST_LIBRARY} celix_framework celix_utils) \ No newline at end of file + +target_link_libraries(rsa_dfi_tst_bundle ${CPPUTEST_LIBRARY} celix_framework celix_utils) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_http/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_http/CMakeLists.txt b/remote_services/remote_service_admin_http/CMakeLists.txt index 58a8fd6..ba333e1 100644 --- a/remote_services/remote_service_admin_http/CMakeLists.txt +++ b/remote_services/remote_service_admin_http/CMakeLists.txt @@ -30,11 +30,11 @@ if (RSA_REMOTE_SERVICE_ADMIN_HTTP) include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include") include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include") - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http") - SET(BUNDLE_VERSION "0.0.1") - SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP") - - bundle(remote_service_admin_http SOURCES + add_bundle(remote_service_admin_http + VERSION 0.0.1 + SYMBOLIC_NAME "apache_celix_remote_service_admin_http" + NAME "Apache Celix Remote Service Admin HTTP" + SOURCES private/src/remote_service_admin_impl private/src/remote_service_admin_activator ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_http/private/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_http/private/test/CMakeLists.txt b/remote_services/remote_service_admin_http/private/test/CMakeLists.txt index 5992635..3954c72 100644 --- a/remote_services/remote_service_admin_http/private/test/CMakeLists.txt +++ b/remote_services/remote_service_admin_http/private/test/CMakeLists.txt @@ -37,13 +37,13 @@ add_executable(test_rsa_http ) target_link_libraries(test_rsa_http celix_framework celix_utils ${CURL_LIBRARIES} ${CPPUTEST_LIBRARY}) -get_property(rsa_bundle_file TARGET remote_service_admin_http PROPERTY BUNDLE) -get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE) -get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE) -get_property(discovery_configured_bundle_file TARGET discovery_configured PROPERTY BUNDLE) -get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE) -get_property(calc_proxy_bundle_file TARGET org.apache.celix.calc.api.Calculator_proxy PROPERTY BUNDLE) -get_property(calc_endpoint_bundle_file TARGET org.apache.celix.calc.api.Calculator_endpoint PROPERTY BUNDLE) +get_property(rsa_bundle_file TARGET remote_service_admin_http PROPERTY BUNDLE_FILE) +get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE_FILE) +get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE_FILE) +get_property(discovery_configured_bundle_file TARGET discovery_configured PROPERTY BUNDLE_FILE) +get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE) +get_property(calc_proxy_bundle_file TARGET org.apache.celix.calc.api.Calculator_proxy PROPERTY BUNDLE_FILE) +get_property(calc_endpoint_bundle_file TARGET org.apache.celix.calc.api.Calculator_endpoint PROPERTY BUNDLE_FILE) get_filename_component(client_endpoints @calc_proxy_bundle_file@ PATH) get_filename_component(server_endpoints @calc_endpoint_bundle_file@ PATH) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_shm/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_shm/CMakeLists.txt b/remote_services/remote_service_admin_shm/CMakeLists.txt index ce2f13a..411ed7d 100644 --- a/remote_services/remote_service_admin_shm/CMakeLists.txt +++ b/remote_services/remote_service_admin_shm/CMakeLists.txt @@ -29,11 +29,12 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM) include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/private/include") include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include") - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_shm") - SET(BUNDLE_VERSION "0.0.1") - SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin SHM") + add_bundle(remote_service_admin_shm + VERSION 0.0.1 + SYMBOLIC_NAME "apache_celix_remote_service_admin_shm" + NAME "Apache Celix Remote Service Admin SHM" + SOURCES - bundle(remote_service_admin_shm SOURCES private/src/remote_service_admin_impl private/src/remote_service_admin_activator ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt b/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt index 0786a6d..524e6eb 100644 --- a/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt +++ b/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt @@ -37,13 +37,13 @@ add_executable(test_rsa_shm ) target_link_libraries(test_rsa_shm celix_framework celix_utils ${CURL_LIBRARIES} ${CPPUTEST_LIBRARY}) -get_property(rsa_bundle_file TARGET remote_service_admin_shm PROPERTY BUNDLE) -get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE) -get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE) -get_property(discovery_shm_bundle_file TARGET discovery_shm PROPERTY BUNDLE) -get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE) -get_property(calc_proxy_bundle_file TARGET org.apache.celix.calc.api.Calculator_proxy PROPERTY BUNDLE) -get_property(calc_endpoint_bundle_file TARGET org.apache.celix.calc.api.Calculator_endpoint PROPERTY BUNDLE) +get_property(rsa_bundle_file TARGET remote_service_admin_shm PROPERTY BUNDLE_FILE) +get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE_FILE) +get_property(calculator_shell_bundle_file TARGET calculator_shell PROPERTY BUNDLE_FILE) +get_property(discovery_shm_bundle_file TARGET discovery_shm PROPERTY BUNDLE_FILE) +get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE) +get_property(calc_proxy_bundle_file TARGET org.apache.celix.calc.api.Calculator_proxy PROPERTY BUNDLE_FILE) +get_property(calc_endpoint_bundle_file TARGET org.apache.celix.calc.api.Calculator_endpoint PROPERTY BUNDLE_FILE) get_filename_component(client_endpoints @calc_proxy_bundle_file@ PATH) get_filename_component(server_endpoints @calc_endpoint_bundle_file@ PATH) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/topology_manager/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/topology_manager/CMakeLists.txt b/remote_services/topology_manager/CMakeLists.txt index 97ea972..f3f45f3 100644 --- a/remote_services/topology_manager/CMakeLists.txt +++ b/remote_services/topology_manager/CMakeLists.txt @@ -24,11 +24,7 @@ if (RSA_TOPOLOGY_MANAGER) include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include") include_directories("${PROJECT_SOURCE_DIR}/remote_services/topology_manager/public/include") - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rs_topology_manager") - SET(BUNDLE_VERSION "0.0.2") - SET_HEADERS("Bundle-Name: Apache Celix RS Topology Manager") - - bundle(topology_manager SOURCES + add_bundle(topology_manager SOURCES private/src/topology_manager private/src/scope private/src/activator @@ -37,6 +33,10 @@ if (RSA_TOPOLOGY_MANAGER) private/include/topology_manager.h public/include/tm_scope.h + VERSION 0.0.2 + SYMBOLIC_NAME "apache_celix_rs_topology_manager" + NAME + "Apache Celix RS Topology Manager" ) install_bundle(topology_manager) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/topology_manager/tms_tst/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/topology_manager/tms_tst/CMakeLists.txt b/remote_services/topology_manager/tms_tst/CMakeLists.txt index 37dc541..f55fe74 100644 --- a/remote_services/topology_manager/tms_tst/CMakeLists.txt +++ b/remote_services/topology_manager/tms_tst/CMakeLists.txt @@ -34,12 +34,18 @@ add_dependencies(test_tm_scoped remote_service_admin_dfi topology_manager calcul # Not nice, but only (?) solution to prevent circular dependency between this test and rsa_dfi_test set_property(GLOBAL PROPERTY temp_rsa_bundle_file ${PROJECT_BINARY_DIR}/remote_services/remote_service_admin_dfi/rsa/remote_service_admin_dfi.zip) get_property(rsa_bundle_file GLOBAL PROPERTY temp_rsa_bundle_file) -get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE) -get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE) -get_property(disc_mock_bundle_file TARGET topology_manager_disc_mock_bundle PROPERTY BUNDLE) -get_property(test_bundle_file TARGET topology_manager_test_bundle PROPERTY BUNDLE) - +get_property(calc_bundle_file TARGET calculator PROPERTY BUNDLE_FILE) +get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDLE_FILE) +get_property(disc_mock_bundle_file TARGET topology_manager_disc_mock_bundle PROPERTY BUNDLE_FILE) +get_property(test_bundle_file TARGET topology_manager_test_bundle PROPERTY BUNDLE_FILE) + +#file(GENERATE OUTPUT config.properties CONTENT " +#cosgi.auto.start.1=$<TARGET_PROPERTY:remote_service_admin_dfi,BUNDE_FILE> $<TARGET_PROPERTY:calculator,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager,BUNDLE_FILE> $<TARGET_PROPERTY:topology_manager_disc_mock_bundle,BUNDLE_FILE> +#LOGHELPER_ENABLE_STDOUT_FALLBACK=true +#org.osgi.framework.storage.clean=onFirstInit +#") configure_file(config.properties.in config.properties @ONLY) + configure_file(config_import.properties.in config_import.properties @ONLY) configure_file(scope.json scope.json @ONLY) configure_file(scope2.json scope2.json @ONLY) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt index 02b9e17..4b2f924 100644 --- a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt +++ b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt @@ -8,16 +8,14 @@ include_directories( ${PROJECT_SOURCE_DIR}/utils/public/include ) -SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_topology_manager_test_bundle") -SET(BUNDLE_VERSION "0.0.1") -SET_HEADERS("Bundle-Name: Apache Celix Remote Service Topology Manager test bundle") - - -bundle(topology_manager_test_bundle +add_bundle(topology_manager_test_bundle + VERSION 0.0.1 SOURCES tst_activator.c - FILES - org.apache.celix.test.MyBundle.descriptor +) +bundle_files(topology_manager_test_bundle + org.apache.celix.test.MyBundle.descriptor + DESTINATION . ) target_link_libraries(topology_manager_test_bundle ${CPPUTEST_LIBRARY} celix_framework celix_utils) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt index 6c4914b..5edca45 100644 --- a/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt +++ b/remote_services/topology_manager/tms_tst/disc_mock/CMakeLists.txt @@ -9,12 +9,9 @@ include_directories( ${PROJECT_SOURCE_DIR}/remote_services/discovery/private/include ) -SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_topology_manager_scoped_disc_mock_bundle") -SET(BUNDLE_VERSION "0.0.1") -SET_HEADERS("Bundle-Name: Apache Celix Topology manager discovery mock bundle") - -bundle(topology_manager_disc_mock_bundle +add_bundle(topology_manager_disc_mock_bundle + VERSION 0.0.1 SOURCES disc_mock_activator.c disc_mock_service.c http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_shell/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_shell/CMakeLists.txt b/remote_shell/CMakeLists.txt index e945415..b0b69f1 100644 --- a/remote_shell/CMakeLists.txt +++ b/remote_shell/CMakeLists.txt @@ -17,20 +17,20 @@ celix_subproject(REMOTE_SHELL "Option to enable building the Remote Shell bundles" ON DEPS LAUNCHER SHELL_TUI) if (REMOTE_SHELL) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_shell") - SET(BUNDLE_VERSION "0.0.1") - SET_HEADERS("Bundle-Name: Apache Celix Remote Shell") - - bundle(remote_shell SOURCES - private/src/activator - private/src/connection_listener - private/src/shell_mediator - private/src/remote_shell + add_bundle(remote_shell + SYMBOLIC_NAME "apache_celix_remote_shell" + VERSION "0.0.1" + NAME: "Apache Celix Remote Shell" + SOURCES + private/src/activator + private/src/connection_listener + private/src/shell_mediator + private/src/remote_shell + + ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c - ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c - - private/include/remote_shell.h - private/include/connection_listener.h + private/include/remote_shell.h + private/include/connection_listener.h ) install_bundle(remote_shell) @@ -41,4 +41,6 @@ if (REMOTE_SHELL) include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include") target_link_libraries(remote_shell celix_framework) + + add_deploy("remote_shell_deploy" NAME "remote_shell" BUNDLES shell remote_shell shell_tui log_service) endif (REMOTE_SHELL) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/remote_shell/deploy.cmake ---------------------------------------------------------------------- diff --git a/remote_shell/deploy.cmake b/remote_shell/deploy.cmake deleted file mode 100644 index e1ab2bd..0000000 --- a/remote_shell/deploy.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -is_enabled(REMOTE_SHELL) -if (REMOTE_SHELL) - deploy("remote_shell" BUNDLES shell remote_shell shell_tui log_service) -endif (REMOTE_SHELL) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/scr/scr/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/scr/scr/CMakeLists.txt b/scr/scr/CMakeLists.txt index 40fd79b..c236832 100644 --- a/scr/scr/CMakeLists.txt +++ b/scr/scr/CMakeLists.txt @@ -18,7 +18,7 @@ include(FindLibXml2) include_directories(${LIBXML2_INCLUDE_DIR}) -bundle(scr SOURCES +add_bundle(scr SOURCES scr.c private/src/xml_parser.c private/src/component_metadata.c http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/scr/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/scr/test/CMakeLists.txt b/scr/test/CMakeLists.txt index 2e9923d..bcbcdb2 100644 --- a/scr/test/CMakeLists.txt +++ b/scr/test/CMakeLists.txt @@ -17,7 +17,7 @@ SET_HEADERS("Service-Component: test.xml") -bundle(scr_test SOURCES +add_bundle(scr_test SOURCES test.c FILES test.xml ) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/shell/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 235f348..f1f7ab2 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -17,26 +17,27 @@ celix_subproject(SHELL "Option to enable building the Shell bundles" ON DEPS LAUNCHER LOG_SERVICE) if (SHELL) find_package(CURL REQUIRED) - - SET_HEADER(BUNDLE_VERSION "1.0.0") - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_shell") - SET_HEADERS("Bundle-Name: Apache Celix Shell") - bundle(shell SOURCES - - private/src/activator - private/src/shell - private/src/lb_command - private/src/start_command - private/src/stop_command - private/src/install_command - private/src/update_command - private/src/uninstall_command - private/src/log_command - private/src/inspect_command - private/src/help_command + add_bundle(shell + SYMBOLIC_NAME "apache_celix_shell" + VERSION "1.0.0" + NAME "Apache Celix Shell" - ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c + SOURCES + + private/src/activator + private/src/shell + private/src/lb_command + private/src/start_command + private/src/stop_command + private/src/install_command + private/src/update_command + private/src/uninstall_command + private/src/log_command + private/src/inspect_command + private/src/help_command + + ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c ) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/shell_bonjour/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell_bonjour/CMakeLists.txt b/shell_bonjour/CMakeLists.txt index 5c44dbe..d1990fd 100644 --- a/shell_bonjour/CMakeLists.txt +++ b/shell_bonjour/CMakeLists.txt @@ -34,7 +34,7 @@ if (SHELL_BONJOUR) include_directories("${LIBXML2_INCLUDE_DIR}") include_directories("private/include") - bundle(bonjour_shell + add_bundle(bonjour_shell SOURCES private/src/activator.c private/src/bonjour_shell.c @@ -42,5 +42,10 @@ if (SHELL_BONJOUR) target_link_libraries(bonjour_shell celix_framework celix_utils ${LIBXML2_LIBRARIES} ${DNS_SD_LIB}) + add_deploy("bonjour_shell" BUNDLES + shell + bonjour_shell + PROPERTIES "bonjour.shell.id=Apache Celix" + ) endif (SHELL_BONJOUR) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/shell_bonjour/deploy.cmake ---------------------------------------------------------------------- diff --git a/shell_bonjour/deploy.cmake b/shell_bonjour/deploy.cmake deleted file mode 100644 index b96209e..0000000 --- a/shell_bonjour/deploy.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -is_enabled(SHELL_BONJOUR) -if (SHELL_BONJOUR) - deploy("bonjour_shell" BUNDLES - shell - bonjour_shell - PROPERTIES "bonjour.shell.id=Apache Celix" - ) -endif (SHELL_BONJOUR) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/shell_tui/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell_tui/CMakeLists.txt b/shell_tui/CMakeLists.txt index ab56f73..a94b616 100644 --- a/shell_tui/CMakeLists.txt +++ b/shell_tui/CMakeLists.txt @@ -17,11 +17,10 @@ celix_subproject(SHELL_TUI "Option to enable building the Shell Textual User Interface bundles" ON DEPS LAUNCHER SHELL) if (SHELL_TUI) - SET_HEADER(BUNDLE_VERSION "1.0.0") - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_shell_tui") - SET_HEADERS("Bundle-Name: Apache Celix Shell TUI") - - bundle(shell_tui + add_bundle(shell_tui + SYMBOLIC_NAME "apache_celix_shell_tui" + VERSION "1.0.0" + NAME "Apache Celix Shell TUI" SOURCES private/src/shell_tui ) http://git-wip-us.apache.org/repos/asf/celix/blob/49ab9ab5/utils/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 29d797f..8f6385c 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -54,7 +54,8 @@ if (UTILS) private/src/thpool.c public/include/thpool.h ) - + set_target_properties(celix_utils PROPERTIES "SOVERSION" 2) + IF(UNIX) target_link_libraries(celix_utils m pthread) ENDIF(UNIX)
