Commit Graph

9592 Commits

Author SHA1 Message Date
Nirbheek Chauhan adbed4c636 cmake: Do not split CMAKE_PREFIX_PATH with ':' on Windows
This is obviously wrong, since on Windows ':' is in the drive letter.
Causes us to call cmake with `-DCMAKE_PREFIX_PATH=c;\foo\bar`.
2020-08-05 19:57:05 +02:00
Nirbheek Chauhan eeebfded85 Document VS backend from_buildtype behaviour change in release notes
Closes https://github.com/mesonbuild/meson/issues/7438
2020-08-05 16:40:53 +00:00
Michael Hirsch, Ph.D bfddf9cfbc tests/common/227: remove unneeded is_git_checkout 2020-08-04 20:33:47 +00:00
Michael Hirsch 3c02cccd5b tests/common/227: don't have symlink in Git
Windows Git users with symlinks have a constantly dirty repo from
this "a_symlink". This change generates a symlink in the build directory
when the test is run.
2020-08-04 20:33:47 +00:00
Zbigniew Jędrzejewski-Szmek 6006987ce5 "Downgrade" warning when regenerating after version bump
There is nothing to "warn" about, this is a completely routine
occurence. OTOH, when something is corrupted, we should warn. Keep
the red color and "WARNING:" prefix in that case.

Example output:
$ ninja -C build
Regenerating configuration from scratch: Build directory has been generated with Meson version 0.55.999, which is incompatible with current version 0.56.0.
The Meson build system
Version: 0.56.0
...
2020-08-04 17:15:37 +03:00
Simon McVittie 2d218c289a tests: Disable Boost extralib test on macOS
Since upgrading Boost to version 1.73, this test segfaults on macOS
when dynamically linked. Disable it to keep the rest of the CI
reliable.

Mitigates: #7535
Signed-off-by: Simon McVittie <smcv@debian.org>
2020-08-04 13:30:37 +00:00
John Ericson 2447a1132a Capitalize some constants in coredata
I've been getting confused between them and similarly-named other
things, so I figured it was high time to clean this up.
2020-08-04 00:24:05 +03:00
Antony Chan 70edf82c6c Make meson recognize the Qualcomm LLVM toolchain
Meson calls `path/to/clang++ --version` to guess which build toolchain the
user has picked to build the source code. For the Qualcomm LLVM toolchain,
the output have an unusual output as shown below:

```
clang version 8.0.12
Snapdragon LLVM ARM Compiler 8.0.12 (based on llvm.org 7.0+)
Target: arm-unknown-linux-gnueabi
Thread model: posix
Repository: (ssh://git-hexagon-aus.qualcomm.com:...)
InstalledDir: /pkg/qct/software/llvm/release/arm/8.0.12/bin
```

Another unusual pattern is the output of `path/to/ld.qcld --version`:

```
ARM Linker from Snapdragon LLVM ARM Compiler Version 8.0.12
ARM Linker based on LLVM version: 8.0
```

The Meson logic is modified accordingly so that Meson can correctly
determine toolchain as "LLVM aarch64 cross-compiler on GNU/Linux64 OS".

This is the expected output of
`meson --native-file native_file.ini --cross-file cross_file.ini build/aarch64-debug/`:

```
...
C++ compiler for the host machine: ... (clang 8.0.12 "clang version 8.0.12")
C++ linker for the host machine: ... ld.lld 8.0.12
...
```
2020-08-02 10:39:44 -07:00
Dylan Baker 3040f3c8dc
Merge pull request #6597 from dcbaker/full-project-config
Set project and meson options in cross/native files
2020-08-02 10:03:13 -07:00
Ebrahim Byagowi 894623ad5a docs/users: Add HarfBuzz [skip ci]
Proudly a meson user now
2020-08-02 16:36:16 +03:00
Dylan Baker 4d2a17041f run dircondensor.py 2020-08-01 22:00:06 -07:00
Dylan Baker 3a4d8dde52 update version from 0.55. to 0.56 2020-08-01 22:00:06 -07:00
Dylan Baker 591e6e94b9 Put machine file and cmd line parsing in Environment
This creates a full set of option in environment that mirror those in
coredata, this mirroring of the coredata structure is convenient because
lookups int env (such as when initializing compilers) becomes a straight
dict lookup, with no list iteration. It also means that all of the
command line and machine files are read and stored in the correct order
before they're ever accessed, simplifying the logic of using them.
2020-08-01 22:00:06 -07:00
Dylan Baker 5db3860abf push all config-file settings into coredata.set_default_options
This puts all of them together, in the next patch they'll be pulled back
out, but it's convenient to start that refactor by moving them all
there, then moving them into env as a whole.
2020-08-01 22:00:06 -07:00
Dylan Baker 5358765806 mesonlib: Add repr() methods to PerMachine classes
Which is super helpful in debuggers
2020-08-01 22:00:06 -07:00
Dylan Baker 601789cc7c machine-files: deprecate the paths section 2020-08-01 22:00:06 -07:00
Dylan Baker e981798e0b coredata: fix type annotation 2020-08-01 22:00:06 -07:00
Dylan Baker 1ca17dc853 docs/machine-files: Add a section on data types
This attempts to clarify the usage of strings and arrays, as well as
document the boolean type that has been exposed via the project and
built-in options
2020-08-01 22:00:06 -07:00
Dylan Baker 17c8193615 machine-files: give better error messages about using integers 2020-08-01 22:00:06 -07:00
Dylan Baker bbba6a7f36 Allow setting built-in options from cross/native files
This is like the project options, but for meson builtin options.

The only real differences here have to do with the differences between
meson builtin options and project options. Some meson options can be set
on a per-machine basis (build.pkg_config_path vs pkg_config_path) others
can be set on a per-subproject basis, but should inherit the parent
setting.
2020-08-01 22:00:06 -07:00
Dylan Baker af763e093a mconf/mintro: use authoritative list of options from coredata
This splits the directory options and non-directory options into two
dicts, and then merges them later to maintain API.
2020-08-01 22:00:06 -07:00
Alexis Jeandet 46a4557021 Doc: Added clarification on introspection files gen order [skip ci]
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
2020-07-31 19:27:53 +02:00
Dylan Baker 54fb616278 docs/Machine-files: remove duplicate Properties section 2020-07-30 19:34:37 -07:00
Dylan Baker a6164ca5a8 Allow setting project options from cross or native files
This allows adding a `[project options]` section to a cross or native file
that contains the options defined for a project in it's meson_option.txt
file.
2020-07-30 19:34:37 -07:00
Mark Hindley cc201a5396 Support armel/armhf builds on native arm64 hosts. 2020-07-30 12:04:54 -07:00
Xavier Claessens 40c197d524 pkgconfig: Fix various corner cases
See unit tests for the exact scenarios this PR fixes.
2020-07-30 18:59:10 +03:00
Jussi Pakkanen bbf8533a97
Merge pull request #7494 from keszybz/fix-two-warnings
Fix two warnings
2020-07-30 16:39:04 +03:00
Camilo Celis Guzman 8da1b29899 mtest: report failures and overall summary *after* test(s) logs 2020-07-30 16:38:07 +03:00
James Hilliard 1ce4258c21 backends: fix rpath match pattern
Since -Wl,-rpath= is not the only valid rpath ldflags syntax we
need to try and match all valid rpath ldflags.

In addition we should prevent -Wl,--just-symbols from being used to
set rpath due to inconsistent compiler support.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
2020-07-30 16:36:11 +03:00
Zbigniew Jędrzejewski-Szmek 7ef51abfc5 Fix typo 2020-07-28 19:51:58 +02:00
Zbigniew Jędrzejewski-Szmek 1123f4f311 Avoid warning about multiple outputs when building private directory name
Fixup for b4b1a2c5a1.

A warning would be printed for any rule with multiple outputs, for
example:
WARNING: custom_target 'coredump.conf.5' has more than one output! Using the first one.
WARNING: custom_target 'dnssec-trust-anchors.d.5' has more than one output! Using the first one.
WARNING: custom_target 'halt.8' has more than one output! Using the first one.

Fixes https://github.com/systemd/systemd/issues/16461.
2020-07-28 19:51:58 +02:00
Zbigniew Jędrzejewski-Szmek 3dea817a59 Only emit warning about "native:" on projects with minimum required version
'native:' keyword was only added in 0.54. For projects declaring
meson_version >= 0.54, warn, because those projects can and should set
the keyword. For older projects declaring support for older versions,
don't warn and use the default implicitly.

Fixes https://github.com/mesonbuild/meson/issues/6849.
2020-07-28 19:51:58 +02:00
Matthew D. Scholefield bc2338efd3
Describe syntax of `meson configure [skip ci]
This makes it a lot easier for people to quickly figure out how to customize parameter.
2020-07-28 20:47:20 +03:00
Marcel Hollerbach 903d5dd8a7 ninjabackend: check if target has compiler attribute
otherwise we are getting errors like:

Traceback (most recent call last):
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/mesonmain.py", line 131, in run
    return options.run_func(options)
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/msetup.py", line 245, in run
    app.generate()
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/msetup.py", line 159, in generate
    self._generate(env)
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/msetup.py", line 215, in _generate
    intr.backend.generate()
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/backend/ninjabackend.py", line 518, in generate
    self.generate_coverage_rules()
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/backend/ninjabackend.py", line 991, in generate_coverage_rules
    self.generate_coverage_command(e, [])
  File "/usr/local/lib/python3.6/dist-packages/mesonbuild/backend/ninjabackend.py", line 975, in generate_coverage_command
    for compiler in target.compilers.values():
AttributeError: 'RunTarget' object has no attribute 'compilers'

This extends the 109 generatecode test case to also define a test, so
coverage can really detect something.
2020-07-28 17:59:03 +03:00
Jussi Pakkanen 18aff92d7a
Merge pull request #7461 from mensinda/noMoreSetuptools
Remove the setuptools dependency with mesondata.py
2020-07-23 13:01:29 +03:00
Jussi Pakkanen 587e159d6c
Merge pull request #7460 from mensinda/fixDeepcpy
deps: Do not deepcopy internal libraries (fixes #7457)
2020-07-23 12:45:49 +03:00
Nirbheek Chauhan 6e7d548b11 compilers: Cache gnu-mixins has_arguments() checks
want_output gives us the output file. We don't need the file. We just
need the compiler stderr, which is always stored.
2020-07-23 07:39:59 +00:00
Xavier Claessens c016401f95 coredata: Make warning_level per subproject builtin option 2020-07-22 19:19:50 -04:00
Xavier Claessens 6bf61b2a38 visualstudio: warning_level 0 should not map to /W1
In every other compilers level 0 maps to no argument at all.
2020-07-22 15:54:13 -04:00
Nirbheek Chauhan 07e62fb42b Don't spam about usage of rspfiles to stdout
Put it in the log file if necessary. Users don't need to know this.
It's very spammy.
2020-07-22 10:11:09 -04:00
Nirbheek Chauhan 84928888e1 vim: Syntax-highlight continue and break statements 2020-07-22 05:06:27 +00:00
cmcneish a7a6a4833f
Add boost_root support to properties files (#7210)
* Add boost_root support to properties files

This commit implements `boost_root`, `boost_includedir`, and
`boost_librarydir` variable support to native and cross properties
files. The search order is currently environment variables, then
these variables, and finally a platform-dependent search.

* Add preliminary boost_root / boost_includedir tests

Each test contains a fake "version.hpp", as that's how boost detection is
currently being done. We look for this file relative to the root directory,
which probably shouldn't be allowed (it previously was for BOOST_LIBRARYDIR
but not for BOOST_ROOT). It also cannot help with breakage detection in
libraries, however it looks like this wasn't getting tested beforehand.

I've given the two unique version numbers that shouldn't be present in any
stock version of boost (001 and 002).

* Add return type to detect_split_root

* Return empty list when nothing found in BOOST_ROOT, rather than None

* Update boost_root tests

* Create nativefile.ini based on location of run_project_tests.py
* Add fake libraries to ensure boost_librarydir is being used

* Require all search paths for boost to be absolute

* Redo boost search ordering

To better match things like pkg-config, we now look through native/cross files,
then environment variables, then system locations for boost installations.

Path detection does not fall back from one method to the next for properties or
environment variables--if boost_root, boost_librarydir, or boost_includedir is
specified, they must be sufficient to find boost. Likewise for BOOST_ROOT and
friends. pkg-config detection is still optional falling back to system-wide
detection, for Conan.

(Also, fix a typo in test 33's nativefile)

* Correct return type for detect_roots

* Correct boost dependency search order in documentation

* Print debug information for boost library finding, to resolve CI issues

* Handle native/cross file templates in a more consistent way

All tests can now create a `nativefile.ini.in` if they need to use some
parameter that the testing framework knows about but they can't.

* Pass str--rather than PosixPath--to os.path.exists, for Python35

* Look for boost minor versions, rather than boost patch versions in test cases

* Drop fake dylib versions of boost_regex

* Prefer get_env_var to use of os.environ

* Correct error reporting for relative BOOST_ROOT paths

* Bump version this appears in. Also, change "properties file" to "machine file" as that appears to be the more common language.
2020-07-21 16:40:29 +02:00
Xavier Claessens 7f1e9b7492 summary: Wrap lines when printing lists
When a list_sep is provided (e.g. ', ') all items are printed on the
same line, which gets ugly on very long lists (e.g. list of plugins
enabled).
2020-07-21 07:30:37 +00:00
Stéphane Cerveau 8f106a2b9a string: add substring method
This method aims to offer a simple way to 'substring'
an existing string with start and end values.
2020-07-20 20:04:01 -04:00
Jussi Pakkanen 804a71e8f2 Do not add rpaths for static libs. Closes #5191. 2020-07-20 14:14:49 +00:00
wb9688 4974fa39ac
Fix dirs typo in Vala docs [skip ci]
Co-authored-by: wb9688 <wb9688@users.noreply.github.com>
2020-07-19 22:41:36 +03:00
Marc-André Lureau 1c945511eb Print a warning when importing a stabilized module 2020-07-19 17:53:32 +03:00
Marc-André Lureau aa0d75deae Stabilize keyval module
We have experimented with the module for about a year in a qemu
branch (https://wiki.qemu.org/Features/Meson), and we would like to
start moving the build system to meson. For that, keyval should have
the stability guarantees.

Cc: Paolo Bonzini <pbonzini@redhat.com>
2020-07-19 17:53:32 +03:00
James Hilliard 998c78fb0a coredata: add missing EnvironmentException import
Fixes:
NameError: name 'EnvironmentException' is not defined

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
2020-07-19 15:26:59 +03:00
Elliot Haisley 063b74ebba fix msvc not recognising b_ndebug
fixes #7404
2020-07-19 15:26:30 +03:00