Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tpopela committed Aug 30, 2018
1 parent 501c46b commit 320d3a8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion 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')

Expand Down
14 changes: 6 additions & 8 deletions tests/meson.build
Expand Up @@ -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
Expand All @@ -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()
Expand Down

0 comments on commit 320d3a8

Please sign in to comment.