Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
Hdlmake
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
15
Issues
15
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Hdlmake
Commits
54ed686c
Commit
54ed686c
authored
Aug 05, 2016
by
Javier D. Garcia-Lasheras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Supress unneded inheritance: Tool and Action were mixed
parent
33c3e8ea
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
14 deletions
+11
-14
__init__.py
hdlmake/action/__init__.py
+0
-1
simulation.py
hdlmake/action/simulation.py
+2
-3
synthesis.py
hdlmake/action/synthesis.py
+2
-3
__init__.py
hdlmake/tools/__init__.py
+2
-0
make_sim.py
hdlmake/tools/make_sim.py
+2
-2
make_syn.py
hdlmake/tools/make_syn.py
+2
-2
makefile.py
hdlmake/tools/makefile.py
+1
-3
No files found.
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
Action
Makefile
from
.makefile
import
Tool
Makefile
class
ToolSim
(
Action
Makefile
):
class
ToolSim
(
Tool
Makefile
):
"""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
Action
Makefile
from
.makefile
import
Tool
Makefile
from
hdlmake.util
import
path
as
path_mod
class
ToolSyn
(
Action
Makefile
):
class
ToolSyn
(
Tool
Makefile
):
"""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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment