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
0e008e6f
Commit
0e008e6f
authored
Jun 29, 2013
by
Paweł Szostek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Env usage
parent
943a8147
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
hdlmake_kernel.py
src/hdlmake_kernel.py
+5
-4
srcfile.py
src/srcfile.py
+1
-1
No files found.
src/hdlmake_kernel.py
View file @
0e008e6f
...
...
@@ -197,13 +197,14 @@ class HdlmakeKernel(object):
env
=
global_mod
.
env
logging
.
info
(
"Generating/updating ISE project"
)
self
.
_check_all_fetched_or_quit
()
if
not
env
.
ise_version
:
if
not
env
[
"ise_version"
]
:
logging
.
error
(
"Xilinx version cannot be deduced. Cannot generate ISE "
"project file properly. Please use syn_ise_version in the manifest "
"or set"
)
quit
()
else
:
logging
.
info
(
"Generating project for ISE v.
%
d.
%
d"
%
(
env
.
ise_version
[
0
],
env
.
ise_version
[
1
]))
logging
.
info
(
"Generating project for ISE v.
%
d.
%
d"
%
(
env
[
"ise_version"
][
0
],
env
[
"ise_version"
][
1
]))
if
os
.
path
.
exists
(
self
.
top_module
.
syn_project
):
self
.
_update_existing_ise_project
()
else
:
...
...
@@ -235,7 +236,7 @@ class HdlmakeKernel(object):
all_files
.
add
(
non_dependable
)
all_files
.
add
(
dependable
)
prj
=
ISEProject
(
ise
=
global_mod
.
env
.
ise_version
,
prj
=
ISEProject
(
ise
=
global_mod
.
env
[
"ise_version"
]
,
top_mod
=
self
.
modules_pool
.
get_top_module
())
prj
.
add_files
(
all_files
)
from
srcfile
import
SourceFileFactory
...
...
@@ -254,7 +255,7 @@ class HdlmakeKernel(object):
fileset
=
solver
.
solve
(
fileset
)
fileset
.
add
(
non_dependable
)
prj
=
ISEProject
(
ise
=
global_mod
.
env
.
ise_version
,
prj
=
ISEProject
(
ise
=
global_mod
.
env
[
"ise_version"
]
,
top_mod
=
self
.
modules_pool
.
get_top_module
())
prj
.
add_files
(
fileset
)
prj
.
add_libs
(
fileset
.
get_libs
())
...
...
src/srcfile.py
View file @
0e008e6f
...
...
@@ -245,7 +245,7 @@ class VerilogFile(SourceFile):
def
__create_deps
(
self
):
# self.dep_requires = self.__search_includes()
# self.dep_provides = self.name
if
global_mod
.
env
.
iverilog_path
:
if
global_mod
.
env
[
"iverilog_path"
]
:
self
.
dep_requires
=
[]
deps
=
self
.
__get_iverilog_dependencies
()
self
.
dep_requires
.
extend
(
deps
)
...
...
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