diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2018-05-07 19:02:06 +0200 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-06-08 21:07:22 +0000 |
| commit | 130bfbb84e0de2c2289b9dd708b3f79682d140f4 (patch) | |
| tree | 18ba1a0f4d81d2a557c6d54e918ba47dffa6715e /buildstream/_project.py | |
| parent | ccec163b06193b3c21ab0d571d76b72856f0ea55 (diff) | |
| download | buildstream-130bfbb84e0de2c2289b9dd708b3f79682d140f4.tar.gz | |
Handle cross junction elements in workspaces.
Workspaces are now index by colon separated junction path. This
now allows to create workspaces for elements in external projects.
Workspaces are owned by context instead of root project. However
it is initialized once top-level project is registered as we need
to resolve paths relatively to this top-level project.
Part of #359.
Diffstat (limited to 'buildstream/_project.py')
| -rw-r--r-- | buildstream/_project.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py index 25ffaf6d2..9f42bf613 100644 --- a/buildstream/_project.py +++ b/buildstream/_project.py @@ -34,7 +34,6 @@ from ._elementfactory import ElementFactory from ._sourcefactory import SourceFactory from ._projectrefs import ProjectRefs, ProjectRefStorage from ._versions import BST_FORMAT_VERSION -from ._workspaces import Workspaces # The separator we use for user specified aliases @@ -87,7 +86,6 @@ class Project(): self.refs = ProjectRefs(self.directory, 'project.refs') self.junction_refs = ProjectRefs(self.directory, 'junction.refs') - self.workspaces = None # Workspaces self.options = None # OptionPool self.junction = junction # The junction Element object, if this is a subproject self.fail_on_overlap = False # Whether overlaps are treated as errors @@ -301,9 +299,6 @@ class Project(): # Load artifacts pull/push configuration for this project self.artifact_cache_specs = ArtifactCache.specs_from_config_node(config) - # Workspace configurations - self.workspaces = Workspaces(self) - # Plugin origins and versions origins = _yaml.node_get(config, list, 'plugins', default_value=[]) for origin in origins: |