Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
43c49c7c
Commit
43c49c7c
authored
Apr 16, 2013
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve depends attribute with respect to include_dirs.
parent
dba22361
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
6 deletions
+32
-6
Cython/Build/Dependencies.py
Cython/Build/Dependencies.py
+32
-6
No files found.
Cython/Build/Dependencies.py
View file @
43c49c7c
...
...
@@ -288,12 +288,32 @@ def normalize_existing(base_path, rel_paths):
@
cached_function
def
normalize_existing0
(
base_dir
,
rel_paths
):
filter
ed
=
[]
normaliz
ed
=
[]
for
rel
in
rel_paths
:
path
=
join_path
(
base_dir
,
rel
)
if
os
.
path
.
exists
(
path
):
filtered
.
append
(
os
.
path
.
normpath
(
path
))
return
filtered
if
path_exists
(
path
):
normalized
.
append
(
os
.
path
.
normpath
(
path
))
else
:
normalized
.
append
(
path
)
return
normalized
def
resolve_depends
(
depends
,
include_dirs
):
include_dirs
=
tuple
(
include_dirs
)
resolved
=
[]
for
depend
in
depends
:
path
=
resolve_depend
(
depend
,
include_dirs
)
if
path
is
not
None
:
resolved
.
append
(
path
)
return
resolved
@
cached_function
def
resolve_depend
(
depend
,
include_dirs
):
if
depend
[
0
]
==
'<'
and
depend
[
-
1
]
==
'>'
:
return
for
dir
in
include_dirs
:
path
=
join_path
(
dir
,
depend
)
if
path_exists
(
path
):
return
os
.
path
.
normpath
(
path
)
@
cached_function
def
parse_dependencies
(
source_filename
):
...
...
@@ -515,6 +535,8 @@ def create_dependency_tree(ctx=None, quiet=False):
# This may be useful for advanced users?
def
create_extension_list
(
patterns
,
exclude
=
[],
ctx
=
None
,
aliases
=
None
,
quiet
=
False
,
exclude_failures
=
False
):
if
not
isinstance
(
patterns
,
list
):
patterns
=
[
patterns
]
explicit_modules
=
set
([
m
.
name
for
m
in
patterns
if
isinstance
(
m
,
Extension
)])
seen
=
set
()
deps
=
create_dependency_tree
(
ctx
,
quiet
=
quiet
)
...
...
@@ -523,8 +545,6 @@ def create_extension_list(patterns, exclude=[], ctx=None, aliases=None, quiet=Fa
exclude
=
[
exclude
]
for
pattern
in
exclude
:
to_exclude
.
update
(
extended_iglob
(
pattern
))
if
not
isinstance
(
patterns
,
list
):
patterns
=
[
patterns
]
module_list
=
[]
for
pattern
in
patterns
:
if
isinstance
(
pattern
,
str
):
...
...
@@ -576,6 +596,12 @@ def create_extension_list(patterns, exclude=[], ctx=None, aliases=None, quiet=Fa
if
source
not
in
sources
:
sources
.
append
(
source
)
del
kwds
[
'sources'
]
if
'depends'
in
kwds
:
depends
=
resolve_depends
(
kwds
[
'depends'
],
kwds
.
get
(
'include_dirs'
)
or
[])
if
template
is
not
None
:
# Always include everything from the template.
depends
=
list
(
set
(
template
.
depends
).
union
(
set
(
depends
)))
kwds
[
'depends'
]
=
depends
module_list
.
append
(
exn_type
(
name
=
module_name
,
sources
=
sources
,
...
...
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