diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | docs/markdown/Getting-meson.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Overview.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Users.md | 5 | ||||
| -rw-r--r-- | docs/markdown/tmp.json | 29 | ||||
| -rw-r--r-- | docs/sitemap.txt | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 |
7 files changed, 10 insertions, 35 deletions
@@ -21,4 +21,5 @@ packagecache /dist /meson.egg-info -hotdoc-private* +/docs/built_docs +/docs/hotdoc-private* diff --git a/docs/markdown/Getting-meson.md b/docs/markdown/Getting-meson.md index c01a947..d654ff3 100644 --- a/docs/markdown/Getting-meson.md +++ b/docs/markdown/Getting-meson.md @@ -12,7 +12,7 @@ The newest development code can be obtained directly from [Git] ## Dependencies Meson is implemented in Python 3. If your operating system provides a -package manager, use should install it with that. For platforms that +package manager, you should install it with that. For platforms that don't have a package manager, you need to download it from [Python's home page]. diff --git a/docs/markdown/Overview.md b/docs/markdown/Overview.md index 537aa8f..c9acda5 100644 --- a/docs/markdown/Overview.md +++ b/docs/markdown/Overview.md @@ -6,7 +6,7 @@ short-description: Overview of the Meson build system Meson is a build system that is designed to be as user-friendly as possible without sacrificing performance. The main tool for this is a custom language that the user uses to describe the structure of his build. The main design goals of this language has been simplicity, clarity and conciseness. Much inspiration was drawn from the Python programming language, which is considered very readable, even to people who have not programmed in Python before. -Another main idea has been to provide first class support for modern programming tools and best practices. These include features as varied as unit testing, code coverage reporting, precompiled headers and the like. All of these features should be immediately available to any project using Meson. The user should not need to hunt for third party macros or write shell scripts to get these features. They just just work out of the box. +Another main idea has been to provide first class support for modern programming tools and best practices. These include features as varied as unit testing, code coverage reporting, precompiled headers and the like. All of these features should be immediately available to any project using Meson. The user should not need to hunt for third party macros or write shell scripts to get these features. They should just work out of the box. This power should not come at the expense of limited usability. Many software builds require unorthodox steps. A common example is that you first need to build a custom tool and then use that tool to generate more source code to build. This functionality needs to be supported and be as easy to use as other parts of the system. diff --git a/docs/markdown/Users.md b/docs/markdown/Users.md index 574df27..0d24d6b 100644 --- a/docs/markdown/Users.md +++ b/docs/markdown/Users.md @@ -9,6 +9,7 @@ If you have a project that uses Meson that you want to add to this list, let us - [AQEMU](https://github.com/tobimensch/aqemu), a Qt GUI for QEMU virtual machines, since version 0.9.3 - [Arduino sample project](https://github.com/jpakkane/mesonarduino) - [Emeus](https://github.com/ebassi/emeus), Constraint based layout manager for GTK+ + - [Frida.re](https://github.com/frida/frida-core), a code tracing framework - [GLib](https://github.com/centricular/glib/), cross-platform C library used by GTK+ (not merged yet) - [Gnome Builder](https://git.gnome.org/browse/gnome-builder/), an IDE for the Gnome platform - [Gnome MPV](https://github.com/gnome-mpv/gnome-mpv), Gnome frontend to the mpv video player @@ -19,6 +20,7 @@ If you have a project that uses Meson that you want to add to this list, let us - [Grilo](https://mail.gnome.org/archives/grilo-list/2017-February/msg00000.html) and [Grilo plugins](https://git.gnome.org/browse/grilo-plugins/commit/?id=ea047c4fb63e90268eb795ed91a09a2be5068a4c), the Grilo multimedia framework - [GStreamer](https://cgit.freedesktop.org/gstreamer/gstreamer/), multimedia framework (not the default yet) - [GTK+](https://git.gnome.org/browse/gtk+/log/?h=wip/meson), the multi-platform toolkit used by GNOME (not merged yet) + - [GtkDApp](https://gitlab.com/csoriano/GtkDApp), an application template for developing Flatpak apps with Gtk+ and D - [Json-glib](https://git.gnome.org/browse/json-glib), GLib-based JSON manipulation library - [Libepoxy](https://github.com/anholt/libepoxy/), a library for handling OpenGL function pointer management - [Libgit2-glib](https://git.gnome.org/browse/libgit2-glib/), a GLib wrapper for libgit2 @@ -30,7 +32,8 @@ If you have a project that uses Meson that you want to add to this list, let us - [Pitivi](http://pitivi.org/), a nonlinear video editor - [Polari](https://git.gnome.org/browse/polari), an IRC client - [Sysprof](https://wiki.gnome.org/Apps/Sysprof), a profiling tool - - [systemd](https://github.com/systemd/systemd/pull/5704), the init system (not merged yet) + - [systemd](https://github.com/systemd/systemd/pull/5704), the init system (not the default yet) + - [Xorg](https://cgit.freedesktop.org/xorg/xserver/) the X.org display server (not the default yet) - [Valum](https://github.com/valum-framework/valum), a micro web framework written in Vala - [Wayland and Weston](https://lists.freedesktop.org/archives/wayland-devel/2016-November/031984.html), a next generation display server (not merged yet) - [ZStandard](https://github.com/facebook/zstd/commit/4dca56ed832c6a88108a2484a8f8ff63d8d76d91) a compression algorithm developed at Facebook (not used by default) diff --git a/docs/markdown/tmp.json b/docs/markdown/tmp.json deleted file mode 100644 index 190d12f..0000000 --- a/docs/markdown/tmp.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "functions": { - "add_global_arguments": { - "doc": ["Adds the positional arguments to the compiler command line for the language specified in `language` keyword argument. Note that there is no way to remove an argument set in this way.", - "If you have an argument that is only used in a subset of targets, you have to specify it in per-target flags.", - "The arguments are used in all compiler invocations with the exception of compile tests, because you might need to run a compile test with and without the argument in question. For this reason only the arguments explicitly specified are used during compile tests.", - "**Note:** Usually you should use `add_project_arguments` instead, because that works even when you project is used as a subproject.", - "**Note:** You must pass always arguments individually `arg1, arg2, ...` rather than as a string `'arg1 arg2', ...`"] - "arguments": [ - {"name": "args1", "doc": "Some argument"} - ] - } - } - "objects": [ - "meson": { - "doc": ["The `meson` object allows you to introspect various properties of the system. This object is always mapped in the `meson` variable. It has the following methods."] - "methods": [ - "get_compiler": { - "arguments": [ - {"name": "language", "doc": "returns [an object describing a compiler](#compiler-object), takes one positional argument which is the language to use. ", - "It also accepts one keyword argument, `native` which when set to true makes Meson return the compiler for the build machine (the \"native\" compiler)", - "and when false it returns the host compiler (the \"cross\" compiler). If `native` is omitted, Meson returns the \"cross\" compiler if we're currently", - " cross-compiling and the \"native\" compiler if we're not."} - ] - } - ] - } - ] -} diff --git a/docs/sitemap.txt b/docs/sitemap.txt index 9dceb05..7246749 100644 --- a/docs/sitemap.txt +++ b/docs/sitemap.txt @@ -50,13 +50,13 @@ index.md Reproducible-builds.md howtox.md Wrap-dependency-system-manual.md - fallback-wraptool.md Adding-new-projects-to-wrapdb.md Using-the-WrapDB.md Using-wraptool.md Wrap-best-practices-and-tips.md Wrap-review-guidelines.md Shipping-prebuilt-binaries-as-wraps.md + fallback-wraptool.md Release-notes.md Release-notes-for-0.41.0.md Release-notes-for-0.40.0.md diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e997807..3e0b558 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -202,7 +202,7 @@ class BoostDependency(Dependency): self.lib_modules_mt[modname] = fname def detect_lib_modules_nix(self): - if mesonlib.is_osx(): + if mesonlib.is_osx() and not self.want_cross: libsuffix = 'dylib' else: libsuffix = 'so' |