[gnome-tweaks/alatiera/flatpak-manifest: 134/135] build: Fix python files installation handling




commit 152bf700f5eb8d678e8fb1fb9c5a0fdf06fbd519
Author: Mart Raudsepp <leio gentoo org>
Date:   Sun Mar 29 16:05:36 2020 +0300

    build: Fix python files installation handling
    
    The deprecated meson python3 module tends to end up installing only
    to a python version that meson is installed for too, possibly
    breaking some expectations downstream that want it installed to
    a specific python3 version, that might not match what the build
    machine uses for meson.
    Fix it by using the non-deprecated python module and methods from it.
    
    The python module exists since 0.46, which should be safe to require
    by now. There were meson 0.50 features used already, but unnecessarily,
    as the configure_file install parameter was added then, but all versions
    default to `true` anyhow. However in practice this only emitted a
    warning with newer meson versions and was able to build fine with older
    versions too. However fix it too, so that we are now warning-free for
    meson features after raising of the meson version dep.

 gtweak/meson.build |  5 ++---
 meson.build        | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gtweak/meson.build b/gtweak/meson.build
index 052b7cb4..a491f6a4 100644
--- a/gtweak/meson.build
+++ b/gtweak/meson.build
@@ -11,7 +11,6 @@ configure_file(
   input: 'defs.py.in',
   output: 'defs.py',
   configuration: defs_conf,
-  install: true,
   install_dir: gtweakdir
 )
 
@@ -44,5 +43,5 @@ tweak_sources = [
   'tweaks/tweak_wacom.py',
 ]
 
-install_data(shell_sources, install_dir: gtweakdir)
-install_data(tweak_sources, install_dir: gtweakdir + '/tweaks')
+python3.install_sources(shell_sources, subdir: 'gtweak')
+python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
diff --git a/meson.build b/meson.build
index 320c14e7..b1571df9 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,11 @@ project('gnome-tweaks',
 gnome = import('gnome')
 i18n = import('i18n')
 python = import('python')
-py_installation = python.find_installation('python3')
+python3 = python.find_installation('python3')
+
+if not python3.found()
+    error('No valid python3 installation found!')
+endif
 
 prefix = get_option('prefix')
 
@@ -14,13 +18,13 @@ bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 libexecdir = join_paths(prefix, get_option('libexecdir'))
 localedir = join_paths(prefix, get_option('localedir'))
-pythondir = join_paths(prefix, py_installation.get_path('purelib'))
+pythondir = join_paths(prefix, python3.get_path('purelib'))
 
 pkgdatadir = join_paths(datadir, meson.project_name())
 
 appdatadir = join_paths(datadir, 'metainfo')
 desktopdir = join_paths(datadir, 'applications')
-gtweakdir = join_paths(pythondir, 'gtweak')
+gtweakdir = python3.get_install_dir(subdir: 'gtweak')
 icondir = join_paths(datadir, 'icons', 'hicolor')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 


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