Skip to content

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

Supress unneded inheritance: Tool and Action were mixed

parent 33c3e8ea
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
hdlmake/action/__init__.py
View file @ 54ed686c
......@@ -25,7 +25,6 @@
from .check import ActionCheck
from .core import ActionCore
from .tree import ActionTree
from .makefile import ActionMakefile
from .synthesis import ActionSynthesis
from .simulation import ActionSimulation
......
hdlmake/action/simulation.py
View file @ 54ed686c
......@@ -33,10 +33,9 @@ from hdlmake.tools import (
ToolIVerilog, ToolISim, ToolModelsim,
ToolActiveHDL, ToolRiviera, ToolGHDL)
from .action import Action
class ActionSimulation(
ToolIVerilog, ToolISim, ToolModelsim,
ToolActiveHDL, ToolRiviera, ToolGHDL):
class ActionSimulation(Action):
"""This class contains the simulation specific methods"""
......
hdlmake/action/synthesis.py
View file @ 54ed686c
......@@ -34,10 +34,9 @@ from hdlmake.tools import (
ToolISE, ToolPlanAhead, ToolVivado,
ToolQuartus, ToolDiamond, ToolLibero)
from .action import Action
class ActionSynthesis(
ToolISE, ToolPlanAhead, ToolVivado,
ToolQuartus, ToolDiamond, ToolLibero):
class ActionSynthesis(Action):
"""Class providing the public synthesis methods for the user"""
......
hdlmake/tools/__init__.py
View file @ 54ed686c
"""Package that provides all the tool specific stuff"""
from .makefile import ToolMakefile
from .iverilog import ToolIVerilog
from .isim import ToolISim
from .modelsim import ToolModelsim
......
hdlmake/tools/make_sim.py
View file @ 54ed686c
......@@ -3,10 +3,10 @@
import os
import string
from hdlmake.action import ActionMakefile
from .makefile import ToolMakefile
class ToolSim(ActionMakefile):
class ToolSim(ToolMakefile):
"""Class that provides the Makefile writing methods and status"""
......
hdlmake/tools/make_syn.py
View file @ 54ed686c
......@@ -2,10 +2,10 @@
import string
from hdlmake.action import ActionMakefile
from .makefile import ToolMakefile
from hdlmake.util import path as path_mod
class ToolSyn(ActionMakefile):
class ToolSyn(ToolMakefile):
"""Class that provides the synthesis Makefile writing methods and status"""
......
hdlmake/action/makefile.py → hdlmake/tools/makefile.py
View file @ 54ed686c
......@@ -28,11 +28,10 @@ import sys
import string
import platform
from .action import Action
from hdlmake.util import path as path_mod
class ActionMakefile(Action):
class ToolMakefile(object):
"""Class that provides the Makefile writing methods and status"""
......@@ -48,7 +47,6 @@ class ActionMakefile(Action):
self._filename = filename
else:
self._filename = "Makefile"
super(ActionMakefile, self).__init__()
def __del__(self):
if self._file:
......
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