mirror of https://gitlab.com/ita1024/waf.git
Issue 1594
This commit is contained in:
parent
d45b8447a8
commit
89ac2f0215
|
@ -15,6 +15,7 @@ def options(opt):
|
||||||
opt.load('vala')
|
opt.load('vala')
|
||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
|
conf.env.VALA_MINVER = (0, 25, 0)
|
||||||
conf.load('compiler_c vala')
|
conf.load('compiler_c vala')
|
||||||
conf.check_cfg(package='glib-2.0', uselib_store='GLIB', atleast_version='2.10.0', mandatory=1, args='--cflags --libs')
|
conf.check_cfg(package='glib-2.0', uselib_store='GLIB', atleast_version='2.10.0', mandatory=1, args='--cflags --libs')
|
||||||
conf.recurse('resources')
|
conf.recurse('resources')
|
||||||
|
|
|
@ -288,6 +288,10 @@ def check_vala(self, min_version=(0,8,0), branch=None):
|
||||||
:param branch: first part of the version number, in case a snapshot is used (0, 8)
|
:param branch: first part of the version number, in case a snapshot is used (0, 8)
|
||||||
:type branch: tuple of int
|
:type branch: tuple of int
|
||||||
"""
|
"""
|
||||||
|
if self.env.VALA_MINVER:
|
||||||
|
min_version = self.env.VALA_MINVER
|
||||||
|
if self.env.VALA_MINVER_BRANCH:
|
||||||
|
branch = self.env.VALA_MINVER_BRANCH
|
||||||
if not branch:
|
if not branch:
|
||||||
branch = min_version[:2]
|
branch = min_version[:2]
|
||||||
try:
|
try:
|
||||||
|
@ -321,8 +325,8 @@ def configure(self):
|
||||||
Use the following to enforce minimum vala version::
|
Use the following to enforce minimum vala version::
|
||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
conf.load('vala', funs='')
|
conf.env.VALA_MINVER = (0, 10, 0)
|
||||||
conf.check_vala(min_version=(0,10,0))
|
conf.load('vala')
|
||||||
"""
|
"""
|
||||||
self.load('gnu_dirs')
|
self.load('gnu_dirs')
|
||||||
self.check_vala_deps()
|
self.check_vala_deps()
|
||||||
|
|
Loading…
Reference in New Issue