aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contributing.txt70
-rw-r--r--docs/markdown/Contributing.md144
-rw-r--r--docs/markdown/index.md20
-rw-r--r--docs/sitemap.txt1
-rw-r--r--mesonbuild/compilers/c.py16
-rw-r--r--mesonbuild/compilers/compilers.py6
-rw-r--r--mesonbuild/compilers/cpp.py16
-rw-r--r--mesonbuild/compilers/cs.py4
-rw-r--r--mesonbuild/compilers/d.py16
-rw-r--r--mesonbuild/compilers/fortran.py36
-rw-r--r--mesonbuild/coredata.py4
-rw-r--r--mesonbuild/dependencies/misc.py2
-rw-r--r--mesonbuild/environment.py34
-rw-r--r--mesonbuild/interpreter.py6
-rw-r--r--test cases/frameworks/21 libwmf/meson.build5
15 files changed, 245 insertions, 135 deletions
diff --git a/contributing.txt b/contributing.txt
index 094c5e6..b1c015c 100644
--- a/contributing.txt
+++ b/contributing.txt
@@ -1,70 +1,4 @@
Contributing to the Meson build system
-There are two simple ways to submit your patches. The preferred way is
-to send a github pull request. Small changes can also be sent as
-patches as emails to the Meson mailing list.
-
-
-Python Coding style
-
-Meson follows the basic Python coding style. Additional rules are the
-following:
-
-- indent 4 spaces, no tabs ever
-- indent meson.build files with two spaces
-- try to keep the code as simple as possible
-- contact the mailing list before embarking on large scale projects
- to avoid wasted effort
-- all new features must come with a test (or several if it is
- a big feature)
-
-Meson uses Flake8 for style guide enforcement. The Flake8 options for
-the project are contained in setup.cfg.
-
-To run Flake8 on your local clone of Meson:
-
- $ python3 -m pip install flake8
- $ cd meson
- $ flake8
-
-C/C++ coding style
-
-Meson has a bunch of test code in several languages. The rules for
-those are simple.
-
-- indent 4 spaces, no tabs ever
-- brace always on the same line as if/for/else/function definition
-
-
-External dependencies
-
-The goal of Meson is to be as easily usable as possible. The user
-experience should be "get Python3 and Ninja, run", even on
-Windows. Unfortunately this means that we can't have dependencies on
-projects outside of Python's standard library. This applies only to
-core functionality, though. For additional helper programs etc the use
-of external dependencies may be ok. If you feel that you are dealing
-with this kind of case, please raise the issue on the mailing list
-first.
-
-
-What not to contribute?
-
-There are a few things that people seem to want to add to Meson but which
-are not there by design and will not be added either.
-
-The first one is defining your own functions or a generalized for loop.
-These are bad because they would make Meson's DSL Turing complete. The
-second feature is a Make backend.
-
-The FAQ has specific information why these two features will not be
-added to Meson: http://mesonbuild.com/FAQ.html
-
-Merge requests adding either of these two features will be automatically
-rejected. Please save everyone's time (especially your own) and don't start
-working on these features.
-
-
-Do I need to sign a CLA?
-
-No. All contributions are welcome.
+Contribution instructions can be found [on the
+website](http://mesonbuild.com/Contributing.html).
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
new file mode 100644
index 0000000..354bf62
--- /dev/null
+++ b/docs/markdown/Contributing.md
@@ -0,0 +1,144 @@
+---
+short-description: Contributing to Meson
+...
+
+# Contributing to Meson
+
+A large fraction of Meson is contributed by people outside the core
+team. This documentation explains some of the design rationales of
+Meson as well as how to create and submit your patches for inclusion
+to Meson.
+
+Thank you for your interest in participating to the development.
+
+## Submitting patches
+
+All changes must be submitted as [pull requests to
+Github](https://github.com/mesonbuild/meson/pulls). This causes them
+to be run through the CI system. All submissions must pass a full CI
+test run before they are even considered for submission.
+
+## Tests
+
+All new features must come with automatic tests that throughly prove
+that the feature is working as expected. Similarly bug fixes must come
+with a unit test that demonstrates the bug, proves that it has been
+fixed and prevents the feature from breaking in the future.
+
+Sometimes it is difficult to create a unit test for a given bug. If
+this is the case, note this in your pull request. We may permit bug
+fix merge requests in these cases. This is done on a case by case
+basis. Sometimes it may be easier to write the test than convince the
+maintainers that one is not needed. Exercise judgment and ask for help
+in problematic cases.
+
+## Documentation
+
+The `docs` directory contains the full documentation that will be used
+to generate [the Meson web site](http://mesonbuild.com). Every change
+in functionality must change the documentation pages. In most cases
+this means updating the reference documentation page but bigger
+changes might need changes in other documentation, too.
+
+All new functionality needs to have a mention in the release
+notes. These features should be written in standalone files in the
+`docs/markdown/snippets` directory. The release manager will combine
+them into one page when doing the release.
+
+## Python Coding style
+
+Meson follows the basic Python coding style. Additional rules are the
+following:
+
+- indent 4 spaces, no tabs ever
+- indent meson.build files with two spaces
+- try to keep the code as simple as possible
+- contact the mailing list before embarking on large scale projects
+ to avoid wasted effort
+
+Meson uses Flake8 for style guide enforcement. The Flake8 options for
+the project are contained in setup.cfg.
+
+To run Flake8 on your local clone of Meson:
+
+```console
+$ python3 -m pip install flake8
+$ cd meson
+$ flake8
+```
+
+## C/C++ coding style
+
+Meson has a bunch of test code in several languages. The rules for
+those are simple.
+
+- indent 4 spaces, no tabs ever
+- brace always on the same line as if/for/else/function definition
+
+
+
+## External dependencies
+
+The goal of Meson is to be as easily usable as possible. The user
+experience should be "get Python3 and Ninja, run", even on
+Windows. Unfortunately this means that we can't have dependencies on
+projects outside of Python's standard library. This applies only to
+core functionality, though. For additional helper programs etc the use
+of external dependencies may be ok. If you feel that you are dealing
+with this kind of case, please contact the developers first with your
+use case.
+
+## Turing completeness
+
+The main design principle of Meson is that the definition language is
+not Turing complete. Any change that would make Meson Turing complete
+is automatically rejected. In practice this means that defining your
+own functions inside `meson.build` files and generalised loops will
+not be added to the language.
+
+## Do I need to sign a CLA in order to contribute?
+
+No you don't. All contributions are welcome.
+
+## No lingering state
+
+Meson operates in much the same way as functional programming
+languages. It has inputs, which include `meson.build` files, values of
+options, compilers and so on. These are passed to a function, which
+generates output build definition. This function is pure, which means that:
+
+ - for any given input the output is always the same
+ - running Meson twice in a row _always_ produce the same output in both runs
+
+The latter one is important, because it enforces that there is no way
+for "secret state" to pass between consecutive invocations of
+Meson. This is the reason why, for example, there is no `set_option`
+function even though there is a `get_option` one.
+
+If this were not the case, we could never know if the build output is
+"stable". For example suppose there were a `set_option` function and a
+boolean variable `flipflop`. Then you could do this:
+
+```meson
+set_option('flipflop', not get_option('flipflop'))
+```
+
+This piece of code would never converge. Every Meson run would change
+the value of the option and thus the output you get out of this build
+definition would be random.
+
+Meson does not permit this by forbidding these sorts of covert channels.
+
+There is one exception to this rule. Users can call into external
+commands with `run_command`. If the output of that command does not
+behave like a pure function, this problem arises. Meson does not try
+to guard against this case, it is the responsibility of the user to
+make sure the commands they run behave like pure functions.
+
+## Environment variables
+
+Environment variables are like global variables, except that they are
+also hidden by default. Envvars should be avoided whenever possible,
+all functionality should be exposed in better ways such as command
+line switches.
+
diff --git a/docs/markdown/index.md b/docs/markdown/index.md
index 81c17ff..5f42cc7 100644
--- a/docs/markdown/index.md
+++ b/docs/markdown/index.md
@@ -6,9 +6,13 @@ render-subpages: false
## Overview
-Meson is an open source build system meant to be both extremely fast, and, even more importantly, as user friendly as possible.
+Meson is an open source build system meant to be both extremely fast,
+and, even more importantly, as user friendly as possible.
-The main design point of Meson is that every moment a developer spends writing or debugging build definitions is a second wasted. So is every second spent waiting for the build system to actually start compiling code.
+The main design point of Meson is that every moment a developer spends
+writing or debugging build definitions is a second wasted. So is every
+second spent waiting for the build system to actually start compiling
+code.
## Features
@@ -22,12 +26,18 @@ The main design point of Meson is that every moment a developer spends writing o
## Community
-There are two main methods of connecting with other Meson developers. The first one is the mailing list, which is hosted at [Google Groups](https://groups.google.com/forum/#!forum/mesonbuild).
+There are two main methods of connecting with other Meson
+developers. The first one is the mailing list, which is hosted at
+[Google Groups](https://groups.google.com/forum/#!forum/mesonbuild).
-The second way is via IRC. The channel to use is `#mesonbuild` at [Freenode](https://freenode.net/).
+The second way is via IRC. The channel to use is `#mesonbuild` at
+[Freenode](https://freenode.net/).
## Development
-All development on Meson is done on [GitHub project](https://github.com/mesonbuild/meson). For further info look into the `contributing.txt` file that comes with Meson's source checkout.
+All development on Meson is done on [GitHub
+project](https://github.com/mesonbuild/meson). Instruction on
+contributing can be found on the [contribution page](Contributing.md).
+
You do not need to sign a CLA to contribute to Meson.
diff --git a/docs/sitemap.txt b/docs/sitemap.txt
index 77a4e6f..b7ee136 100644
--- a/docs/sitemap.txt
+++ b/docs/sitemap.txt
@@ -90,5 +90,6 @@ index.md
Use-of-Python.md
Users.md
Using-multiple-build-directories.md
+ Contributing.md
legal.md
Videos.md
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 44cd4b4..233fc84 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -42,11 +42,11 @@ from .compilers import (
class CCompiler(Compiler):
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs):
# If a child ObjC or CPP class has already set it, don't set it ourselves
if not hasattr(self, 'language'):
self.language = 'c'
- super().__init__(exelist, version)
+ super().__init__(exelist, version, **kwargs)
self.id = 'unknown'
self.is_cross = is_cross
self.can_compile_suffixes.add('h')
@@ -800,8 +800,8 @@ class CCompiler(Compiler):
class ClangCCompiler(ClangCompiler, CCompiler):
- def __init__(self, exelist, version, clang_type, is_cross, exe_wrapper=None):
- CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper)
+ def __init__(self, exelist, version, clang_type, is_cross, exe_wrapper=None, **kwargs):
+ CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
ClangCompiler.__init__(self, clang_type)
default_warn_args = ['-Wall', '-Winvalid-pch']
self.warn_args = {'1': default_warn_args,
@@ -832,8 +832,8 @@ class ClangCCompiler(ClangCompiler, CCompiler):
class GnuCCompiler(GnuCompiler, CCompiler):
- def __init__(self, exelist, version, gcc_type, is_cross, exe_wrapper=None, defines=None):
- CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper)
+ def __init__(self, exelist, version, gcc_type, is_cross, exe_wrapper=None, defines=None, **kwargs):
+ CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
GnuCompiler.__init__(self, gcc_type, defines)
default_warn_args = ['-Wall', '-Winvalid-pch']
self.warn_args = {'1': default_warn_args,
@@ -871,8 +871,8 @@ class GnuCCompiler(GnuCompiler, CCompiler):
class IntelCCompiler(IntelCompiler, CCompiler):
- def __init__(self, exelist, version, icc_type, is_cross, exe_wrapper=None):
- CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper)
+ def __init__(self, exelist, version, icc_type, is_cross, exe_wrapper=None, **kwargs):
+ CCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
IntelCompiler.__init__(self, icc_type)
self.lang_header = 'c-header'
default_warn_args = ['-Wall', '-w3', '-diag-disable:remark', '-Wpch-messages']
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 4079d0f..3d50eb0 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -597,7 +597,7 @@ class Compiler:
# compiler or the C library. Currently only used for MSVC.
ignore_libs = ()
- def __init__(self, exelist, version):
+ def __init__(self, exelist, version, **kwargs):
if isinstance(exelist, str):
self.exelist = [exelist]
elif isinstance(exelist, list):
@@ -611,6 +611,10 @@ class Compiler:
self.can_compile_suffixes = set(self.file_suffixes)
self.default_suffix = self.file_suffixes[0]
self.version = version
+ if 'full_version' in kwargs:
+ self.full_version = kwargs['full_version']
+ else:
+ self.full_version = None
self.base_options = []
def __repr__(self):
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index cb4b055..5e32ace 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -28,11 +28,11 @@ from .compilers import (
)
class CPPCompiler(CCompiler):
- def __init__(self, exelist, version, is_cross, exe_wrap):
+ def __init__(self, exelist, version, is_cross, exe_wrap, **kwargs):
# If a child ObjCPP class has already set it, don't set it ourselves
if not hasattr(self, 'language'):
self.language = 'cpp'
- CCompiler.__init__(self, exelist, version, is_cross, exe_wrap)
+ CCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
def get_display_language(self):
return 'C++'
@@ -66,8 +66,8 @@ class CPPCompiler(CCompiler):
class ClangCPPCompiler(ClangCompiler, CPPCompiler):
- def __init__(self, exelist, version, cltype, is_cross, exe_wrapper=None):
- CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrapper)
+ def __init__(self, exelist, version, cltype, is_cross, exe_wrapper=None, **kwargs):
+ CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwargs)
ClangCompiler.__init__(self, cltype)
default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
self.warn_args = {'1': default_warn_args,
@@ -92,8 +92,8 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
class GnuCPPCompiler(GnuCompiler, CPPCompiler):
- def __init__(self, exelist, version, gcc_type, is_cross, exe_wrap, defines):
- CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap)
+ def __init__(self, exelist, version, gcc_type, is_cross, exe_wrap, defines, **kwargs):
+ CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
GnuCompiler.__init__(self, gcc_type, defines)
default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
self.warn_args = {'1': default_warn_args,
@@ -133,8 +133,8 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
class IntelCPPCompiler(IntelCompiler, CPPCompiler):
- def __init__(self, exelist, version, icc_type, is_cross, exe_wrap):
- CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap)
+ def __init__(self, exelist, version, icc_type, is_cross, exe_wrap, **kwargs):
+ CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, **kwargs)
IntelCompiler.__init__(self, icc_type)
self.lang_header = 'c++-header'
default_warn_args = ['-Wall', '-w3', '-diag-disable:remark',
diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py
index b8a4d13..dd7a433 100644
--- a/mesonbuild/compilers/cs.py
+++ b/mesonbuild/compilers/cs.py
@@ -19,9 +19,9 @@ from ..mesonlib import EnvironmentException
from .compilers import Compiler, mono_buildtype_args
class MonoCompiler(Compiler):
- def __init__(self, exelist, version):
+ def __init__(self, exelist, version, **kwargs):
self.language = 'cs'
- super().__init__(exelist, version)
+ super().__init__(exelist, version, **kwargs)
self.id = 'mono'
self.monorunner = 'mono'
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 9739f28..9681a9f 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -42,9 +42,9 @@ d_feature_args = {'gcc': {'unittest': '-funittest',
}
class DCompiler(Compiler):
- def __init__(self, exelist, version, is_cross):
+ def __init__(self, exelist, version, is_cross, **kwargs):
self.language = 'd'
- super().__init__(exelist, version)
+ super().__init__(exelist, version, **kwargs)
self.id = 'unknown'
self.is_cross = is_cross
@@ -224,8 +224,8 @@ class DCompiler(Compiler):
class GnuDCompiler(DCompiler):
- def __init__(self, exelist, version, is_cross):
- DCompiler.__init__(self, exelist, version, is_cross)
+ def __init__(self, exelist, version, is_cross, **kwargs):
+ DCompiler.__init__(self, exelist, version, is_cross, **kwargs)
self.id = 'gcc'
default_warn_args = ['-Wall', '-Wdeprecated']
self.warn_args = {'1': default_warn_args,
@@ -267,8 +267,8 @@ class GnuDCompiler(DCompiler):
class LLVMDCompiler(DCompiler):
- def __init__(self, exelist, version, is_cross):
- DCompiler.__init__(self, exelist, version, is_cross)
+ def __init__(self, exelist, version, is_cross, **kwargs):
+ DCompiler.__init__(self, exelist, version, is_cross, **kwargs)
self.id = 'llvm'
self.base_options = ['b_coverage', 'b_colorout']
@@ -321,8 +321,8 @@ class LLVMDCompiler(DCompiler):
class DmdDCompiler(DCompiler):
- def __init__(self, exelist, version, is_cross):
- DCompiler.__init__(self, exelist, version, is_cross)
+ def __init__(self, exelist, version, is_cross, **kwargs):
+ DCompiler.__init__(self, exelist, version, is_cross, **kwargs)
self.id = 'dmd'
self.base_options = ['b_coverage', 'b_colorout']
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 8deb8ea..1b42bfa 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -31,9 +31,9 @@ from .compilers import (
)
class FortranCompiler(Compiler):
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs):
self.language = 'fortran'
- super().__init__(exelist, version)
+ super().__init__(exelist, version, **kwargs)
self.is_cross = is_cross
self.exe_wrapper = exe_wrapper
# Not really correct but I don't have Fortran compilers to test with. Sorry.
@@ -149,8 +149,8 @@ end program prog
class GnuFortranCompiler(FortranCompiler):
- def __init__(self, exelist, version, gcc_type, is_cross, exe_wrapper=None, defines=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, gcc_type, is_cross, exe_wrapper=None, defines=None, **kwargs):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwargs)
self.gcc_type = gcc_type
self.defines = defines or {}
self.id = 'gcc'
@@ -181,8 +181,8 @@ class GnuFortranCompiler(FortranCompiler):
class G95FortranCompiler(FortranCompiler):
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'g95'
def get_module_outdir_args(self, path):
@@ -205,8 +205,8 @@ class G95FortranCompiler(FortranCompiler):
class SunFortranCompiler(FortranCompiler):
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'sun'
def get_dependency_gen_args(self, outtarget, outfile):
@@ -228,9 +228,9 @@ class SunFortranCompiler(FortranCompiler):
class IntelFortranCompiler(IntelCompiler, FortranCompiler):
std_warn_args = ['-warn', 'all']
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
self.file_suffixes = ('f90', 'f', 'for', 'ftn', 'fpp')
- FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper)
+ FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags)
# FIXME: Add support for OS X and Windows in detect_fortran_compiler so
# we are sent the type of compiler
IntelCompiler.__init__(self, ICC_STANDARD)
@@ -246,8 +246,8 @@ class IntelFortranCompiler(IntelCompiler, FortranCompiler):
class PathScaleFortranCompiler(FortranCompiler):
std_warn_args = ['-fullwarn']
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'pathscale'
def get_module_outdir_args(self, path):
@@ -259,8 +259,8 @@ class PathScaleFortranCompiler(FortranCompiler):
class PGIFortranCompiler(FortranCompiler):
std_warn_args = ['-Minform=inform']
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'pgi'
def get_module_incdir_args(self):
@@ -279,8 +279,8 @@ class PGIFortranCompiler(FortranCompiler):
class Open64FortranCompiler(FortranCompiler):
std_warn_args = ['-fullwarn']
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'open64'
def get_module_outdir_args(self, path):
@@ -293,8 +293,8 @@ class Open64FortranCompiler(FortranCompiler):
class NAGFortranCompiler(FortranCompiler):
std_warn_args = []
- def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- super().__init__(exelist, version, is_cross, exe_wrapper=None)
+ def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
+ super().__init__(exelist, version, is_cross, exe_wrapper=None, **kwags)
self.id = 'nagfor'
def get_module_outdir_args(self, path):
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index cf7df5e..d4a91a7 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from . import mlog
import pickle, os, uuid
import sys
from pathlib import PurePath
@@ -148,6 +149,9 @@ class UserArrayOption(UserOption):
newvalue = ast.literal_eval(value)
else:
newvalue = [v.strip() for v in value.split(',')]
+ if len(set(newvalue)) != len(newvalue):
+ mlog.log(mlog.red('DEPRECATION:'), '''Duplicated values in an array type is deprecated.
+This will become a hard error in the future.''')
if not isinstance(newvalue, list):
raise MesonException('"{0}" should be a string array, but it is not'.format(str(newvalue)))
for i in newvalue:
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index ce9313e..6ffa42a 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -804,7 +804,7 @@ class CupsDependency(ExternalDependency):
self.type_name = 'config-tool'
self.version = ctdep.version
self.compile_args = ctdep.get_config_value(['--cflags'], 'compile_args')
- self.link_args = ctdep.get_config_value(['--libs'], 'link_args')
+ self.link_args = ctdep.get_config_value(['--ldflags', '--libs'], 'link_args')
self.is_found = True
return
except Exception as e:
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 0cb1450..858d31d 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -496,6 +496,7 @@ class Environment:
popen_exceptions[' '.join(compiler + [arg])] = e
continue
version = search_version(out)
+ full_version = out.split('\n', 1)[0]
if 'Free Software Foundation' in out:
defines = self.get_gnu_compiler_defines(compiler)
if not defines:
@@ -504,7 +505,7 @@ class Environment:
gtype = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
cls = GnuCCompiler if lang == 'c' else GnuCPPCompiler
- return cls(ccache + compiler, version, gtype, is_cross, exe_wrap, defines)
+ return cls(ccache + compiler, version, gtype, is_cross, exe_wrap, defines, full_version=full_version)
if 'clang' in out:
if 'Apple' in out or mesonlib.for_darwin(want_cross, self):
cltype = CLANG_OSX
@@ -513,7 +514,7 @@ class Environment:
else:
cltype = CLANG_STANDARD
cls = ClangCCompiler if lang == 'c' else ClangCPPCompiler
- return cls(ccache + compiler, version, cltype, is_cross, exe_wrap)
+ return cls(ccache + compiler, version, cltype, is_cross, exe_wrap, full_version=full_version)
if 'Microsoft' in out or 'Microsoft' in err:
# Latest versions of Visual Studio print version
# number to stderr but earlier ones print version
@@ -532,7 +533,7 @@ class Environment:
# TODO: add microsoft add check OSX
inteltype = ICC_STANDARD
cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler
- return cls(ccache + compiler, version, inteltype, is_cross, exe_wrap)
+ return cls(ccache + compiler, version, inteltype, is_cross, exe_wrap, full_version=full_version)
self._handle_exceptions(popen_exceptions, compilers)
def detect_c_compiler(self, want_cross):
@@ -555,6 +556,7 @@ class Environment:
continue
version = search_version(out)
+ full_version = out.split('\n', 1)[0]
if 'GNU Fortran' in out:
defines = self.get_gnu_compiler_defines(compiler)
@@ -563,29 +565,29 @@ class Environment:
continue
gtype = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
- return GnuFortranCompiler(compiler, version, gtype, is_cross, exe_wrap, defines)
+ return GnuFortranCompiler(compiler, version, gtype, is_cross, exe_wrap, defines, full_version=full_version)
if 'G95' in out:
- return G95FortranCompiler(compiler, version, is_cross, exe_wrap)
+ return G95FortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'Sun Fortran' in err:
version = search_version(err)
- return SunFortranCompiler(compiler, version, is_cross, exe_wrap)
+ return SunFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'ifort (IFORT)' in out:
- return IntelFortranCompiler(compiler, version, is_cross, exe_wrap)
+ return IntelFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'PathScale EKOPath(tm)' in err:
- return PathScaleFortranCompiler(compiler, version, is_cross, exe_wrap)
+ return PathScaleFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'PGI Compilers' in out:
- return PGIFortranCompiler(compiler, version, is_cross, exe_wrap)
+ return PGIFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'Open64 Compiler Suite' in err:
- return Open64FortranCompiler(compiler, version, is_cross, exe_wrap)
+ return Open64FortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
if 'NAG Fortran' in err:
- return NAGFortranCompiler(compiler, version, is_cross, exe_wrap)
+ return NAGFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version)
self._handle_exceptions(popen_exceptions, compilers)
def get_scratch_dir(self):
@@ -665,8 +667,9 @@ class Environment:
except OSError:
raise EnvironmentException('Could not execute C# compiler "%s"' % ' '.join(exelist))
version = search_version(out)
+ full_version = out.split('\n', 1)[0]
if 'Mono' in out:
- return MonoCompiler(exelist, version)
+ return MonoCompiler(exelist, version, full_version=full_version)
raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')
def detect_vala_compiler(self):
@@ -721,12 +724,13 @@ class Environment:
except OSError:
raise EnvironmentException('Could not execute D compiler "%s"' % ' '.join(exelist))
version = search_version(out)
+ full_version = out.split('\n', 1)[0]
if 'LLVM D compiler' in out:
- return compilers.LLVMDCompiler(exelist, version, is_cross)
+ return compilers.LLVMDCompiler(exelist, version, is_cross, full_version=full_version)
elif 'gdc' in out:
- return compilers.GnuDCompiler(exelist, version, is_cross)
+ return compilers.GnuDCompiler(exelist, version, is_cross, full_version=full_version)
elif 'Digital Mars' in out:
- return compilers.DmdDCompiler(exelist, version, is_cross)
+ return compilers.DmdDCompiler(exelist, version, is_cross, full_version=full_version)
raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')
def detect_swift_compiler(self):
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index cbf1413..93f4b1a 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2021,7 +2021,11 @@ to directly access options of other subprojects.''')
continue
else:
raise
- mlog.log('Native %s compiler: ' % comp.get_display_language(), mlog.bold(' '.join(comp.get_exelist())), ' (%s %s)' % (comp.id, comp.version), sep='')
+ if comp.full_version is not None:
+ version_string = ' (%s %s "%s")' % (comp.id, comp.version, comp.full_version)
+ else:
+ version_string = ' (%s %s)' % (comp.id, comp.version)
+ mlog.log('Native %s compiler: ' % comp.get_display_language(), mlog.bold(' '.join(comp.get_exelist())), version_string, sep='')
if not comp.get_language() in self.coredata.external_args:
(preproc_args, compile_args, link_args) = environment.get_args_from_envvars(comp)
self.coredata.external_preprocess_args[comp.get_language()] = preproc_args
diff --git a/test cases/frameworks/21 libwmf/meson.build b/test cases/frameworks/21 libwmf/meson.build
index b39d8f4..1fdce2e 100644
--- a/test cases/frameworks/21 libwmf/meson.build
+++ b/test cases/frameworks/21 libwmf/meson.build
@@ -1,5 +1,10 @@
project('libwmf test', 'c')
+wm = find_program('libwmf-config', required : false)
+if not wm.found()
+ error('MESON_SKIP_TEST: libwmf-config not installed')
+endif
+
libwmf_dep = dependency('libwmf', version : '>= 0.2.8')
libwmf_ver = libwmf_dep.version()
assert(libwmf_ver.split('.').length() > 1, 'libwmf version is "@0@"'.format(libwmf_ver))