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 294A9184AE for ; Thu, 7 Jan 2016 19:35:57 +0000 (UTC) Received: (qmail 57231 invoked by uid 500); 7 Jan 2016 19:35:57 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 57200 invoked by uid 500); 7 Jan 2016 19:35:57 -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 57190 invoked by uid 99); 7 Jan 2016 19:35:57 -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; Thu, 07 Jan 2016 19:35:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EDC38E0AF0; Thu, 7 Jan 2016 19:35:56 +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: Thu, 07 Jan 2016 19:35:56 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] celix git commit: CELIX-335: Updated cmake @VAR@ usage to ${VAR} for the new CMP0053 policy Repository: celix Updated Branches: refs/heads/feature/CELIX-335_deploy_refactoring 414bc1b08 -> 0dce0f2e6 CELIX-335: Updated cmake @VAR@ usage to ${VAR} for the new CMP0053 policy Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/8101cd92 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/8101cd92 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/8101cd92 Branch: refs/heads/feature/CELIX-335_deploy_refactoring Commit: 8101cd92cb9767eae66477a88457da9c7270f48c Parents: 414bc1b Author: Pepijn Noltes Authored: Thu Jan 7 19:37:40 2016 +0100 Committer: Pepijn Noltes Committed: Thu Jan 7 19:37:40 2016 +0100 ---------------------------------------------------------------------- CMakeLists.txt | 3 --- cmake/cmake_celix/Manifest.template.in | 18 +++++++++--------- cmake/cmake_celix/Packaging.cmake | 2 +- device_access/example/CMakeLists.txt | 2 +- .../private/test/CMakeLists.txt | 4 ++-- .../private/test/CMakeLists.txt | 4 ++-- .../private/test/client.properties.in | 2 +- 7 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index bfe3288..c3494fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,6 @@ cmake_minimum_required (VERSION 2.6) project (Celix C CXX) cmake_policy(SET CMP0012 NEW) -if(POLICY CMP0053) - cmake_policy(SET CMP0053 OLD) -endif(POLICY CMP0053) #SET(CMAKE_VERBOSE_MAKEFILE ON) http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/cmake/cmake_celix/Manifest.template.in ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/Manifest.template.in b/cmake/cmake_celix/Manifest.template.in index c458754..f2676d9 100644 --- a/cmake/cmake_celix/Manifest.template.in +++ b/cmake/cmake_celix/Manifest.template.in @@ -1,10 +1,10 @@ -Bundle-SymbolicName: $ -Bundle-Name: $ -Bundle-Version: $ -Bundle-Description: $ -Bundle-Activator: $ -Private-Library: $,, > -Import-Library: $,, > -Export-Library: $,, > -$, +Bundle-SymbolicName: $ +Bundle-Name: $ +Bundle-Version: $ +Bundle-Description: $ +Bundle-Activator: $ +Private-Library: $,, > +Import-Library: $,, > +Export-Library: $,, > +$, > http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/cmake/cmake_celix/Packaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake index aadc4b4..bb7daa9 100644 --- a/cmake/cmake_celix/Packaging.cmake +++ b/cmake/cmake_celix/Packaging.cmake @@ -166,7 +166,7 @@ function(add_bundle) ##### MANIFEST configuration and generation ################## #Step1 configure the file so that the target name is present in in the template - configure_file(${CELIX_CMAKE_DIRECTORY}/cmake_celix/Manifest.template.in ${BUNDLE_GEN_DIR}/MANIFEST.template @ONLY) + configure_file(${CELIX_CMAKE_DIRECTORY}/cmake_celix/Manifest.template.in ${BUNDLE_GEN_DIR}/MANIFEST.template) #Step2 replace headers with target property values. Note this is done build time file(GENERATE OUTPUT "${BUNDLE_GEN_DIR}/MANIFEST.tmp" http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/device_access/example/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/example/CMakeLists.txt b/device_access/example/CMakeLists.txt index acf16f7..1a5cd77 100644 --- a/device_access/example/CMakeLists.txt +++ b/device_access/example/CMakeLists.txt @@ -26,7 +26,7 @@ if(DEVICE_ACCESS_EXAMPLE) ) deploy_bundles_dir(device_access_example - DIR_NAME "DRIVERS" + DIR_NAME "drivers" BUNDLES word_consumingdriver char_refiningdriver ) endif(DEVICE_ACCESS_EXAMPLE) http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/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 3954c72..a199bc2 100644 --- a/remote_services/remote_service_admin_http/private/test/CMakeLists.txt +++ b/remote_services/remote_service_admin_http/private/test/CMakeLists.txt @@ -45,8 +45,8 @@ get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDL 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) +get_filename_component(client_endpoints ${calc_proxy_bundle_file} PATH) +get_filename_component(server_endpoints ${calc_endpoint_bundle_file} PATH) configure_file(client.properties.in client.properties @ONLY) configure_file(server.properties.in server.properties @ONLY) http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/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 524e6eb..4a0ae10 100644 --- a/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt +++ b/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt @@ -45,8 +45,8 @@ get_property(topology_manager_bundle_file TARGET topology_manager PROPERTY BUNDL 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) +get_filename_component(client_endpoints ${calc_proxy_bundle_file} PATH) +get_filename_component(server_endpoints ${calc_endpoint_bundle_file} PATH) configure_file(client.properties.in client.properties @ONLY) configure_file(server.properties.in server.properties @ONLY) http://git-wip-us.apache.org/repos/asf/celix/blob/8101cd92/remote_services/remote_service_admin_shm/private/test/client.properties.in ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_shm/private/test/client.properties.in b/remote_services/remote_service_admin_shm/private/test/client.properties.in index 17e5412..d4eb239 100644 --- a/remote_services/remote_service_admin_shm/private/test/client.properties.in +++ b/remote_services/remote_service_admin_shm/private/test/client.properties.in @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -cosgi.auto.start.1=@rsa_bundle_file@ @calculator_shell_bundle_file@ @discovery_shm_bundle_file@ @topology_manager_bundle_file@ @tst_bundle_file@ +cosgi.auto.start.1=${rsa_bundle_file} ${calculator_shell_bundle_file} ${discovery_shm_bundle_file} ${topology_manager_bundle_file} ${tst_bundle_file} LOGHELPER_ENABLE_STDOUT_FALLBACK=true ENDPOINTS=@client_endpoints@ RSA_PORT=50881