[glib-networking: 75/129] meson: bump required versin to 0.41.0



commit 69e8c74de3aa179cd9baa21bc4c25b4d70ae005c
Author: Paolo Borelli <pborelli gnome org>
Date:   Thu Oct 26 14:52:04 2017 +0200

    meson: bump required versin to 0.41.0
    
    It supports the dist target.
    Also move helper scripts in "build-aux" to follow the convention of
    other GNOME modules.

 Makefile.am                                        |  5 ++---
 {mesonscripts => build-aux}/detect_certificates.py |  0
 {mesonscripts => build-aux}/post_install.py        |  0
 meson.build                                        | 11 +++--------
 mesonscripts/release.sh                            | 20 --------------------
 5 files changed, 5 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 589f82c..b46bb9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_DIST +=                 \
        meson.build             \
        meson_options.txt       \
        po/meson.build          \
-       mesonscripts/detect_certificates.py \
-       mesonscripts/post_install.py \
-       mesonscripts/release.sh \
+       build-aux/detect_certificates.py \
+       build-aux/post_install.py \
        $(NULL)
diff --git a/mesonscripts/detect_certificates.py b/build-aux/detect_certificates.py
similarity index 100%
rename from mesonscripts/detect_certificates.py
rename to build-aux/detect_certificates.py
diff --git a/mesonscripts/post_install.py b/build-aux/post_install.py
similarity index 100%
rename from mesonscripts/post_install.py
rename to build-aux/post_install.py
diff --git a/meson.build b/meson.build
index 24e181e..889c3b9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('glib-openssl', 'c',
         version: '2.50.4',
         license: 'LGPL2+',
-        meson_version: '>= 0.38.0')
+        meson_version: '>= 0.41.0')
 
 cc = meson.get_compiler('c')
 
@@ -95,7 +95,7 @@ if host_machine.system() != 'windows'
     message('CA certificates disabled')
   else
     if ca_certificates == ''
-      detect_certificates = run_command(join_paths(meson.source_root(), 'mesonscripts', 
'detect_certificates.py'))
+      detect_certificates = run_command(join_paths(meson.source_root(), 'build-aux', 
'detect_certificates.py'))
 
       if detect_certificates.returncode() == 1
         error('Could not find certificates. Use -Dwith-ca-certificates=path to set, or 
-Dwith-ca-certificates=no to disable it')
@@ -119,9 +119,4 @@ subdir('tls/openssl')
 subdir('tls/tests')
 subdir('po')
 
-meson.add_install_script(join_paths('mesonscripts', 'post_install.py'), giomoduledir)
-
-run_target('release',
-           command: [join_paths('mesonscripts', 'release.sh'),
-                     meson.project_name(),
-                     meson.project_version()])
+meson.add_install_script(join_paths('build-aux', 'post_install.py'), giomoduledir)


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