diff options
author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-08 16:20:41 +0100 |
---|---|---|
committer | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-17 10:10:30 +0100 |
commit | ea4cb0df4d18251584bd9070c203ae7a8223ac46 (patch) | |
tree | da6e0edc5a29766f082ffc09f0fcc82dcc61c68c | |
parent | 514b215d06c35de934321d76527a52c94c10c998 (diff) | |
download | buildstream-ea4cb0df4d18251584bd9070c203ae7a8223ac46.tar.gz |
plugins/elements/compose.py: Convert to virtual directories
-rw-r--r-- | buildstream/plugins/elements/compose.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/buildstream/plugins/elements/compose.py b/buildstream/plugins/elements/compose.py index 0e666c6e5..b6a1a2973 100644 --- a/buildstream/plugins/elements/compose.py +++ b/buildstream/plugins/elements/compose.py @@ -34,7 +34,6 @@ The default configuration and possible options are as such: """ import os -from buildstream import utils from buildstream import Element, Scope @@ -56,6 +55,9 @@ class ComposeElement(Element): # added, to reduce the potential for confusion BST_FORBID_SOURCES = True + # This plugin has been modified to avoid the use of Sandbox.get_directory + BST_VIRTUAL_DIRECTORY = True + def configure(self, node): self.node_validate(node, [ 'integrate', 'include', 'exclude', 'include-orphans' @@ -104,7 +106,8 @@ class ComposeElement(Element): orphans=self.include_orphans) manifest.update(files) - basedir = sandbox.get_directory() + # Make a snapshot of all the files. + vbasedir = sandbox.get_virtual_directory() modified_files = set() removed_files = set() added_files = set() @@ -116,23 +119,21 @@ class ComposeElement(Element): if require_split: # Make a snapshot of all the files before integration-commands are run. - snapshot = { - f: getmtime(os.path.join(basedir, f)) - for f in utils.list_relative_paths(basedir) - } + snapshot = vbasedir.list_relative_paths_with_mtimes() for dep in self.dependencies(Scope.BUILD): dep.integrate(sandbox) if require_split: - # Calculate added, modified and removed files - basedir_contents = set(utils.list_relative_paths(basedir)) + post_integration_snapshot = vbasedir.list_relative_paths_with_mtimes() + + basedir_contents = set(post_integration_snapshot.keys()) for path in manifest: if path in basedir_contents: if path in snapshot: preintegration_mtime = snapshot[path] - if preintegration_mtime != getmtime(os.path.join(basedir, path)): + if preintegration_mtime != post_integration_snapshot[path]: modified_files.add(path) else: # If the path appears in the manifest but not the initial snapshot, @@ -166,8 +167,7 @@ class ComposeElement(Element): # instead of into a subdir. The element assemble() method should # support this in some way. # - installdir = os.path.join(basedir, 'buildstream', 'install') - os.makedirs(installdir, exist_ok=True) + installdir = vbasedir.descend(['buildstream', 'install'], create=True) # We already saved the manifest for created files in the integration phase, # now collect the rest of the manifest. @@ -191,7 +191,7 @@ class ComposeElement(Element): with self.timed_activity("Creating composition", detail=detail, silent_nested=True): self.info("Composing {} files".format(len(manifest))) - utils.link_files(basedir, installdir, files=manifest) + installdir.import_files(vbasedir, files=manifest, can_link=True) # And we're done return os.path.join(os.sep, 'buildstream', 'install') |