aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-01-29 14:46:07 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-04 00:43:00 +0200
commit8fe816101467e66792251b4f57e0ddddb537764a (patch)
tree619898a29c07275a49ecf1a5df87a8cc22f3b799 /mesonbuild/interpreter.py
parentf25070ec089719a607c545c1b44a678c6bbce5c9 (diff)
downloadmeson-8fe816101467e66792251b4f57e0ddddb537764a.zip
meson-8fe816101467e66792251b4f57e0ddddb537764a.tar.gz
meson-8fe816101467e66792251b4f57e0ddddb537764a.tar.bz2
Refactor and simplify install_subdir()
- Pass exclude_files and exclude_directories relative to src_dir, same as specified by user and documented in public install_subdir(). - Make do_copydir() interface similar to do_copyfile(): install src_dir contents to dst_dir. - Remove src_prefix/src_dir code, it adds confusion and duplicates arguments. Use single src_dir parameter instead. - Make callers specify that src_dir contents should be installed under dst_dir/basename(src_dir) if necessary. - Use os.path.relpath() instead of string manipulations on paths. - Add documentation to do_copydir(): specify types and add usage example.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 072994a..9c2a6b9 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2681,7 +2681,7 @@ root and issuing %s.
raise InvalidArguments('Exclude argument not a string.')
elif os.path.isabs(f):
raise InvalidArguments('Exclude argument cannot be absolute.')
- exclude_files = {os.path.join(subdir, f) for f in exclude}
+ exclude_files = set(exclude)
else:
exclude_files = set()
if 'exclude_directories' in kwargs:
@@ -2691,7 +2691,7 @@ root and issuing %s.
raise InvalidArguments('Exclude argument not a string.')
elif os.path.isabs(d):
raise InvalidArguments('Exclude argument cannot be absolute.')
- exclude_directories = {os.path.join(subdir, f) for f in exclude}
+ exclude_directories = set(exclude)
else:
exclude_directories = set()
exclude = (exclude_files, exclude_directories)