Commit 6a0952de authored by Tarek Ziadé's avatar Tarek Ziadé

Merged revisions 71513 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71513 | tarek.ziade | 2009-04-12 17:03:50 +0200 (Sun, 12 Apr 2009) | 1 line

  pep8-fied the module before adding tests
........
parent 46a2116c
...@@ -53,8 +53,6 @@ class config(Command): ...@@ -53,8 +53,6 @@ class config(Command):
self.compiler = None self.compiler = None
self.cc = None self.cc = None
self.include_dirs = None self.include_dirs = None
#self.define = None
#self.undef = None
self.libraries = None self.libraries = None
self.library_dirs = None self.library_dirs = None
...@@ -136,8 +134,8 @@ class config(Command): ...@@ -136,8 +134,8 @@ class config(Command):
self.compiler.compile([src], include_dirs=include_dirs) self.compiler.compile([src], include_dirs=include_dirs)
return (src, obj) return (src, obj)
def _link(self, body, headers, include_dirs, libraries, def _link(self, body, headers, include_dirs, libraries, library_dirs,
library_dirs, lang): lang):
(src, obj) = self._compile(body, headers, include_dirs, lang) (src, obj) = self._compile(body, headers, include_dirs, lang)
prog = os.path.splitext(os.path.basename(src))[0] prog = os.path.splitext(os.path.basename(src))[0]
self.compiler.link_executable([obj], prog, self.compiler.link_executable([obj], prog,
...@@ -191,8 +189,8 @@ class config(Command): ...@@ -191,8 +189,8 @@ class config(Command):
self._clean() self._clean()
return ok return ok
def search_cpp(self, pattern, body=None, headers=None, def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
include_dirs=None, lang="c"): lang="c"):
"""Construct a source file (just like 'try_cpp()'), run it through """Construct a source file (just like 'try_cpp()'), run it through
the preprocessor, and return true if any line of the output matches the preprocessor, and return true if any line of the output matches
'pattern'. 'pattern' should either be a compiled regex object or a 'pattern'. 'pattern' should either be a compiled regex object or a
...@@ -237,8 +235,8 @@ class config(Command): ...@@ -237,8 +235,8 @@ class config(Command):
self._clean() self._clean()
return ok return ok
def try_link(self, body, headers=None, include_dirs=None, def try_link(self, body, headers=None, include_dirs=None, libraries=None,
libraries=None, library_dirs=None, lang="c"): library_dirs=None, lang="c"):
"""Try to compile and link a source file, built from 'body' and """Try to compile and link a source file, built from 'body' and
'headers', to executable form. Return true on success, false 'headers', to executable form. Return true on success, false
otherwise. otherwise.
...@@ -256,8 +254,8 @@ class config(Command): ...@@ -256,8 +254,8 @@ class config(Command):
self._clean() self._clean()
return ok return ok
def try_run(self, body, headers=None, include_dirs=None, def try_run(self, body, headers=None, include_dirs=None, libraries=None,
libraries=None, library_dirs=None, lang="c"): library_dirs=None, lang="c"):
"""Try to compile, link to an executable, and run a program """Try to compile, link to an executable, and run a program
built from 'body' and 'headers'. Return true on success, false built from 'body' and 'headers'. Return true on success, false
otherwise. otherwise.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment