Skip to content

H
Hdlmake
Commit a67c8fde authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

Load the appropriated tool when the pool is created

parent 484d5d34
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
hdlmake/action/action.py
View file @ a67c8fde
...@@ -28,6 +28,7 @@ import os ...@@ -28,6 +28,7 @@ import os
import logging import logging
import sys import sys
from hdlmake.tools import load_syn_tool, load_sim_tool
from hdlmake import shell from hdlmake import shell
from hdlmake.util.termcolor import colored from hdlmake.util.termcolor import colored
from hdlmake import new_dep_solver as dep_solver from hdlmake import new_dep_solver as dep_solver
...@@ -72,6 +73,16 @@ class Action(list): ...@@ -72,6 +73,16 @@ class Action(list):
source=fetch_mod.LOCAL, source=fetch_mod.LOCAL,
fetchto=".") fetchto=".")
self.config = self._get_config_dict() self.config = self._get_config_dict()
action = self.config.get("action")
if action == None:
self.tool = None
elif action == "simulation":
self.tool = load_sim_tool(self.config.get("sim_tool"))
elif action == "synthesis":
self.tool = load_syn_tool(self.config.get("syn_tool"))
else:
logging.error("Unknown requested action: %s", action)
quit()
def new_module(self, parent, url, source, fetchto): def new_module(self, parent, url, source, fetchto):
"""Add new module to the pool. """Add new module to the pool.
......
hdlmake/action/core.py
View file @ a67c8fde
...@@ -28,7 +28,6 @@ import os ...@@ -28,7 +28,6 @@ import os
import sys import sys
import os.path import os.path
from hdlmake.tools import load_syn_tool, load_sim_tool
import hdlmake.fetch as fetch import hdlmake.fetch as fetch
import hdlmake.new_dep_solver as dep_solver import hdlmake.new_dep_solver as dep_solver
from hdlmake.util import path as path_mod from hdlmake.util import path as path_mod
...@@ -62,16 +61,7 @@ class ActionCore(Action): ...@@ -62,16 +61,7 @@ class ActionCore(Action):
def makefile(self): def makefile(self):
"""Write the Makefile for the current design""" """Write the Makefile for the current design"""
self._check_all_fetched_or_quit() self._check_all_fetched_or_quit()
action = self.config.get("action") self.tool.write_makefile(self)
if action == "simulation":
sim_writer = load_sim_tool(self.config.get("sim_tool"))
sim_writer.simulation_makefile(self)
elif action == "synthesis":
syn_writer = load_syn_tool(self.config.get("syn_tool"))
syn_writer.synthesis_makefile(self)
else:
logging.error("Unknown requested action: %s", action)
quit()
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/tools/make_sim.py
View file @ a67c8fde
...@@ -30,7 +30,7 @@ class ToolSim(ToolMakefile): ...@@ -30,7 +30,7 @@ class ToolSim(ToolMakefile):
super(ToolSim, self).__init__() super(ToolSim, self).__init__()
self._simulator_controls = {} self._simulator_controls = {}
def simulation_makefile(self, pool): def write_makefile(self, pool):
"""Execute the simulation action""" """Execute the simulation action"""
_check_simulation_manifest(pool.config) _check_simulation_manifest(pool.config)
fset = pool.build_file_set( fset = pool.build_file_set(
......
hdlmake/tools/make_syn.py
View file @ a67c8fde
...@@ -39,7 +39,7 @@ class ToolSyn(ToolMakefile): ...@@ -39,7 +39,7 @@ class ToolSyn(ToolMakefile):
def __init__(self): def __init__(self):
super(ToolSyn, self).__init__() super(ToolSyn, self).__init__()
def synthesis_makefile(self, pool): def write_makefile(self, pool):
"""Generate a Makefile for the specific synthesis tool""" """Generate a Makefile for the specific synthesis tool"""
_check_synthesis_manifest(pool.config) _check_synthesis_manifest(pool.config)
fileset = pool.build_file_set( fileset = pool.build_file_set(
......
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