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
b497b688
Commit
b497b688
authored
Jun 13, 2017
by
Javier D. Garcia-Lasheras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue when listing files from outside the top directory
parent
2347f124
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
12 deletions
+21
-12
action.py
hdlmake/action/action.py
+21
-12
No files found.
hdlmake/action/action.py
View file @
b497b688
...
...
@@ -33,8 +33,7 @@ from hdlmake.util import shell
from
hdlmake.util
import
path
as
path_mod
from
hdlmake.util.termcolor
import
colored
from
hdlmake
import
new_dep_solver
as
dep_solver
from
hdlmake.srcfile
import
SourceFileSet
from
hdlmake.srcfile
import
SourceFileSet
,
VHDLFile
,
VerilogFile
,
SVFile
def
set_logging_level
(
options
):
"""Set the log level and config (A.K.A. log verbosity)"""
...
...
@@ -153,8 +152,11 @@ class Action(list):
if
self
.
options
.
all_files
:
return
if
not
self
.
_deps_solved
:
dep_solver
.
solve
(
self
.
parseable_fileset
,
self
.
tool
.
get_standard_libs
())
if
self
.
tool
==
None
:
dep_solver
.
solve
(
self
.
parseable_fileset
)
else
:
dep_solver
.
solve
(
self
.
parseable_fileset
,
self
.
tool
.
get_standard_libs
())
self
.
_deps_solved
=
True
solved_files
=
SourceFileSet
()
solved_files
.
add
(
dep_solver
.
make_dependency_set
(
...
...
@@ -166,15 +168,22 @@ class Action(list):
"""Initialize the parseable and privative fileset contents"""
total_files
=
self
.
build_complete_file_set
()
for
file_aux
in
total_files
:
if
any
(
isinstance
(
file_aux
,
file_type
)
for
file_type
in
self
.
tool
.
get_privative_files
()):
self
.
privative_fileset
.
add
(
file_aux
)
elif
any
(
isinstance
(
file_aux
,
file_type
)
for
file_type
in
self
.
tool
.
get_parseable_files
())
:
self
.
parseabl
e_fileset
.
add
(
file_aux
)
if
self
.
tool
==
None
:
if
any
(
isinstance
(
file_aux
,
file_type
)
for
file_type
in
[
VHDLFile
,
VerilogFile
,
SVFile
]):
self
.
parseable_fileset
.
add
(
file_aux
)
else
:
self
.
privativ
e_fileset
.
add
(
file_aux
)
else
:
logging
.
debug
(
"File not supported by the tool:
%
s"
,
file_aux
.
path
)
if
any
(
isinstance
(
file_aux
,
file_type
)
for
file_type
in
self
.
tool
.
get_parseable_files
()):
self
.
parseable_fileset
.
add
(
file_aux
)
elif
any
(
isinstance
(
file_aux
,
file_type
)
for
file_type
in
self
.
tool
.
get_privative_files
()):
self
.
privative_fileset
.
add
(
file_aux
)
else
:
logging
.
debug
(
"File not supported by the tool:
%
s"
,
file_aux
.
path
)
if
len
(
self
.
privative_fileset
)
>
0
:
logging
.
info
(
"Detected
%
d supported files that are not parseable"
,
len
(
self
.
privative_fileset
))
...
...
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