lightmelody

changeset 722:6c254d730970 objectify

Updating genie.py for waf 1.8 API and vala 0.26
author Arc Riley <arcriley@gmail.com>
date Thu, 09 Oct 2014 04:02:24 +0000
parents 6c18a7b3269b
children edcdc5f6f78a
files genie.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/genie.py	Thu Oct 09 04:01:52 2014 +0000
     1.2 +++ b/genie.py	Thu Oct 09 04:02:24 2014 +0000
     1.3 @@ -2,7 +2,7 @@
     1.4  # encoding: utf-8
     1.5  # Ali Sabil, 2007
     1.6  # Radosław Szkodziński, 2010
     1.7 -# Arc Riley, 2010, 2011, 2012
     1.8 +# Arc Riley, 2010, 2011, 2012, 2013, 2014
     1.9  
    1.10  """
    1.11  At this point, vala is still unstable, so do not expect
    1.12 @@ -24,8 +24,7 @@
    1.13      def run(self):
    1.14          env = self.env
    1.15  
    1.16 -        cmd = [env['VALAC'], '-C', '--quiet']
    1.17 -        cmd.extend(Utils.to_list(env['VALAFLAGS']))
    1.18 +        cmd=self.env.VALAC + self.env.VALAFLAGS
    1.19  
    1.20          if self.threading:
    1.21              cmd.append('--thread')
    1.22 @@ -251,7 +250,8 @@
    1.23  valac = Task.update_outputs(valac) # no decorators for python2 classes
    1.24  
    1.25  @conf
    1.26 -def check_vala(self, min_version=(0,18,0), branches=('0.22', '0.20', '0.18')):
    1.27 +def check_vala(self, min_version=(0,18,0), 
    1.28 +               branches=('0.26', '0.24', '0.22', '0.20', '0.18')):
    1.29      """
    1.30      Check if vala compiler from a given branch exists of at least a given
    1.31      version.
    1.32 @@ -275,7 +275,7 @@
    1.33          valac_name = 'valac'
    1.34          valac = self.find_program(valac_name, var='VALAC')
    1.35  
    1.36 -    output = self.cmd_and_log(valac + ' --version')
    1.37 +    output = self.cmd_and_log(valac + ['--version'])
    1.38      if output == "UNKNOWN" :
    1.39          output = branch+'.0' # best guess
    1.40      ver = re.search(r'\d+.\d+.\d+', output).group(0).split('.')