From e006e2ee993b3922eadbdb6abac72b9b580ce487 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 15 Sep 2021 13:09:55 -0400 Subject: [PATCH] Fix ignored install_tag kwarg in install_subdir() Fixes: #9263 --- mesonbuild/backend/backends.py | 2 +- test cases/unit/98 install all targets/custom_files/data.txt | 1 + test cases/unit/98 install all targets/meson.build | 4 ++++ unittests/allplatformstests.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 test cases/unit/98 install all targets/custom_files/data.txt diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 0ebc1f7f3..4570b0033 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 000000000..557db03de --- /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 d186eb7a4..2189f1ac1 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 5b98aa75e..524f0d01b 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')),