diff options
| -rw-r--r-- | man/meson.1 | 2 | ||||
| -rw-r--r-- | man/mesonintrospect.1 | 2 | ||||
| -rw-r--r-- | man/wraptool.1 | 2 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 4 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreterbase.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
8 files changed, 16 insertions, 9 deletions
diff --git a/man/meson.1 b/man/meson.1 index d721e89..0b2a3e4 100644 --- a/man/meson.1 +++ b/man/meson.1 @@ -1,4 +1,4 @@ -.TH MESON "1" "December 2016" "meson 0.37.1" "User Commands" +.TH MESON "1" "January 2017" "meson 0.38.0" "User Commands" .SH NAME meson - a high productivity build system .SH DESCRIPTION diff --git a/man/mesonintrospect.1 b/man/mesonintrospect.1 index a9ee2c2..8f9cfe8 100644 --- a/man/mesonintrospect.1 +++ b/man/mesonintrospect.1 @@ -1,4 +1,4 @@ -.TH MESONCONF "1" "December 2016" "mesonintrospect 0.37.1" "User Commands" +.TH MESONCONF "1" "January 2017" "mesonintrospect 0.38.0" "User Commands" .SH NAME mesonintrospect - a tool to extract information about a Meson build .SH DESCRIPTION diff --git a/man/wraptool.1 b/man/wraptool.1 index e211ea3..35b5695 100644 --- a/man/wraptool.1 +++ b/man/wraptool.1 @@ -1,4 +1,4 @@ -.TH WRAPTOOL "1" "December 2016" "meson 0.37.1" "User Commands" +.TH WRAPTOOL "1" "January 2017" "meson 0.38.0" "User Commands" .SH NAME wraptool - source dependency downloader .SH DESCRIPTION diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index c8ac35c..8d5d2e0 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1913,7 +1913,12 @@ rule FORTRAN_DEP_HACK compiler_name = '%s%s_COMPILER' % (compiler.get_language(), crstr) extra_deps = [] if compiler.get_language() == 'fortran': - extra_deps += self.get_fortran_deps(compiler, abs_src, target) + # Can't read source file to scan for deps if it's generated later + # at build-time. Skip scanning for deps, and just set the module + # outdir argument instead. + # https://github.com/mesonbuild/meson/issues/1348 + if not is_generated: + extra_deps += self.get_fortran_deps(compiler, abs_src, target) # Dependency hack. Remove once multiple outputs in Ninja is fixed: # https://groups.google.com/forum/#!topic/ninja-build/j-2RfBIOd_8 for modname, srcfile in self.fortran_deps[target.get_basename()].items(): diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index bb9b04a..5351111 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -601,7 +601,7 @@ class Compiler: self.language)) def get_cross_extra_flags(self, environment, *, compile, link): - extra_flags = CompilerArgs(self) + extra_flags = [] if self.is_cross and environment: if 'properties' in environment.cross_info.config: lang_args_key = self.language + '_args' @@ -831,7 +831,7 @@ class CCompiler(Compiler): mlog.debug('Sanity testing ' + self.language + ' compiler:', ' '.join(self.exelist)) mlog.debug('Is cross compiler: %s.' % str(self.is_cross)) - extra_flags = CompilerArgs(self) + extra_flags = [] source_name = os.path.join(work_dir, sname) binname = sname.rsplit('.', 1)[0] if self.is_cross: diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 02ea6ba..7b4059e 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -1,4 +1,4 @@ -# Copyright 2012-2016 The Meson development team +# Copyright 2012-2017 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ import pickle, os, uuid from .mesonlib import MesonException, commonpath from .mesonlib import default_libdir, default_libexecdir, default_prefix -version = '0.38.0.dev1' +version = '0.38.1' backendlist = ['ninja', 'vs2010', 'vs2015', 'xcode'] class UserOption: diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 12e4fc4..e59557a 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -392,6 +392,8 @@ class InterpreterBase: return self.int_method_call(obj, method_name, args) if isinstance(obj, list): return self.array_method_call(obj, method_name, self.reduce_arguments(args)[0]) + if isinstance(obj, mesonlib.File): + raise InvalidArguments('File object "%s" is not callable.' % obj) if not isinstance(obj, InterpreterObject): raise InvalidArguments('Variable "%s" is not callable.' % object_name) (args, kwargs) = self.reduce_arguments(args) @@ -74,7 +74,7 @@ setup(name='meson', data_files=[('share/man/man1', ['man/meson.1', 'man/mesonconf.1', 'man/mesonintrospect.1', - 'main/mesontest.1', + 'man/mesontest.1', 'man/wraptool.1'])], classifiers=['Development Status :: 5 - Production/Stable', 'Environment :: Console', |