Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

load_configs: generalise the search path 

Instead of hard-coding the fact that load_configs() searches for files under
meson/native, pass in the subdirectory allowing the cross-file code to use the
same logic.
This commit is contained in:
Ross Burton 2019-03-18 16:16:56 +00:00
parent 44dd5535f0
commit d57dd1092e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/coredata.py
View File

@ -211,8 +211,8 @@ class UserFeatureOption(UserComboOption):
return self.value == 'auto' return self.value == 'auto'
def load_configs(filenames): def load_configs(filenames, subdir):
"""Load native files.""" """Load configuration files from a named subdirectory."""
def gen(): def gen():
for f in filenames: for f in filenames:
f = os.path.expanduser(os.path.expandvars(f)) f = os.path.expanduser(os.path.expandvars(f))
@ -225,7 +225,7 @@ def load_configs(filenames):
os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')), os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share')),
] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':') ] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
for path in paths: for path in paths:
path_to_try = os.path.join(path, 'meson', 'native', f) path_to_try = os.path.join(path, 'meson', subdir, f)
if os.path.isfile(path_to_try): if os.path.isfile(path_to_try):
yield path_to_try yield path_to_try
break break

2
mesonbuild/environment.py
View File

@ -408,7 +408,7 @@ class Environment:
if self.coredata.config_files is not None: if self.coredata.config_files is not None:
config = MesonConfigFile.from_config_parser( config = MesonConfigFile.from_config_parser(
coredata.load_configs(self.coredata.config_files)) coredata.load_configs(self.coredata.config_files, 'native'))
self.binaries.build = BinaryTable(config.get('binaries', {})) self.binaries.build = BinaryTable(config.get('binaries', {}))
self.paths.build = Directories(**config.get('paths', {})) self.paths.build = Directories(**config.get('paths', {}))