Skip to content

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

minor rework and comments added.

parent 5d1d716e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
hdlmake/action/action.py
View file @ 4258554e
...@@ -57,7 +57,8 @@ class Action(object): ...@@ -57,7 +57,8 @@ class Action(object):
self.top_manifest.parse_manifest() self.top_manifest.parse_manifest()
self.config = self._get_config_dict() self.config = self._get_config_dict()
def run(self): def setup(self):
"""Set tool and top_entity"""
action = self.config.get("action") action = self.config.get("action")
if action == None: if action == None:
self.tool = None self.tool = None
......
hdlmake/action/commands.py
View file @ 4258554e
...@@ -62,9 +62,12 @@ class Commands(Action): ...@@ -62,9 +62,12 @@ class Commands(Action):
def makefile(self): def makefile(self):
"""Write the Makefile for the current design""" """Write the Makefile for the current design"""
# Handle the --make option
commands = self.options.__dict__.get('make') commands = self.options.__dict__.get('make')
if commands: if commands:
shell.set_commands_os(commands) shell.set_commands_os(commands)
# Handle --filename option.
filename = self.options.__dict__.get('filename')
self._check_all_fetched() self._check_all_fetched()
self.build_file_set() self.build_file_set()
self.solve_file_set() self.solve_file_set()
...@@ -72,7 +75,7 @@ class Commands(Action): ...@@ -72,7 +75,7 @@ class Commands(Action):
combined_fileset.add(self.privative_fileset) combined_fileset.add(self.privative_fileset)
self.tool.write_makefile(self.config, self.tool.write_makefile(self.config,
combined_fileset, combined_fileset,
filename=self.options.__dict__.get('filename')) filename=filename)
def _fetch_all(self): def _fetch_all(self):
"""Fetch all the modules declared in the design""" """Fetch all the modules declared in the design"""
......
hdlmake/main.py
View file @ 4258554e
...@@ -57,7 +57,7 @@ def hdlmake(args): ...@@ -57,7 +57,7 @@ def hdlmake(args):
# Create a ModulePool object, this will become our workspace # Create a ModulePool object, this will become our workspace
action = Commands(options) action = Commands(options)
action.load_top_manifest() action.load_top_manifest()
action.run() action.setup()
# Execute the appropriated action for the freshly created modules pool # Execute the appropriated action for the freshly created modules pool
_action_runner(action) _action_runner(action)
......
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