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
fad48533
Commit
fad48533
authored
Oct 30, 2019
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tools: minor refactoring (pass top manifest to write_makefile).
parent
25ad26d0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
18 deletions
+14
-18
commands.py
hdlmake/action/commands.py
+1
-1
makefile.py
hdlmake/tools/makefile.py
+2
-2
makefilesim.py
hdlmake/tools/makefilesim.py
+5
-5
makefilesyn.py
hdlmake/tools/makefilesyn.py
+6
-10
No files found.
hdlmake/action/commands.py
View file @
fad48533
...
...
@@ -72,7 +72,7 @@ class Commands(Action):
self
.
solve_file_set
()
combined_fileset
=
self
.
parseable_fileset
combined_fileset
.
add
(
self
.
privative_fileset
)
self
.
tool
.
write_makefile
(
self
.
top_manifest
.
manifest_dict
,
self
.
tool
.
write_makefile
(
self
.
top_manifest
,
combined_fileset
,
filename
=
filename
)
...
...
hdlmake/tools/makefile.py
View file @
fad48533
...
...
@@ -65,9 +65,9 @@ class ToolMakefile(object):
"""Get the privative format file types supported by the tool"""
return
self
.
SUPPORTED_FILES
def
makefile_setup
(
self
,
manifest_project_dic
t
,
fileset
,
filename
=
None
):
def
makefile_setup
(
self
,
top_manifes
t
,
fileset
,
filename
=
None
):
"""Set the Makefile configuration"""
self
.
manifest_dict
=
manifest_projec
t_dict
self
.
manifest_dict
=
top_manifest
.
manifes
t_dict
self
.
fileset
=
fileset
if
filename
:
self
.
_filename
=
filename
...
...
hdlmake/tools/makefilesim.py
View file @
fad48533
...
...
@@ -10,9 +10,9 @@ from ..util import shell
from
..sourcefiles.srcfile
import
VerilogFile
,
VHDLFile
,
SVFile
def
_check_simulation_manifest
(
manifest_dic
t
):
def
_check_simulation_manifest
(
top_manifes
t
):
"""Check if the simulation keys are provided by the top manifest"""
if
manifest_dict
.
get
(
"sim_top"
)
is
None
:
if
top_manifest
.
manifest_dict
.
get
(
"sim_top"
)
is
None
:
raise
Exception
(
"sim_top variable must be set in the top manifest."
)
...
...
@@ -25,10 +25,10 @@ class MakefileSim(ToolMakefile):
def
__init__
(
self
):
super
(
MakefileSim
,
self
)
.
__init__
()
def
write_makefile
(
self
,
config
,
fileset
,
filename
=
None
):
def
write_makefile
(
self
,
top_manifest
,
fileset
,
filename
=
None
):
"""Execute the simulation action"""
_check_simulation_manifest
(
config
)
self
.
makefile_setup
(
config
,
fileset
,
filename
=
filename
)
_check_simulation_manifest
(
top_manifest
)
self
.
makefile_setup
(
top_manifest
,
fileset
,
filename
=
filename
)
self
.
makefile_check_tool
(
'sim_path'
)
self
.
makefile_includes
()
self
.
_makefile_sim_top
()
...
...
hdlmake/tools/makefilesyn.py
View file @
fad48533
...
...
@@ -10,15 +10,12 @@ from ..util import shell
from
..sourcefiles.srcfile
import
VerilogFile
,
SVFile
def
_check_synthesis_manifest
(
manifest_dic
t
):
def
_check_synthesis_manifest
(
top_manifes
t
):
"""Check the manifest contains all the keys for a synthesis project"""
for
v
in
[
"syn_device"
,
"syn_grade"
,
"syn_package"
]:
if
v
not
in
manifest_dict
:
for
v
in
[
"syn_
top"
,
"syn_
device"
,
"syn_grade"
,
"syn_package"
]:
if
v
not
in
top_manifest
.
manifest_dict
:
raise
Exception
(
"'{}' variable must be set in the top manifest."
.
format
(
v
))
if
not
manifest_dict
[
"syn_top"
]:
logging
.
error
(
"syn_top variable must be set in the top manifest."
)
class
MakefileSyn
(
ToolMakefile
):
...
...
@@ -29,11 +26,10 @@ class MakefileSyn(ToolMakefile):
super
(
MakefileSyn
,
self
)
.
__init__
()
self
.
_tcl_controls
=
{}
def
write_makefile
(
self
,
config
,
fileset
,
filename
=
None
):
def
write_makefile
(
self
,
top_manifest
,
fileset
,
filename
=
None
):
"""Generate a Makefile for the specific synthesis tool"""
_check_synthesis_manifest
(
config
)
self
.
makefile_setup
(
config
,
fileset
,
filename
=
filename
)
_check_synthesis_manifest
(
top_manifest
)
self
.
makefile_setup
(
top_manifest
,
fileset
,
filename
=
filename
)
self
.
makefile_check_tool
(
'syn_path'
)
self
.
makefile_includes
()
self
.
_makefile_syn_top
()
...
...
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