diff options
author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-07-16 12:38:29 +0200 |
---|---|---|
committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-07-16 12:39:12 +0200 |
commit | 3d3377e7e830d2958128cd2b9e177a6b9d9ba981 (patch) | |
tree | 68510b35918b88b8990c049bf95166b8cb281537 | |
parent | 512113a8c65e18c2e11dca74fd47b8a1a811befe (diff) |
build-tools: enable build of external tools
-rw-r--r-- | cerbero/bootstrap/build_tools.py | 2 | ||||
-rw-r--r-- | cerbero/config.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py index f797885..24e4ffa 100644 --- a/cerbero/bootstrap/build_tools.py +++ b/cerbero/bootstrap/build_tools.py @@ -56,6 +56,7 @@ class BuildTools (BootstraperBase): not self.config.prefix_is_executable(): # For glib-mkenums and glib-genmarshal self.BUILD_TOOLS.append('glib-tools') + self.BUILD_TOOLS += self.config.extra_build_tools def start(self): # Use a common prefix for the build tools for all the configurations @@ -70,6 +71,7 @@ class BuildTools (BootstraperBase): config.build_tools_sources = self.config.build_tools_sources config.cache_file = self.config.build_tools_cache config.build_tools_cache = self.config.build_tools_cache + config.external_recipes = self.config.external_recipes if not os.path.exists(config.prefix): os.makedirs(config.prefix) diff --git a/cerbero/config.py b/cerbero/config.py index a55f56b..387904b 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -79,7 +79,7 @@ class Config (object): 'universal_archs', 'osx_target_sdk_version', 'variants', 'build_tools_prefix', 'build_tools_sources', 'build_tools_cache', 'home_dir', 'recipes_commits', - 'ios_platform'] + 'ios_platform', 'extra_build_tools'] def __init__(self): self._check_uninstalled() @@ -288,6 +288,7 @@ class Config (object): self.set_property('build_tools_sources', None) self.set_property('build_tools_cache', None) self.set_property('recipes_commits', {}) + self.set_property('extra_build_tools', {}) def set_property(self, name, value, force=False): if name not in self._properties: |