diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-02 20:46:04 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-02 20:46:04 +0300 |
| commit | 363bc42c5c20d58e155781ffc5cc2694c40eac10 (patch) | |
| tree | 082b14834ecf44f5559e813c900a4df00a81e825 /backends.py | |
| parent | b057b061c3222fb3001e28371a5540623adaf010 (diff) | |
| download | meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.zip meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.tar.gz meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.tar.bz2 | |
Started target out dir refactoring with some clarifying renamings.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/backends.py b/backends.py index 47b39d1..a6f230f 100644 --- a/backends.py +++ b/backends.py @@ -74,7 +74,10 @@ class Backend(): return dirname def get_target_private_dir(self, target): - dirname = os.path.join(self.get_target_dir(target), target.get_basename() + target.type_suffix()) + return os.path.join(self.get_target_dir(target), target.get_basename() + target.type_suffix()) + + def get_target_private_dir_abs(self, target): + dirname = self.get_target_private_dir(target) os.makedirs(os.path.join(self.environment.get_build_dir(), dirname), exist_ok=True) return dirname @@ -87,7 +90,7 @@ class Backend(): language = comp.get_language() suffix = '.' + comp.get_default_suffix() if language not in langlist: - outfilename = os.path.join(self.get_target_private_dir(target), target.name + '-unity' + suffix) + outfilename = os.path.join(self.get_target_private_dir_abs(target), target.name + '-unity' + suffix) outfileabs = os.path.join(self.environment.get_build_dir(), outfilename) outfileabs_tmp = outfileabs + '.tmp' abs_files.append(outfileabs) @@ -167,7 +170,7 @@ class Backend(): def determine_ext_objs(self, extobj, proj_dir_to_build_root=''): result = [] - targetdir = self.get_target_private_dir(extobj.target) + targetdir = self.get_target_private_dir_abs(extobj.target) suffix = '.' + self.environment.get_object_suffix() for osrc in extobj.srclist: osrc_base = osrc.fname @@ -187,7 +190,7 @@ class Backend(): def get_pch_include_args(self, compiler, target): args = [] - pchpath = self.get_target_private_dir(target) + pchpath = self.get_target_private_dir_abs(target) includeargs = compiler.get_include_args(pchpath) for lang in ['c', 'cpp']: p = target.get_pch(lang) |