Skip to content

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

action.py: remove 'config' attribute.

parent caa2a4de
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
hdlmake/action/action.py
View file @ c7f96041
...@@ -78,30 +78,30 @@ class Action(object): ...@@ -78,30 +78,30 @@ class Action(object):
fetchto=".") fetchto=".")
# Parse the top manifest and all sub-modules. # Parse the top manifest and all sub-modules.
self.top_manifest.parse_manifest() self.top_manifest.parse_manifest()
self.config = self.top_manifest.manifest_dict # _get_config_dict()
def setup(self): def setup(self):
"""Set tool and top_entity""" """Set tool and top_entity"""
action = self.config.get("action") top_dict = self.top_manifest.manifest_dict
action = top_dict.get("action")
if action == None: if action == None:
self.tool = None self.tool = None
self.top_entity = self.config.get("top_module", None) self.top_entity = top_dict.get("top_module")
elif action == "simulation": elif action == "simulation":
tool = self.config.get("sim_tool") tool = top_dict.get("sim_tool")
if tool is None: if tool is None:
raise Exception("'sim_tool' variable is not defined") raise Exception("'sim_tool' variable is not defined")
self.tool = load_sim_tool(tool) self.tool = load_sim_tool(tool)
self.top_entity = self.config.get("sim_top") \ self.top_entity = top_dict.get("sim_top") \
or self.config.get("top_module") or top_dict.get("top_module")
self.config["sim_top"] = self.top_entity top_dict["sim_top"] = self.top_entity
elif action == "synthesis": elif action == "synthesis":
tool = self.config.get("syn_tool") tool = top_dict.get("syn_tool")
if tool is None: if tool is None:
raise Exception("'syn_tool' variable is not defined") raise Exception("'syn_tool' variable is not defined")
self.tool = load_syn_tool(tool) self.tool = load_syn_tool(tool)
self.top_entity = self.config.get("syn_top") \ self.top_entity = top_dict.get("syn_top") \
or self.config.get("top_module") or top_dict.get("top_module")
self.config["syn_top"] = self.top_entity top_dict["syn_top"] = self.top_entity
else: else:
raise Exception("Unknown requested action: {}".format(action)) raise Exception("Unknown requested action: {}".format(action))
...@@ -157,7 +157,7 @@ class Action(object): ...@@ -157,7 +157,7 @@ class Action(object):
solved_files = SourceFileSet() solved_files = SourceFileSet()
solved_files.add(dep_solver.make_dependency_set( solved_files.add(dep_solver.make_dependency_set(
self.parseable_fileset, self.top_entity, self.parseable_fileset, self.top_entity,
self.config.get("extra_modules"))) self.top_manifest.manifest_dict.get("extra_modules")))
self.parseable_fileset = solved_files self.parseable_fileset = solved_files
def get_top_manifest(self): def get_top_manifest(self):
......
hdlmake/action/commands.py
View file @ c7f96041
...@@ -72,7 +72,7 @@ class Commands(Action): ...@@ -72,7 +72,7 @@ class Commands(Action):
self.solve_file_set() self.solve_file_set()
combined_fileset = self.parseable_fileset combined_fileset = self.parseable_fileset
combined_fileset.add(self.privative_fileset) combined_fileset.add(self.privative_fileset)
self.tool.write_makefile(self.config, self.tool.write_makefile(self.top_manifest.manifest_dict,
combined_fileset, combined_fileset,
filename=filename) filename=filename)
......
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