diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-20 15:45:32 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-03-20 15:51:04 +0200 |
| commit | 29fa1dd52289ea3141c251f66b70bf660c7724e1 (patch) | |
| tree | e0dd85f14047939bc37510e1210217df1cda678b /interpreter.py | |
| parent | df357211a81a63919c64336ce7e4cc373a744e74 (diff) | |
| download | meson-29fa1dd52289ea3141c251f66b70bf660c7724e1.zip meson-29fa1dd52289ea3141c251f66b70bf660c7724e1.tar.gz meson-29fa1dd52289ea3141c251f66b70bf660c7724e1.tar.bz2 | |
Add support for checking out git repos to subprojects automatically.
Diffstat (limited to 'interpreter.py')
| -rw-r--r-- | interpreter.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/interpreter.py b/interpreter.py index dfb42e6..98875ce 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1015,14 +1015,11 @@ class Interpreter(): if dirname == self.subprojects: return self.subprojects[dirname] subdir = os.path.join('subprojects', dirname) - abs_subdir = os.path.join(self.build.environment.get_source_dir(), subdir) - if not os.path.isdir(abs_subdir): - r = wrap.Resolver(os.path.join(self.build.environment.get_source_dir(), 'subprojects')) - resolved = r.resolve(dirname) - if resolved is None: - raise InterpreterException('Subproject directory does not exist and can not be downloaded.') - subdir = os.path.join('subprojects', resolved) - abs_subdir = os.path.join(self.build.environment.get_source_dir(), 'subprojects', subdir) + r = wrap.Resolver(os.path.join(self.build.environment.get_source_dir(), 'subprojects')) + resolved = r.resolve(dirname) + if resolved is None: + raise InterpreterException('Subproject directory does not exist and can not be downloaded.') + subdir = os.path.join('subprojects', resolved) os.makedirs(os.path.join(self.build.environment.get_build_dir(), subdir), exist_ok=True) self.global_args_frozen = True mlog.log('\nExecuting subproject ', mlog.bold(dirname), '.\n', sep='') |