Commit 52990e46 authored by Cédric Bellegarde's avatar Cédric Bellegarde

Fix meson

parent fc36711e
Pipeline #193146 failed with stage
in 31 seconds
#!@PYTHON@
#!/usr/bin/env python3
import sys
import os
......@@ -9,8 +9,6 @@ if 'EOLIE_TRACE' in os.environ:
from pycallgraph import PyCallGraph
from pycallgraph.output import GraphvizOutput
# Make sure we'll find the pygobject module, even in JHBuild
#sys.path.insert(1, '@PYTHON_EXEC_DIR@')
# Make sure we'll find the eolie modules, even in JHBuild
sys.path.insert(1, '@PYTHON_DIR@')
......
project('eolie', 'c',
version: '0.9.99',
meson_version: '>= 0.48.0',
meson_version: '>= 0.46.0',
)
revision = run_command('bin/revision.sh').stdout().strip()
......@@ -9,12 +9,12 @@ if revision == ''
endif
i18n = import('i18n')
python = import('python3')
py_mod = import('python')
project_id = 'org.gnome.Eolie'
message('Looking for dependencies')
python_bin = python.find_python()
if not python_bin.found()
py_installation = py_mod.find_installation('python3')
if not py_installation.found()
error('No valid python3 binary found')
else
message('Found python3 binary')
......@@ -25,7 +25,7 @@ dependency('gtk+-3.0', version :'>=3.20')
env = environment()
python_dir = join_paths(get_option('prefix'), python.sysconfig_path('purelib'))
python_dir = join_paths(get_option('prefix'), py_installation.get_install_dir())
LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
EXTENSION_DIR = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
DATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
......@@ -37,8 +37,6 @@ conf.set('DATA_DIR', DATA_DIR)
conf.set('EXTENSION_DIR', EXTENSION_DIR)
conf.set('LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
conf.set('PYTHON_DIR', python_dir)
conf.set('PYTHON_EXEC_DIR', join_paths(get_option('prefix'), python.sysconfig_path('stdlib')))
conf.set('PYTHON', python_bin.path())
conf.set('libexecdir', LIBEXEC_DIR)
conf.set('VERSION', meson.project_version())
conf.set('REVISION', revision)
......
#!@PYTHON@
#!/usr/bin/env python3
# Copyright (c) 2014-2017 Cedric Bellegarde <cedric.bellegarde@adishatz.org>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment