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
26f08930
Commit
26f08930
authored
Mar 29, 2019
by
Javier D. Garcia-Lasheras
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incl_makefiles being ignored at synthesis and simulation
parent
4043e15b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
index.rst
docs/index.rst
+1
-1
make_sim.py
hdlmake/tools/make_sim.py
+1
-0
makefile.py
hdlmake/tools/makefile.py
+5
-4
No files found.
docs/index.rst
View file @
26f08930
...
...
@@ -1402,7 +1402,7 @@ Top Manifest variables
+================+==============+=================================================================+===========+
| action | str | What is the action that should be taken (simulation/synthesis) | "" |
+----------------+--------------+-----------------------------------------------------------------+-----------+
| incl_makefiles | list
, str | List of .mk files appended to toplevel makefile
| [] |
| incl_makefiles | list
| List of .mk files included in the generated makefile
| [] |
+----------------+--------------+-----------------------------------------------------------------+-----------+
| language | str | Select the default HDL language if required (verilog, vhdl) | "vhdl" |
+----------------+--------------+-----------------------------------------------------------------+-----------+
...
...
hdlmake/tools/make_sim.py
View file @
26f08930
...
...
@@ -34,6 +34,7 @@ class ToolSim(ToolMakefile):
_check_simulation_manifest
(
config
)
self
.
makefile_setup
(
config
,
fileset
,
filename
=
filename
)
self
.
makefile_check_tool
(
'sim_path'
)
self
.
makefile_includes
()
self
.
_makefile_sim_top
()
self
.
_makefile_sim_options
()
self
.
_makefile_sim_local
()
...
...
hdlmake/tools/makefile.py
View file @
26f08930
...
...
@@ -133,10 +133,11 @@ class ToolMakefile(object):
def
makefile_includes
(
self
):
"""Add the included makefiles that need to be previously loaded"""
#for file_aux in self.top_module.incl_makefiles:
# if os.path.exists(file_aux):
# self.write("include %s\n" % file_aux)
pass
if
self
.
manifest_dict
.
get
(
"incl_makefiles"
)
is
not
None
:
for
file_aux
in
self
.
manifest_dict
[
"incl_makefiles"
]:
if
os
.
path
.
exists
(
file_aux
):
self
.
writeln
(
"include
%
s"
%
file_aux
)
self
.
writeln
()
def
makefile_clean
(
self
):
"""Print the Makefile target for cleaning intermediate files"""
...
...
Javier D. Garcia-Lasheras
@garcialasheras
mentioned in issue
#1 (closed)
·
Mar 29, 2019
mentioned in issue
#1 (closed)
mentioned in issue #1
Toggle commit list
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