Skip to content

Change to address transitive dependency issue for vulcan. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vinodshelke82 wants to merge 7 commits into
base: vulcan
Choose a base branch
from
Open

Change to address transitive dependency issue for vulcan. #6

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f919d49
change to address transitive dependency for vulcan
May 14, 2020
1da6209
resolved review comments
May 15, 2020
a9f8040
regex and cliff's fix for bll vulcan build
May 19, 2020
2f1ab17
regex and cliff's fix for bll vulcan build
May 19, 2020
ef6cbb8
regex and cliff's fix for bll vulcan build
May 19, 2020
58ed81e
regex and cliff's fix for bll vulcan build
May 19, 2020
213b747
regex corrected
May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/engine/SCons/Spirent/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,26 @@ def _write_edge(self, f, from_id, to_id):
if from_id:
f.write(' n%x -> n%x;\n' % (from_id, to_id))

def _walk_tree_write_nodes(self, f, parent_id, node, visited, written):
def _is_shared_lib(self, node):
sh_lib_extn = ['.so', '.lib']
filename = str(node.rfile())
extension = os.path.splitext(str(node.rfile()))[1]
return extension in sh_lib_extn or ".so." in filename

def _walk_tree_write_nodes(self, f, parent_id, node, visited, written, transitive=False):
node = node.disambiguate()
node_id = id(node)
path = str(node)
if transitive :
for child in node.all_children():
if self._is_shared_lib(child):
self._walk_tree_write_nodes(f, parent_id, child, visited, written, True)
self._walk_tree_write_nodes(f, parent_id, node, visited, written)
if node_id in visited:
if node_id in written:
self._write_edge(f, parent_id, node_id)
return
visited.add(node_id)
path = str(node)
if node.has_builder():
self._write_edge(f, parent_id, node_id)
if not isinstance(node, SCons.Node.FS.Dir):
Expand All @@ -164,13 +175,15 @@ def _walk_tree_write_nodes(self, f, parent_id, node, visited, written):
self._write_edge(f, node_id, builder_id)
for child in node.all_children():
self._walk_tree_write_nodes(f, builder_id, child, visited, written)
if self._is_shared_lib(child):
self._walk_tree_write_nodes(f, builder_id, child, visited, written, True)
else:
self._write_dir_node(f, node_id, path, parent_id is None)
written.add(node_id)
self._write_edge(f, parent_id, node_id)
for child in node.all_children():
self._walk_tree_write_nodes(f, node_id, child, visited, written)
elif isinstance(node, SCons.Node.FS.File) and node.exists() and not os.path.isabs(path):
elif isinstance(node, SCons.Node.FS.File) and node.rfile().exists() and not os.path.isabs(path):
self._write_edge(f, parent_id, node_id)
self._write_source_node(f, node_id, path, self._get_node_hash(path), self._get_node_mode(path))
written.add(node_id)
Expand Down