Skip to content

H
Hdlmake
Commit aef3d041 authored by Will's avatar Will
Browse files
Options

Fix merge with upstream/develop branch

parent e6da0a3a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
hdlmake/action/list_files.py
View file @ aef3d041
......@@ -27,9 +27,8 @@ class ListFiles(Action):
def run(self):
unfetched_modules = [m for m in self.modules_pool if not m.isfetched]
for m in unfetched_modules:
logging.warning("List incomplete, module %s has not been fetched!", m)
file_set = self.modules_pool.build_limited_file_set()
logging.warning("List incomplete, module %s has not been fetched!", m)
file_set = self.modules_pool.build_limited_file_set()
file_list = dep_solver.make_dependency_sorted_list(file_set)
files_str = [f.path for f in file_list]
print(self.options.delimiter.join(files_str))
hdlmake/module_pool.py
View file @ aef3d041
......@@ -218,7 +218,7 @@ class ModulePool(list):
def build_global_file_set(self):
"""Build set of all files from manifests plus all include files from sources"""
from .srcfile import SourceFileSet
files = self.build_limited_file_set()
files = self.build_file_set()
assert isinstance(files, SourceFileSet)
self.solve_dependencies()
ret = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment