[libsoup] meson: Raise the required meson version to 0.47



commit 320d3a8df0f7a1b42aad427775043ce4c1c34c90
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Aug 30 11:43:41 2018 +0200

    meson: Raise the required meson version to 0.47
    
    This allows us to remove the workaround that we used for copy files to
    build directory, because there is now the official way to do so. We
    could leave the workaround in place, but there were several warnings
    printed because of it.

 meson.build       |  2 +-
 tests/meson.build | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3daa27a2..cbbde16e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('libsoup', 'c',
         version: '2.63.92',
-        meson_version : '>=0.43',
+        meson_version : '>=0.47',
         license : 'LGPL2',
         default_options : 'c_std=c89')
 
diff --git a/tests/meson.build b/tests/meson.build
index c32a64c5..3ddd9707 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -57,23 +57,21 @@ if have_apache
     input : 'httpd.conf.in',
     configuration : cdata)
 
-  # There is not copy_file() in Meson and this is official workaround as per
-  # https://github.com/mesonbuild/meson/issues/860
   configure_file(input : 'htdigest',
     output : 'htdigest',
-    configuration : configuration_data())
+    copy : true)
   configure_file(input : 'htpasswd',
     output : 'htpasswd',
-    configuration : configuration_data())
+    copy : true)
   configure_file(input : 'index.txt',
     output : 'index.txt',
-    configuration : configuration_data())
+    copy : true)
   configure_file(input : 'test-cert.pem',
     output : 'test-cert.pem',
-    configuration : configuration_data())
+    copy : true)
   configure_file(input : 'test-key.pem',
     output : 'test-key.pem',
-    configuration : configuration_data())
+    copy : true)
 endif
 
 if have_php
@@ -92,7 +90,7 @@ if have_php_xmlrpc
 
   configure_file(input : 'xmlrpc-server.php',
     output : 'xmlrpc-server.php',
-    configuration : configuration_data())
+    copy : true)
 endif
 
 env = environment()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]