From 89ac2f0215de62b2f3fc170a9693a810949a09dd Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Wed, 9 Mar 2016 22:25:52 +0100 Subject: [PATCH] Issue 1594 --- demos/vala/wscript | 1 + waflib/Tools/vala.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/demos/vala/wscript b/demos/vala/wscript index c518e2f4..3eb6a9fc 100644 --- a/demos/vala/wscript +++ b/demos/vala/wscript @@ -15,6 +15,7 @@ def options(opt): opt.load('vala') def configure(conf): + conf.env.VALA_MINVER = (0, 25, 0) 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.recurse('resources') diff --git a/waflib/Tools/vala.py b/waflib/Tools/vala.py index 258d0967..ca1a5282 100644 --- a/waflib/Tools/vala.py +++ b/waflib/Tools/vala.py @@ -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) :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: branch = min_version[:2] try: @@ -321,8 +325,8 @@ def configure(self): Use the following to enforce minimum vala version:: def configure(conf): - conf.load('vala', funs='') - conf.check_vala(min_version=(0,10,0)) + conf.env.VALA_MINVER = (0, 10, 0) + conf.load('vala') """ self.load('gnu_dirs') self.check_vala_deps()