diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-05-28 13:22:57 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-06-21 23:39:12 +0300 |
commit | e353b2e8d48c8ffce579342fac9ccfc62127bec8 (patch) | |
tree | 0aaf8f6f46ade428317a5cfe8013fda4cb31479a /docs | |
parent | 246e5437aaf213401a22361a55c46e70a4eb505d (diff) | |
download | meson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.zip meson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.tar.gz meson-e353b2e8d48c8ffce579342fac9ccfc62127bec8.tar.bz2 |
wrap: Add patch_directory support
Copy a tree instead of extracting an archive.
Closes: #7216
Diffstat (limited to 'docs')
-rw-r--r-- | docs/markdown/Wrap-dependency-system-manual.md | 3 | ||||
-rw-r--r-- | docs/markdown/snippets/wrap_patch.md | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md index 868263c..f6c658f 100644 --- a/docs/markdown/Wrap-dependency-system-manual.md +++ b/docs/markdown/Wrap-dependency-system-manual.md @@ -79,6 +79,9 @@ revision = head - `patch_fallback_url` - fallback URL to be used when download from `patch_url` fails *Since: 0.55.0* - `patch_filename` - filename of the downloaded overlay archive - `patch_hash` - sha256 checksum of the downloaded overlay archive +- `patch_directory` - *Since 0.55.0* Overlay directory, alternative to `patch_filename` in the case + files are local instead of a downloaded archive. The directory must be placed in + `subprojects/packagefiles`. - `lead_directory_missing` - for `wrap-file` create the leading directory name. Needed when the source file does not have a leading directory. diff --git a/docs/markdown/snippets/wrap_patch.md b/docs/markdown/snippets/wrap_patch.md index 7d6d9c2..d5a1f5f 100644 --- a/docs/markdown/snippets/wrap_patch.md +++ b/docs/markdown/snippets/wrap_patch.md @@ -4,3 +4,11 @@ It is now possible to use the `patch_filename` and `source_filename` value in a `.wrap` file without `*_url` to specify a local source / patch file. All local files must be located in the `subprojects/packagefiles` directory. The `*_hash` entries are optional with this setup. + +## Local wrap patch directory + +Wrap files can now specify `patch_directory` instead of `patch_filename` in the +case overlay files are local. Every files in that directory, and subdirectories, +will be copied to the subproject directory. This can be used for example to add +`meson.build` files to a project not using Meson build system upstream. +The patch directory must be placed in `subprojects/packagefiles` directory. |