Skip to content

Commit f6b0d8b

Browse files
author
github-actions
committed
Update
1 parent db016cb commit f6b0d8b

File tree

804 files changed

+987
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

804 files changed

+987
-823
lines changed

Commands.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ <h3 id="devenv">devenv</h3>
10711071
</code></pre>
10721072
<h3 id="format">format</h3>
10731073
<p><em>(since 1.5.0)</em></p>
1074-
<pre><code class="language-inc">$ meson format [-h] [-q | -i] [-r] [-c meson.format] [-e] [-o OUTPUT]
1074+
<pre><code class="language-inc">$ meson format [-h] [-q | -d | -i] [-r] [-c meson.format] [-e] [-o OUTPUT]
10751075
[--source-file-path SOURCE_FILE_PATH]
10761076
[sources ...]
10771077
</code></pre>
@@ -1082,8 +1082,10 @@ <h3 id="format">format</h3>
10821082

10831083
options:
10841084
-h, --help show this help message and exit
1085-
-q, --check-only exit with 1 if files would be modified
1086-
by meson format
1085+
-q, --check-only silently exit with 1 if files would be
1086+
modified by meson format
1087+
-d, --check-diff exit with 1 and show diff if files would
1088+
be modified by meson format
10871089
-i, --inplace format files in-place
10881090
-r, --recursive recurse subdirs (requires --check-only
10891091
or --inplace option)
@@ -1147,6 +1149,8 @@ <h3 id="format">format</h3>
11471149
or <code>--inline</code> arguments.</p>
11481150
<p><em>Since 1.9.0</em> Using <code>-</code> as source file with <code>--editor-config</code> now requires
11491151
<code>--source-file-path</code> argument to ensure consistent results.</p>
1152+
<p><em>Since 1.10.0</em> When <code>--check-diff</code> is specified, instead of silently exiting
1153+
with an error code, <code>meson format</code> will print a diff of the formatting changes.</p>
11501154
<h4 id="differences-with-muon-fmt">Differences with <code>muon fmt</code>
11511155
</h4>
11521156
<p>The <code>meson format</code> command should be compatible with the <code>muon fmt</code> command.

Reference-manual.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ <h2 id="functions">Functions</h2>
323323
<li><a href="Reference-manual_functions.html#jar"><ins><code>jar()</code></ins></a></li>
324324
<li><a href="Reference-manual_functions.html#join_paths"><ins><code>join_paths()</code></ins></a></li>
325325
<li><a href="Reference-manual_functions.html#library"><ins><code>library()</code></ins></a></li>
326+
<li><a href="Reference-manual_functions.html#local_program"><ins><code>local_program()</code></ins></a></li>
326327
<li><a href="Reference-manual_functions.html#message"><ins><code>message()</code></ins></a></li>
327328
<li><a href="Reference-manual_functions.html#project"><ins><code>project()</code></ins></a></li>
328329
<li><a href="Reference-manual_functions.html#range"><ins><code>range()</code></ins></a></li>

Reference-manual_functions.html

Lines changed: 163 additions & 35 deletions
Large diffs are not rendered by default.

Reference-manual_returned_external_program.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ <h2 id="returned-by">Returned by</h2>
218218
<p>External program objects are returned by the following functions and methods:</p>
219219
<ul>
220220
<li><a href="Reference-manual_functions.html#find_program"><ins><code>find_program()</code></ins></a></li>
221+
<li><a href="Reference-manual_functions.html#local_program"><ins><code>local_program()</code></ins></a></li>
221222
</ul>
222223
<h2 id="external-program-methods">External program methods</h2>
223224
<p style="padding: 7.5px; margin: 0px;"></p>

Release-notes-for-1-10-0.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,23 @@ <h2 id="methods-from-compiler-object-now-accept-strings-for-include_directories"
244244
now accept stings or array of strings, in addition to <a href="Reference-manual_returned_inc.html"><ins><code>inc</code></ins></a> objects
245245
generated from <a href="Reference-manual_functions.html#include_directories"><ins><code>include_directories()</code></ins></a> function, as it was already the case for
246246
<a href="Reference-manual_functions.html#build_target"><ins><code>build_target()</code></ins></a> family of functions.</p>
247+
<h2 id="meson-format-has-a-new-checkdiff-option">
248+
<code>meson format</code> has a new <code>--check-diff</code> option</h2>
249+
<p>When using <code>meson format --check-only</code> to verify formatting in CI, it would
250+
previously silently exit with an error code if the code was not formatted
251+
correctly.</p>
252+
<p>A new <code>--check-diff</code> option has been added which will instead print a diff of
253+
the required changes and then exit with an error code.</p>
254+
<h2 id="new-local_program-function">New <a href="Reference-manual_functions.html#local_program"><ins><code>local_program()</code></ins></a> function</h2>
255+
<p>Similar to <a href="Reference-manual_functions.html#find_program"><ins><code>find_program()</code></ins></a>, but only work with a program that exists in
256+
source tree, or a built target. Meson will not look for the program in the
257+
system or in a subproject.</p>
258+
<p>In addition, <code>depends</code> keyword argument can be specified in case the program
259+
depends on built targets, for example a Python script could require a compiled
260+
C module. If any such dependency is present, the program can only be used in
261+
build-time commands (e.g. <a href="Reference-manual_functions.html#custom_target"><ins><code>custom_target()</code></ins></a>).</p>
262+
<p>The program can be passed to <a href="Reference-manual_builtin_meson.html#mesonoverride_find_program"><ins><code>meson.override_find_program()</code></ins></a> and used in
263+
subprojects.</p>
247264
<h2 id="common-cargolock-for-all-cargo-subprojects">Common <code>Cargo.lock</code> for all Cargo subprojects</h2>
248265
<p>Whenever Meson finds a <code>Cargo.lock</code> file in the toplevel directory
249266
of the project, it will use it to resolve the versions of Cargo

assets/js/search/ABI

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"ABI","urls":[{"url":"ARM-performance-test.html#measurements","node_type":"p","page":"Arm performance test","sections":["Arm performance test","Measurements"],"context":{"gi-language":["default"]}},{"url":"Build-targets.html#object-files","node_type":"p","page":"Build targets","sections":["Build targets","Object files"],"context":{"gi-language":["default"]}},{"url":"D.html#compiling-d-libraries-and-installing-them","node_type":"p","page":"D","sections":["Compiling D libraries and installing them"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments10","node_type":"table","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments11","node_type":"table","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments20","node_type":"table","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments36","node_type":"table","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments38","node_type":"table","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments45","node_type":"table","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments46","node_type":"table","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments47","node_type":"table","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_link_language","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_rust_abi","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_link_language","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_rust_abi","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#executable_link_language","node_type":"p","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#executable_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#jar_link_language","node_type":"p","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#jar_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_link_language","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_link_language","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_link_language","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_rust_abi","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_link_language","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-3-0.html#deprecated-rust_crate_type-and-replaced-by-rust_abi","node_type":"p","page":"Release 1.3.0","sections":["New features","Deprecated rust_crate_type and replaced by rust_abi\n"],"context":{"gi-language":["default"]}},{"url":"Vala.html#adding-to-valas-search-path","node_type":"p","page":"Vala","sections":["Compiling Vala applications and libraries","Using libraries","Adding to Vala's search path"],"context":{"gi-language":["default"]}},{"url":"Vala.html#using-libraries","node_type":"p","page":"Vala","sections":["Compiling Vala applications and libraries","Using libraries"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"ABI","urls":[{"url":"ARM-performance-test.html#measurements","node_type":"p","page":"Arm performance test","sections":["Arm performance test","Measurements"],"context":{"gi-language":["default"]}},{"url":"Build-targets.html#object-files","node_type":"p","page":"Build targets","sections":["Build targets","Object files"],"context":{"gi-language":["default"]}},{"url":"D.html#compiling-d-libraries-and-installing-them","node_type":"p","page":"D","sections":["Compiling D libraries and installing them"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments10","node_type":"table","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments11","node_type":"table","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments20","node_type":"table","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments36","node_type":"table","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments38","node_type":"table","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments46","node_type":"table","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments47","node_type":"table","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#arguments48","node_type":"table","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_link_language","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_rust_abi","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#both_libraries_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","both_libraries()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_link_language","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_rust_abi","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#build_target_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","build_target()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#executable_link_language","node_type":"p","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#executable_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","executable()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#jar_link_language","node_type":"p","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#jar_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","jar()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_link_language","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_link_language","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","shared_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_link_language","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_rust_abi","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#shared_module_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","shared_module()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_link_language","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_rust_abi","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#static_library_rust_crate_type","node_type":"p","page":"Functions","sections":["Functions","static_library()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-3-0.html#deprecated-rust_crate_type-and-replaced-by-rust_abi","node_type":"p","page":"Release 1.3.0","sections":["New features","Deprecated rust_crate_type and replaced by rust_abi\n"],"context":{"gi-language":["default"]}},{"url":"Vala.html#adding-to-valas-search-path","node_type":"p","page":"Vala","sections":["Compiling Vala applications and libraries","Using libraries","Adding to Vala's search path"],"context":{"gi-language":["default"]}},{"url":"Vala.html#using-libraries","node_type":"p","page":"Vala","sections":["Compiling Vala applications and libraries","Using libraries"],"context":{"gi-language":["default"]}}]});

assets/js/search/Accepts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"Accepts","urls":[{"url":"Reference-manual_functions.html#arguments40","node_type":"table","page":"Functions","sections":["Functions","project()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#project_default_options","node_type":"p","page":"Functions","sections":["Functions","project()","Arguments"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"Accepts","urls":[{"url":"Reference-manual_functions.html#arguments41","node_type":"table","page":"Functions","sections":["Functions","project()","Arguments"],"context":{"gi-language":["default"]}},{"url":"Reference-manual_functions.html#project_default_options","node_type":"p","page":"Functions","sections":["Functions","project()","Arguments"],"context":{"gi-language":["default"]}}]});

0 commit comments

Comments
 (0)