Skip to content

H
Hdlmake
Commit 7556de06 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

renaming.

parent 4dabda15
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
hdlmake/action/action.py
View file @ 7556de06
......@@ -70,13 +70,14 @@ class Action(object):
self._add(new_module)
return new_module
def load_top_manifest(self):
def load_all_manifests(self):
# Top level module.
assert self.top_manifest is None
self.top_manifest = self.new_module(parent=None,
url=os.getcwd(),
source=None,
fetchto=".")
# Parse the top manifest and all sub-modules.
self.top_manifest.parse_manifest()
self.config = self._get_config_dict()
......
hdlmake/main.py
View file @ 7556de06
......@@ -56,7 +56,7 @@ def hdlmake(args):
# Create a ModulePool object, this will become our workspace
action = Commands(options)
action.load_top_manifest()
action.load_all_manifests()
action.setup()
# Execute the appropriated action for the freshly created modules pool
......
hdlmake/module/module.py
View file @ 7556de06
......@@ -134,22 +134,20 @@ PARSE START: %s
extra_context["__manifest"] = self.path
# The parse method is where most of the parser action takes place!
opt_map = None
try:
opt_map = manifest_parser.parse(config_file=filename, extra_context=extra_context)
self.manifest_dict = manifest_parser.parse(config_file=filename, extra_context=extra_context)
except NameError as name_error:
raise Exception(
"Error while parsing {0}:\n{1}: {2}.".format(
self.path, type(name_error), name_error))
self.manifest_dict = opt_map
# Process the parsed manifest_dict to assign the module properties
self.process_manifest()
self.process_git_submodules()
# Recurse: parse every detected submodule
for module_aux in self.submodules():
module_aux.parse_manifest()
for submod in self.submodules():
submod.parse_manifest()
logging.debug("""
***********************************************************
......
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