Skip to content

Commit 083ab2e

Browse files
author
github-actions
committed
Update
1 parent 5dfcf66 commit 083ab2e

Some content is hidden

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

41 files changed

+49
-35
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,16 @@ <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="common-cargolock-for-all-cargo-subprojects">Common <code>Cargo.lock</code> for all Cargo subprojects</h2>
248+
<p>Whenever Meson finds a <code>Cargo.lock</code> file in the toplevel directory
249+
of the project, it will use it to resolve the versions of Cargo
250+
subprojects in preference to per-subproject <code>Cargo.lock</code> files.
251+
Per-subproject lock files are only used if the invoking project
252+
did not have a <code>Cargo.lock</code> file itself.</p>
253+
<p>If you wish to experiment with Cargo subprojects, it is recommended
254+
to use <code>cargo</code> to set up <code>Cargo.lock</code> and <code>Cargo.toml</code> files,
255+
encompassing all Rust targets, in the toplevel source directory.
256+
Cargo subprojects remain unstable and subject to change.</p>
247257
<h2 id="added-new-namingscheme-option">Added new <code>namingscheme</code> option</h2>
248258
<p>Traditionally Meson has named output targets so that they don't clash
249259
with each other. This has meant, among other things, that on Windows

assets/js/search/Cargo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"Cargo","urls":[{"url":"Release-notes-for-1-5-0.html#cargo-dependencies-names-now-include-the-api-version","node_type":"h2","page":"Release 1.5.0","sections":["New features","Cargo dependencies names now include the API version"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-6-0.html#cargo-subprojects-is-experimental","node_type":"h2","page":"Release 1.6.0","sections":["New features","Cargo subprojects is experimental"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-7-0.html#caplints-allow-used-for-cargo-subprojects","node_type":"h2","page":"Release 1.7.0","sections":["New features","\n--cap-lints allow used for Cargo subprojects"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-7-0.html#cargo-features-are-resolved-globally","node_type":"h2","page":"Release 1.7.0","sections":["New features","Cargo features are resolved globally"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#cargo-wraps","node_type":"h3","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","\nprovide section","Cargo wraps"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"Cargo","urls":[{"url":"Release-notes-for-1-10-0.html#common-cargolock-for-all-cargo-subprojects","node_type":"h2","page":"Release 1.10.0 (in development)","sections":["New features (in development)","Common Cargo.lock for all Cargo subprojects"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-5-0.html#cargo-dependencies-names-now-include-the-api-version","node_type":"h2","page":"Release 1.5.0","sections":["New features","Cargo dependencies names now include the API version"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-6-0.html#cargo-subprojects-is-experimental","node_type":"h2","page":"Release 1.6.0","sections":["New features","Cargo subprojects is experimental"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-7-0.html#caplints-allow-used-for-cargo-subprojects","node_type":"h2","page":"Release 1.7.0","sections":["New features","\n--cap-lints allow used for Cargo subprojects"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-7-0.html#cargo-features-are-resolved-globally","node_type":"h2","page":"Release 1.7.0","sections":["New features","Cargo features are resolved globally"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#cargo-wraps","node_type":"h3","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","\nprovide section","Cargo wraps"],"context":{"gi-language":["default"]}}]});

assets/js/search/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/search/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"Cargo.toml","urls":[{"url":"Release-notes-for-1-3-0.html#automatic-fallback-to-cmake-and-cargo-subproject","node_type":"ul","page":"Release 1.3.0","sections":["New features","Automatic fallback to cmake and cargo subproject"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-5-0.html#cargo-dependencies-names-now-include-the-api-version","node_type":"ul","page":"Release 1.5.0","sections":["New features","Cargo dependencies names now include the API version"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#accepted-configuration-properties-for-wraps","node_type":"ul","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","Accepted configuration properties for wraps"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#cargo-wraps","node_type":"ul","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","\nprovide section","Cargo wraps"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"Cargo.toml","urls":[{"url":"Release-notes-for-1-10-0.html#common-cargolock-for-all-cargo-subprojects","node_type":"p","page":"Release 1.10.0 (in development)","sections":["New features (in development)","Common Cargo.lock for all Cargo subprojects"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-3-0.html#automatic-fallback-to-cmake-and-cargo-subproject","node_type":"ul","page":"Release 1.3.0","sections":["New features","Automatic fallback to cmake and cargo subproject"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-5-0.html#cargo-dependencies-names-now-include-the-api-version","node_type":"ul","page":"Release 1.5.0","sections":["New features","Cargo dependencies names now include the API version"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#accepted-configuration-properties-for-wraps","node_type":"ul","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","Accepted configuration properties for wraps"],"context":{"gi-language":["default"]}},{"url":"Wrap-dependency-system-manual.html#cargo-wraps","node_type":"ul","page":"Wrap dependency system manual","sections":["Wrap dependency system manual","\nprovide section","Cargo wraps"],"context":{"gi-language":["default"]}}]});

assets/js/search/Common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"Common","urls":[{"url":"Cuda-module.html#nvcc_arch_flags","node_type":"table","page":"Unstable CUDA Module","sections":["Unstable CUDA Module","Functions","nvcc_arch_flags()"],"context":{"gi-language":["default"]}},{"url":"MesonCI.html#common-image-setup","node_type":"h3","page":"Meson CI setup","sections":["Meson CI setup","Docker images","Common image setup"],"context":{"gi-language":["default"]}},{"url":"Quick-guide.html#troubleshooting","node_type":"p","page":"Quickstart Guide","sections":["Using Meson","Troubleshooting:"],"context":{"gi-language":["default"]}},{"url":"Shipping-prebuilt-binaries-as-wraps.html#shipping-prebuilt-binaries-as-wraps","node_type":"p","page":"Shipping prebuilt binaries as wraps","sections":["Shipping prebuilt binaries as wraps"],"context":{"gi-language":["default"]}},{"url":"Tutorial.html#the-humble-beginning","node_type":"p","page":"Tutorial","sections":["Tutorial","The humble beginning"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"Common","urls":[{"url":"Cuda-module.html#nvcc_arch_flags","node_type":"table","page":"Unstable CUDA Module","sections":["Unstable CUDA Module","Functions","nvcc_arch_flags()"],"context":{"gi-language":["default"]}},{"url":"MesonCI.html#common-image-setup","node_type":"h3","page":"Meson CI setup","sections":["Meson CI setup","Docker images","Common image setup"],"context":{"gi-language":["default"]}},{"url":"Quick-guide.html#troubleshooting","node_type":"p","page":"Quickstart Guide","sections":["Using Meson","Troubleshooting:"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-10-0.html#common-cargolock-for-all-cargo-subprojects","node_type":"h2","page":"Release 1.10.0 (in development)","sections":["New features (in development)","Common Cargo.lock for all Cargo subprojects"],"context":{"gi-language":["default"]}},{"url":"Shipping-prebuilt-binaries-as-wraps.html#shipping-prebuilt-binaries-as-wraps","node_type":"p","page":"Shipping prebuilt binaries as wraps","sections":["Shipping prebuilt binaries as wraps"],"context":{"gi-language":["default"]}},{"url":"Tutorial.html#the-humble-beginning","node_type":"p","page":"Tutorial","sections":["Tutorial","The humble beginning"],"context":{"gi-language":["default"]}}]});

assets/js/search/Meson

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

assets/js/search/Per-subproject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
urls_downloaded_cb({"token":"Per-subproject","urls":[{"url":"Release-notes-for-0-63-0.html#persubproject-languages","node_type":"h2","page":"Release 0.63.0","sections":["New features","Per-subproject languages"],"context":{"gi-language":["default"]}}]});
1+
urls_downloaded_cb({"token":"Per-subproject","urls":[{"url":"Release-notes-for-0-63-0.html#persubproject-languages","node_type":"h2","page":"Release 0.63.0","sections":["New features","Per-subproject languages"],"context":{"gi-language":["default"]}},{"url":"Release-notes-for-1-10-0.html#common-cargolock-for-all-cargo-subprojects","node_type":"p","page":"Release 1.10.0 (in development)","sections":["New features (in development)","Common Cargo.lock for all Cargo subprojects"],"context":{"gi-language":["default"]}}]});

0 commit comments

Comments
 (0)