diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-20 00:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 00:15:01 +0200 |
| commit | 657836b555ef03c1ad70a855498dee15da19c2dc (patch) | |
| tree | 25402a1b78ac09e70d9994a930590d5274ad9655 /mesonbuild/interpreter.py | |
| parent | d012b5b997e917a971bca1236a065453493c780d (diff) | |
| parent | 5f81d362078ec1f1de97fc55cdbebb69d5e37865 (diff) | |
| download | meson-657836b555ef03c1ad70a855498dee15da19c2dc.zip meson-657836b555ef03c1ad70a855498dee15da19c2dc.tar.gz meson-657836b555ef03c1ad70a855498dee15da19c2dc.tar.bz2 | |
Merge pull request #3223 from sarum9in/rename
Add install_data() rename parameter
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1a1f6b4..029fe59 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1500,7 +1500,7 @@ permitted_kwargs = {'add_global_arguments': {'language'}, 'find_program': {'required', 'native'}, 'generator': {'arguments', 'output', 'depfile', 'capture', 'preserve_path_from'}, 'include_directories': {'is_system'}, - 'install_data': {'install_dir', 'install_mode', 'sources'}, + 'install_data': {'install_dir', 'install_mode', 'rename', 'sources'}, 'install_headers': {'install_dir', 'subdir'}, 'install_man': {'install_dir'}, 'install_subdir': {'exclude_files', 'exclude_directories', 'install_dir', 'install_mode', 'strip_directory'}, @@ -2826,7 +2826,8 @@ root and issuing %s. if not isinstance(install_dir, (str, type(None))): raise InvalidArguments('Keyword argument install_dir not a string.') install_mode = self._get_kwarg_install_mode(kwargs) - data = DataHolder(build.Data(sources, install_dir, install_mode)) + rename = kwargs.get('rename', None) + data = DataHolder(build.Data(sources, install_dir, install_mode, rename)) self.build.data.append(data.held_object) return data |