celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [06/42] celix git commit: CELIX-335: Updated cmake @VAR@ usage to ${VAR} for the new CMP0053 policy
Date Fri, 05 Feb 2016 11:00:25 GMT
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/develop
Commit: 8101cd92cb9767eae66477a88457da9c7270f48c
Parents: 414bc1b
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jan 7 19:37:40 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
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: $<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_SYMBOLIC_NAME>
-Bundle-Name: $<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_TARGET_NAME>
-Bundle-Version: $<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_VERSION>
-Bundle-Description: $<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_DESCRIPTION>
-Bundle-Activator: $<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_ACTIVATOR>
-Private-Library: $<JOIN:$<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_PRIVATE_LIBS>,,
>
-Import-Library: $<JOIN:$<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_IMPORT_LIBS>,,
>
-Export-Library: $<JOIN:$<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_EXPORT_LIBS>,,
>
-$<JOIN:$<TARGET_PROPERTY:@BUNDLE_TARGET_NAME@,BUNDLE_HEADERS>,
+Bundle-SymbolicName: $<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_SYMBOLIC_NAME>
+Bundle-Name: $<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_TARGET_NAME>
+Bundle-Version: $<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_VERSION>
+Bundle-Description: $<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_DESCRIPTION>
+Bundle-Activator: $<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_ACTIVATOR>
+Private-Library: $<JOIN:$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_PRIVATE_LIBS>,,
>
+Import-Library: $<JOIN:$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_IMPORT_LIBS>,,
>
+Export-Library: $<JOIN:$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_EXPORT_LIBS>,,
>
+$<JOIN:$<TARGET_PROPERTY:${BUNDLE_TARGET_NAME},BUNDLE_HEADERS>,
 >

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


Mime
View raw message