diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-20 01:53:39 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-08-06 03:58:35 -0400 |
| commit | 5cb1d00537afb9d52f89f7b3dc65e01f068fd442 (patch) | |
| tree | 2bb090917941b061187a46345b74dc36a324ac21 /test cases | |
| parent | 58bd1e83b4e24eaab3cf18deb635a057d6bfefb7 (diff) | |
| download | meson-5cb1d00537afb9d52f89f7b3dc65e01f068fd442.tar.gz | |
Allow excluding files from `install_subdir`
The install_subdir command now accepts a new `exclude` keyword argument
that allows specified files to be excluded from the installed
subdirectory.
Diffstat (limited to 'test cases')
6 files changed, 8 insertions, 0 deletions
diff --git a/test cases/common/66 install subdir/installed_files.txt b/test cases/common/66 install subdir/installed_files.txt index a610c510a..e5d230726 100644 --- a/test cases/common/66 install subdir/installed_files.txt +++ b/test cases/common/66 install subdir/installed_files.txt @@ -2,3 +2,5 @@ usr/share/sub1/data1.dat usr/share/sub1/second.dat usr/share/sub1/third.dat usr/share/sub1/sub2/data2.dat +usr/share/sub2/one.dat +usr/share/sub2/dircheck/excluded-three.dat diff --git a/test cases/common/66 install subdir/meson.build b/test cases/common/66 install subdir/meson.build index fed2f8909..18e0eafb8 100644 --- a/test cases/common/66 install subdir/meson.build +++ b/test cases/common/66 install subdir/meson.build @@ -1,5 +1,11 @@ project('install a whole subdir', 'c') +# A subdir with an exclusion: +install_subdir('sub2', + exclude_files : ['excluded-three.dat'], + exclude_directories : ['excluded'], + install_dir : 'share') + subdir('subdir') # A subdir with write perms only for the owner # and read-list perms for owner and group diff --git a/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat b/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat diff --git a/test cases/common/66 install subdir/sub2/excluded-three.dat b/test cases/common/66 install subdir/sub2/excluded-three.dat new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/66 install subdir/sub2/excluded-three.dat diff --git a/test cases/common/66 install subdir/sub2/excluded/two.dat b/test cases/common/66 install subdir/sub2/excluded/two.dat new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/66 install subdir/sub2/excluded/two.dat diff --git a/test cases/common/66 install subdir/sub2/one.dat b/test cases/common/66 install subdir/sub2/one.dat new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test cases/common/66 install subdir/sub2/one.dat |