Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
9e47ce49
Commit
9e47ce49
authored
Mar 31, 2009
by
Tarek Ziadé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#5583 Added optional Extensions in Distutils
parent
42f9b4e5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
2 deletions
+40
-2
Doc/distutils/setupscript.rst
Doc/distutils/setupscript.rst
+4
-0
Lib/distutils/command/build_ext.py
Lib/distutils/command/build_ext.py
+7
-1
Lib/distutils/extension.py
Lib/distutils/extension.py
+5
-0
Lib/distutils/tests/test_build_ext.py
Lib/distutils/tests/test_build_ext.py
+21
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Doc/distutils/setupscript.rst
View file @
9e47ce49
...
...
@@ -334,6 +334,10 @@ Other options
There
are
still
some
other
options
which
can
be
used
to
handle
special
cases
.
The
:
option
:`
optional
`
option
is
a
boolean
;
if
it
is
true
,
that
specifies
that
a
build
failure
in
the
extension
should
not
abort
the
build
process
,
but
simply
not
install
the
failing
extension
.
The
:
option
:`
extra_objects
`
option
is
a
list
of
object
files
to
be
passed
to
the
linker
.
These
files
must
not
have
extensions
,
as
the
default
extension
for
the
compiler
is
used
.
...
...
Lib/distutils/command/build_ext.py
View file @
9e47ce49
...
...
@@ -476,7 +476,13 @@ class build_ext (Command):
self
.
check_extensions_list
(
self
.
extensions
)
for
ext
in
self
.
extensions
:
self
.
build_extension
(
ext
)
try
:
self
.
build_extension
(
ext
)
except
(
CCompilerError
,
DistutilsError
),
e
:
if
not
ext
.
optional
:
raise
self
.
warn
(
'building extension "%s" failed: %s'
%
(
ext
.
name
,
e
))
def
build_extension
(
self
,
ext
):
sources
=
ext
.
sources
...
...
Lib/distutils/extension.py
View file @
9e47ce49
...
...
@@ -83,6 +83,9 @@ class Extension:
language : string
extension language (i.e. "c", "c++", "objc"). Will be detected
from the source extensions if not provided.
optional : boolean
specifies that a build failure in the extension should not abort the
build process, but simply not install the failing extension.
"""
# When adding arguments to this constructor, be sure to update
...
...
@@ -101,6 +104,7 @@ class Extension:
swig_opts
=
None
,
depends
=
None
,
language
=
None
,
optional
=
None
,
**
kw
# To catch unknown keywords
):
assert
type
(
name
)
is
StringType
,
"'name' must be a string"
...
...
@@ -123,6 +127,7 @@ class Extension:
self
.
swig_opts
=
swig_opts
or
[]
self
.
depends
=
depends
or
[]
self
.
language
=
language
self
.
optional
=
optional
# If there are unknown keyword options, warn about them
if
len
(
kw
):
...
...
Lib/distutils/tests/test_build_ext.py
View file @
9e47ce49
...
...
@@ -8,6 +8,8 @@ from distutils.core import Extension, Distribution
from
distutils.command.build_ext
import
build_ext
from
distutils
import
sysconfig
from
distutils.tests
import
support
from
distutils.extension
import
Extension
from
distutils.errors
import
UnknownFileError
import
unittest
from
test
import
test_support
...
...
@@ -20,7 +22,9 @@ def _get_source_filename():
srcdir
=
sysconfig
.
get_config_var
(
'srcdir'
)
return
os
.
path
.
join
(
srcdir
,
'Modules'
,
'xxmodule.c'
)
class
BuildExtTestCase
(
support
.
TempdirManager
,
unittest
.
TestCase
):
class
BuildExtTestCase
(
support
.
TempdirManager
,
support
.
LoggingSilencer
,
unittest
.
TestCase
):
def
setUp
(
self
):
# Create a simple test environment
# Note that we're making changes to sys.path
...
...
@@ -142,6 +146,22 @@ class BuildExtTestCase(support.TempdirManager, unittest.TestCase):
self
.
assert_
(
lib
in
cmd
.
library_dirs
)
self
.
assert_
(
incl
in
cmd
.
include_dirs
)
def
test_optional_extension
(
self
):
# this extension will fail, but let's ignore this failure
# with the optional argument.
modules
=
[
Extension
(
'foo'
,
[
'xxx'
],
optional
=
False
)]
dist
=
Distribution
({
'name'
:
'xx'
,
'ext_modules'
:
modules
})
cmd
=
build_ext
(
dist
)
cmd
.
ensure_finalized
()
self
.
assertRaises
(
UnknownFileError
,
cmd
.
run
)
# should raise an error
modules
=
[
Extension
(
'foo'
,
[
'xxx'
],
optional
=
True
)]
dist
=
Distribution
({
'name'
:
'xx'
,
'ext_modules'
:
modules
})
cmd
=
build_ext
(
dist
)
cmd
.
ensure_finalized
()
cmd
.
run
()
# should pass
def
test_suite
():
src
=
_get_source_filename
()
if
not
os
.
path
.
exists
(
src
):
...
...
Misc/NEWS
View file @
9e47ce49
...
...
@@ -199,6 +199,9 @@ Core and Builtins
Library
-------
- Issue #5583: Added optional Extensions in Distutils. Initial patch by Georg
Brandl.
- Issue #5619: Multiprocessing children disobey the debug flag and causes
popups on windows buildbots. Patch applied to work around this issue.
...
...
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