diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-09-15 13:09:55 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-09-16 07:53:18 -0400 |
| commit | e006e2ee993b3922eadbdb6abac72b9b580ce487 (patch) | |
| tree | 670940535bb418ad4b569fe36d74c474520960c1 | |
| parent | 59fe80602e95cb9068ed18ad3dd2581029b91a37 (diff) | |
| download | meson-e006e2ee993b3922eadbdb6abac72b9b580ce487.zip meson-e006e2ee993b3922eadbdb6abac72b9b580ce487.tar.gz meson-e006e2ee993b3922eadbdb6abac72b9b580ce487.tar.bz2 | |
Fix ignored install_tag kwarg in install_subdir()
Fixes: #9263
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | test cases/unit/98 install all targets/custom_files/data.txt | 1 | ||||
| -rw-r--r-- | test cases/unit/98 install all targets/meson.build | 4 | ||||
| -rw-r--r-- | unittests/allplatformstests.py | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 0ebc1f7..4570b00 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1700,7 +1700,7 @@ class Backend: if not sd.strip_directory: dst_dir = os.path.join(dst_dir, os.path.basename(src_dir)) dst_name = os.path.join(dst_dir, os.path.basename(src_dir)) - i = SubdirInstallData(src_dir, dst_dir, dst_name, sd.install_mode, sd.exclude, sd.subproject) + i = SubdirInstallData(src_dir, dst_dir, dst_name, sd.install_mode, sd.exclude, sd.subproject, sd.install_tag) d.install_subdirs.append(i) def get_introspection_data(self, target_id: str, target: build.Target) -> T.List['TargetIntrospectionData']: diff --git a/test cases/unit/98 install all targets/custom_files/data.txt b/test cases/unit/98 install all targets/custom_files/data.txt new file mode 100644 index 0000000..557db03 --- /dev/null +++ b/test cases/unit/98 install all targets/custom_files/data.txt @@ -0,0 +1 @@ +Hello World diff --git a/test cases/unit/98 install all targets/meson.build b/test cases/unit/98 install all targets/meson.build index d186eb7..2189f1a 100644 --- a/test cases/unit/98 install all targets/meson.build +++ b/test cases/unit/98 install all targets/meson.build @@ -64,6 +64,10 @@ custom_target('ct2', install_tag: 'custom', install: true, ) +install_subdir('custom_files', + install_dir: get_option('datadir'), + install_tag: 'custom', +) # First is custom, 2nd is devel, 3rd has no tag custom_target('ct3', diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 5b98aa7..524f0d0 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -3857,6 +3857,8 @@ class AllPlatformTests(BasePlatformTests): Path(installpath, 'usr/share/out1-custom.txt'), Path(installpath, 'usr/share/out2-custom.txt'), Path(installpath, 'usr/share/out3-custom.txt'), + Path(installpath, 'usr/share/custom_files'), + Path(installpath, 'usr/share/custom_files/data.txt'), Path(installpath, 'usr/lib'), Path(installpath, 'usr/lib/libbothcustom.a'), Path(installpath, 'usr/' + shared_lib_name('bothcustom')), |