1999-03-22 10:55:25 -04:00
|
|
|
"""distutils.command.build_py
|
|
|
|
|
|
|
|
Implements the Distutils 'build_py' command."""
|
|
|
|
|
2011-11-02 23:45:33 -03:00
|
|
|
import os
|
2013-06-15 13:59:53 -03:00
|
|
|
import importlib.util
|
2009-10-25 20:08:47 -03:00
|
|
|
import sys
|
2020-06-20 05:10:31 -03:00
|
|
|
import glob
|
1999-09-21 15:22:34 -03:00
|
|
|
|
1999-03-22 10:55:25 -04:00
|
|
|
from distutils.core import Command
|
2010-07-22 09:50:05 -03:00
|
|
|
from distutils.errors import *
|
2008-12-01 00:38:52 -04:00
|
|
|
from distutils.util import convert_path, Mixin2to3
|
2002-06-04 17:14:43 -03:00
|
|
|
from distutils import log
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2010-07-22 09:50:05 -03:00
|
|
|
class build_py (Command):
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2000-01-30 14:34:15 -04:00
|
|
|
description = "\"build\" pure Python modules (copy to build directory)"
|
|
|
|
|
2000-02-17 20:25:39 -04:00
|
|
|
user_options = [
|
2000-02-29 21:19:37 -04:00
|
|
|
('build-lib=', 'd', "directory to \"build\" (copy) to"),
|
2000-10-01 23:19:04 -03:00
|
|
|
('compile', 'c', "compile .py to .pyc"),
|
|
|
|
('no-compile', None, "don't compile .py files [default]"),
|
|
|
|
('optimize=', 'O',
|
|
|
|
"also compile with optimization: -O1 for \"python -O\", "
|
|
|
|
"-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
|
2000-09-05 23:06:27 -03:00
|
|
|
('force', 'f', "forcibly build everything (ignore file timestamps)"),
|
2000-02-17 20:25:39 -04:00
|
|
|
]
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2000-10-01 23:19:04 -03:00
|
|
|
boolean_options = ['compile', 'force']
|
|
|
|
negative_opt = {'no-compile' : 'compile'}
|
2000-09-24 22:41:15 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def initialize_options(self):
|
2000-02-29 21:19:37 -04:00
|
|
|
self.build_lib = None
|
2000-06-04 10:42:52 -03:00
|
|
|
self.py_modules = None
|
1999-09-07 23:42:30 -03:00
|
|
|
self.package = None
|
2004-06-11 18:50:33 -03:00
|
|
|
self.package_data = None
|
1999-09-21 15:22:34 -03:00
|
|
|
self.package_dir = None
|
2000-10-01 23:19:04 -03:00
|
|
|
self.compile = 0
|
|
|
|
self.optimize = 0
|
2000-04-09 21:19:42 -03:00
|
|
|
self.force = None
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def finalize_options(self):
|
2000-09-30 15:27:54 -03:00
|
|
|
self.set_undefined_options('build',
|
|
|
|
('build_lib', 'build_lib'),
|
|
|
|
('force', 'force'))
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
# Get the distribution options that are aliases for build_py
|
|
|
|
# options -- list of packages and list of modules.
|
|
|
|
self.packages = self.distribution.packages
|
2000-06-04 10:42:52 -03:00
|
|
|
self.py_modules = self.distribution.py_modules
|
2004-06-11 18:50:33 -03:00
|
|
|
self.package_data = self.distribution.package_data
|
2002-02-01 05:44:09 -04:00
|
|
|
self.package_dir = {}
|
|
|
|
if self.distribution.package_dir:
|
|
|
|
for name, path in self.distribution.package_dir.items():
|
|
|
|
self.package_dir[name] = convert_path(path)
|
2004-06-17 17:16:19 -03:00
|
|
|
self.data_files = self.get_data_files()
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2000-10-01 23:19:04 -03:00
|
|
|
# Ick, copied straight from install_lib.py (fancy_getopt needs a
|
|
|
|
# type system! Hell, *everything* needs a type system!!!)
|
2007-08-30 00:52:21 -03:00
|
|
|
if not isinstance(self.optimize, int):
|
2000-10-01 23:19:04 -03:00
|
|
|
try:
|
|
|
|
self.optimize = int(self.optimize)
|
|
|
|
assert 0 <= self.optimize <= 2
|
|
|
|
except (ValueError, AssertionError):
|
2007-08-30 00:52:21 -03:00
|
|
|
raise DistutilsOptionError("optimize must be 0, 1, or 2")
|
1999-03-22 10:55:25 -04:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def run(self):
|
1999-12-12 13:03:59 -04:00
|
|
|
# XXX copy_file by default preserves atime and mtime. IMHO this is
|
|
|
|
# the right thing to do, but perhaps it should be an option -- in
|
|
|
|
# particular, a site administrator might want installed files to
|
|
|
|
# reflect the time of installation rather than the last
|
|
|
|
# modification time before the installed release.
|
|
|
|
|
|
|
|
# XXX copy_file by default preserves mode, which appears to be the
|
|
|
|
# wrong thing to do: if a file is read-only in the working
|
|
|
|
# directory, we want it to be installed read/write so that the next
|
|
|
|
# installation of the same module distribution can overwrite it
|
|
|
|
# without problems. (This might be a Unix-specific issue.) Thus
|
|
|
|
# we turn off 'preserve_mode' when copying to the build directory,
|
|
|
|
# since the build directory is supposed to be exactly what the
|
|
|
|
# installation will look like (ie. we preserve mode when
|
|
|
|
# installing).
|
1999-03-22 10:55:25 -04:00
|
|
|
|
1999-09-21 15:22:34 -03:00
|
|
|
# Two options control which modules will be installed: 'packages'
|
2000-06-04 10:42:52 -03:00
|
|
|
# and 'py_modules'. The former lets us work with whole packages, not
|
1999-09-21 15:22:34 -03:00
|
|
|
# specifying individual modules at all; the latter is for
|
2003-02-28 18:03:04 -04:00
|
|
|
# specifying modules one-at-a-time.
|
|
|
|
|
2000-06-04 10:42:52 -03:00
|
|
|
if self.py_modules:
|
2000-09-30 15:27:54 -03:00
|
|
|
self.build_modules()
|
2003-02-28 18:03:04 -04:00
|
|
|
if self.packages:
|
2000-09-30 15:27:54 -03:00
|
|
|
self.build_packages()
|
2004-06-11 18:50:33 -03:00
|
|
|
self.build_package_data()
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2000-10-01 23:19:04 -03:00
|
|
|
self.byte_compile(self.get_outputs(include_bytecode=0))
|
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def get_data_files(self):
|
2004-06-11 18:50:33 -03:00
|
|
|
"""Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
|
|
|
|
data = []
|
2004-06-18 17:39:11 -03:00
|
|
|
if not self.packages:
|
|
|
|
return data
|
2004-06-11 18:50:33 -03:00
|
|
|
for package in self.packages:
|
|
|
|
# Locate package source directory
|
|
|
|
src_dir = self.get_package_dir(package)
|
|
|
|
|
|
|
|
# Compute package build directory
|
|
|
|
build_dir = os.path.join(*([self.build_lib] + package.split('.')))
|
|
|
|
|
|
|
|
# Length of path to strip from found files
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-13 15:07:49 -03:00
|
|
|
plen = 0
|
|
|
|
if src_dir:
|
|
|
|
plen = len(src_dir)+1
|
2004-06-11 18:50:33 -03:00
|
|
|
|
|
|
|
# Strip directory from globbed filenames
|
|
|
|
filenames = [
|
|
|
|
file[plen:] for file in self.find_data_files(package, src_dir)
|
|
|
|
]
|
|
|
|
data.append((package, src_dir, build_dir, filenames))
|
|
|
|
return data
|
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def find_data_files(self, package, src_dir):
|
2004-06-11 18:50:33 -03:00
|
|
|
"""Return filenames for package's data files in 'src_dir'"""
|
|
|
|
globs = (self.package_data.get('', [])
|
|
|
|
+ self.package_data.get(package, []))
|
|
|
|
files = []
|
|
|
|
for pattern in globs:
|
|
|
|
# Each pattern has to be converted to a platform-specific path
|
2020-06-20 05:10:31 -03:00
|
|
|
filelist = glob.glob(os.path.join(glob.escape(src_dir), convert_path(pattern)))
|
2004-06-11 18:50:33 -03:00
|
|
|
# Files that match more than one pattern are only added once
|
2013-11-02 12:07:35 -03:00
|
|
|
files.extend([fn for fn in filelist if fn not in files
|
|
|
|
and os.path.isfile(fn)])
|
2004-06-11 18:50:33 -03:00
|
|
|
return files
|
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def build_package_data(self):
|
2004-06-11 18:50:33 -03:00
|
|
|
"""Copy data files into build directory"""
|
2010-07-22 09:50:05 -03:00
|
|
|
lastdir = None
|
2004-06-11 18:50:33 -03:00
|
|
|
for package, src_dir, build_dir, filenames in self.data_files:
|
|
|
|
for filename in filenames:
|
|
|
|
target = os.path.join(build_dir, filename)
|
|
|
|
self.mkpath(os.path.dirname(target))
|
|
|
|
self.copy_file(os.path.join(src_dir, filename), target,
|
|
|
|
preserve_mode=False)
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def get_package_dir(self, package):
|
1999-09-21 15:22:34 -03:00
|
|
|
"""Return the directory, relative to the top of the source
|
|
|
|
distribution, where package 'package' should be found
|
|
|
|
(at least according to the 'package_dir' option, if any)."""
|
2007-04-17 05:48:32 -03:00
|
|
|
path = package.split('.')
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
if not self.package_dir:
|
1999-12-03 12:18:56 -04:00
|
|
|
if path:
|
2006-03-17 04:00:19 -04:00
|
|
|
return os.path.join(*path)
|
1999-12-03 12:18:56 -04:00
|
|
|
else:
|
|
|
|
return ''
|
1999-09-21 15:22:34 -03:00
|
|
|
else:
|
|
|
|
tail = []
|
|
|
|
while path:
|
|
|
|
try:
|
2007-04-17 05:48:32 -03:00
|
|
|
pdir = self.package_dir['.'.join(path)]
|
1999-09-21 15:22:34 -03:00
|
|
|
except KeyError:
|
2000-09-30 15:27:54 -03:00
|
|
|
tail.insert(0, path[-1])
|
1999-09-21 15:22:34 -03:00
|
|
|
del path[-1]
|
|
|
|
else:
|
2000-09-30 15:27:54 -03:00
|
|
|
tail.insert(0, pdir)
|
2006-03-17 04:00:19 -04:00
|
|
|
return os.path.join(*tail)
|
1999-03-22 10:55:25 -04:00
|
|
|
else:
|
2000-05-25 21:44:06 -03:00
|
|
|
# Oops, got all the way through 'path' without finding a
|
|
|
|
# match in package_dir. If package_dir defines a directory
|
|
|
|
# for the root (nameless) package, then fallback on it;
|
|
|
|
# otherwise, we might as well have not consulted
|
|
|
|
# package_dir at all, as we just use the directory implied
|
|
|
|
# by 'tail' (which should be the same as the original value
|
|
|
|
# of 'path' at this point).
|
|
|
|
pdir = self.package_dir.get('')
|
|
|
|
if pdir is not None:
|
|
|
|
tail.insert(0, pdir)
|
|
|
|
|
1999-12-03 12:18:56 -04:00
|
|
|
if tail:
|
2006-03-17 04:00:19 -04:00
|
|
|
return os.path.join(*tail)
|
1999-12-03 12:18:56 -04:00
|
|
|
else:
|
|
|
|
return ''
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def check_package(self, package, package_dir):
|
1999-09-21 15:22:34 -03:00
|
|
|
# Empty dir name means current directory, which we can probably
|
|
|
|
# assume exists. Also, os.path.exists and isdir don't know about
|
|
|
|
# my "empty string means current dir" convention, so we have to
|
|
|
|
# circumvent them.
|
|
|
|
if package_dir != "":
|
2000-09-30 15:27:54 -03:00
|
|
|
if not os.path.exists(package_dir):
|
2007-08-30 00:52:21 -03:00
|
|
|
raise DistutilsFileError(
|
|
|
|
"package directory '%s' does not exist" % package_dir)
|
2000-09-30 15:27:54 -03:00
|
|
|
if not os.path.isdir(package_dir):
|
2007-08-30 00:52:21 -03:00
|
|
|
raise DistutilsFileError(
|
|
|
|
"supposed package directory '%s' exists, "
|
|
|
|
"but is not a directory" % package_dir)
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
# Require __init__.py for all but the "root package"
|
1999-12-03 12:18:56 -04:00
|
|
|
if package:
|
2000-09-30 15:27:54 -03:00
|
|
|
init_py = os.path.join(package_dir, "__init__.py")
|
|
|
|
if os.path.isfile(init_py):
|
2000-05-25 21:44:06 -03:00
|
|
|
return init_py
|
|
|
|
else:
|
2002-06-04 17:14:43 -03:00
|
|
|
log.warn(("package init file '%s' not found " +
|
|
|
|
"(or not a regular file)"), init_py)
|
2000-05-25 21:44:06 -03:00
|
|
|
|
|
|
|
# Either not in a package at all (__init__.py not expected), or
|
|
|
|
# __init__.py doesn't exist -- so don't return the filename.
|
2002-06-04 18:00:20 -03:00
|
|
|
return None
|
2001-12-06 17:01:19 -04:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def check_module(self, module, module_file):
|
2000-09-30 15:27:54 -03:00
|
|
|
if not os.path.isfile(module_file):
|
2002-06-04 17:14:43 -03:00
|
|
|
log.warn("file %s (for module %s) not found", module_file, module)
|
2007-08-30 00:52:21 -03:00
|
|
|
return False
|
1999-09-21 15:22:34 -03:00
|
|
|
else:
|
2007-08-30 00:52:21 -03:00
|
|
|
return True
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def find_package_modules(self, package, package_dir):
|
2000-09-30 15:27:54 -03:00
|
|
|
self.check_package(package, package_dir)
|
2020-06-20 05:10:31 -03:00
|
|
|
module_files = glob.glob(os.path.join(glob.escape(package_dir), "*.py"))
|
2000-03-28 22:10:51 -04:00
|
|
|
modules = []
|
2000-08-28 22:15:18 -03:00
|
|
|
setup_script = os.path.abspath(self.distribution.script_name)
|
1999-12-12 13:03:59 -04:00
|
|
|
|
1999-09-21 15:22:34 -03:00
|
|
|
for f in module_files:
|
2000-09-30 15:27:54 -03:00
|
|
|
abs_f = os.path.abspath(f)
|
1999-12-12 13:03:59 -04:00
|
|
|
if abs_f != setup_script:
|
2000-09-30 15:27:54 -03:00
|
|
|
module = os.path.splitext(os.path.basename(f))[0]
|
|
|
|
modules.append((package, module, f))
|
2000-08-28 22:15:18 -03:00
|
|
|
else:
|
|
|
|
self.debug_print("excluding %s" % setup_script)
|
2000-03-28 22:10:51 -04:00
|
|
|
return modules
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def find_modules(self):
|
2000-05-25 21:44:06 -03:00
|
|
|
"""Finds individually-specified Python modules, ie. those listed by
|
2000-06-04 10:42:52 -03:00
|
|
|
module name in 'self.py_modules'. Returns a list of tuples (package,
|
2000-05-25 21:44:06 -03:00
|
|
|
module_base, filename): 'package' is a tuple of the path through
|
|
|
|
package-space to the module; 'module_base' is the bare (no
|
|
|
|
packages, no dots) module name, and 'filename' is the path to the
|
|
|
|
".py" file (relative to the distribution root) that implements the
|
|
|
|
module.
|
|
|
|
"""
|
1999-09-21 15:22:34 -03:00
|
|
|
# Map package names to tuples of useful info about the package:
|
|
|
|
# (package_dir, checked)
|
|
|
|
# package_dir - the directory where we'll find source files for
|
|
|
|
# this package
|
|
|
|
# checked - true if we have checked that the package directory
|
|
|
|
# is valid (exists, contains __init__.py, ... ?)
|
|
|
|
packages = {}
|
|
|
|
|
2000-05-25 21:44:06 -03:00
|
|
|
# List of (package, module, filename) tuples to return
|
1999-09-29 09:44:57 -03:00
|
|
|
modules = []
|
|
|
|
|
1999-09-21 15:22:34 -03:00
|
|
|
# We treat modules-in-packages almost the same as toplevel modules,
|
|
|
|
# just the "package" for a toplevel is empty (either an empty
|
|
|
|
# string or empty list, depending on context). Differences:
|
|
|
|
# - don't check for __init__.py in directory for empty package
|
2000-06-04 10:42:52 -03:00
|
|
|
for module in self.py_modules:
|
2007-04-17 05:48:32 -03:00
|
|
|
path = module.split('.')
|
|
|
|
package = '.'.join(path[0:-1])
|
1999-09-29 09:44:57 -03:00
|
|
|
module_base = path[-1]
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
try:
|
|
|
|
(package_dir, checked) = packages[package]
|
|
|
|
except KeyError:
|
2000-09-30 15:27:54 -03:00
|
|
|
package_dir = self.get_package_dir(package)
|
1999-09-21 15:22:34 -03:00
|
|
|
checked = 0
|
|
|
|
|
|
|
|
if not checked:
|
2000-09-30 15:27:54 -03:00
|
|
|
init_py = self.check_package(package, package_dir)
|
1999-09-21 15:22:34 -03:00
|
|
|
packages[package] = (package_dir, 1)
|
2000-05-25 21:44:06 -03:00
|
|
|
if init_py:
|
|
|
|
modules.append((package, "__init__", init_py))
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
# XXX perhaps we should also check for just .pyc files
|
|
|
|
# (so greedy closed-source bastards can distribute Python
|
|
|
|
# modules too)
|
2000-09-30 15:27:54 -03:00
|
|
|
module_file = os.path.join(package_dir, module_base + ".py")
|
|
|
|
if not self.check_module(module, module_file):
|
1999-09-21 15:22:34 -03:00
|
|
|
continue
|
|
|
|
|
2000-09-30 15:27:54 -03:00
|
|
|
modules.append((package, module_base, module_file))
|
1999-09-29 09:44:57 -03:00
|
|
|
|
|
|
|
return modules
|
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def find_all_modules(self):
|
2000-03-28 22:10:51 -04:00
|
|
|
"""Compute the list of all modules that will be built, whether
|
2000-06-04 10:42:52 -03:00
|
|
|
they are specified one-module-at-a-time ('self.py_modules') or
|
2000-03-28 22:10:51 -04:00
|
|
|
by whole packages ('self.packages'). Return a list of tuples
|
|
|
|
(package, module, module_file), just like 'find_modules()' and
|
|
|
|
'find_package_modules()' do."""
|
2003-02-28 18:03:04 -04:00
|
|
|
modules = []
|
2000-06-04 10:42:52 -03:00
|
|
|
if self.py_modules:
|
2003-02-28 18:03:04 -04:00
|
|
|
modules.extend(self.find_modules())
|
|
|
|
if self.packages:
|
1999-09-29 09:44:57 -03:00
|
|
|
for package in self.packages:
|
2000-09-30 15:27:54 -03:00
|
|
|
package_dir = self.get_package_dir(package)
|
|
|
|
m = self.find_package_modules(package, package_dir)
|
|
|
|
modules.extend(m)
|
2000-03-28 22:10:51 -04:00
|
|
|
return modules
|
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def get_source_files(self):
|
|
|
|
return [module[-1] for module in self.find_all_modules()]
|
2000-03-28 22:10:51 -04:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def get_module_outfile(self, build_dir, package, module):
|
2000-03-28 22:10:51 -04:00
|
|
|
outfile_path = [build_dir] + list(package) + [module + ".py"]
|
2006-03-17 04:00:19 -04:00
|
|
|
return os.path.join(*outfile_path)
|
2000-03-28 22:10:51 -04:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def get_outputs(self, include_bytecode=1):
|
2000-09-30 15:27:54 -03:00
|
|
|
modules = self.find_all_modules()
|
2000-03-28 22:10:51 -04:00
|
|
|
outputs = []
|
|
|
|
for (package, module, module_file) in modules:
|
2007-04-17 05:48:32 -03:00
|
|
|
package = package.split('.')
|
2000-10-01 23:19:04 -03:00
|
|
|
filename = self.get_module_outfile(self.build_lib, package, module)
|
|
|
|
outputs.append(filename)
|
|
|
|
if include_bytecode:
|
|
|
|
if self.compile:
|
2013-06-15 13:59:53 -03:00
|
|
|
outputs.append(importlib.util.cache_from_source(
|
2015-04-13 15:21:02 -03:00
|
|
|
filename, optimization=''))
|
2000-10-01 23:19:04 -03:00
|
|
|
if self.optimize > 0:
|
2013-06-15 13:59:53 -03:00
|
|
|
outputs.append(importlib.util.cache_from_source(
|
2015-04-13 15:21:02 -03:00
|
|
|
filename, optimization=self.optimize))
|
2000-10-01 23:19:04 -03:00
|
|
|
|
2004-06-11 18:50:33 -03:00
|
|
|
outputs += [
|
|
|
|
os.path.join(build_dir, filename)
|
|
|
|
for package, src_dir, build_dir, filenames in self.data_files
|
|
|
|
for filename in filenames
|
|
|
|
]
|
|
|
|
|
2000-03-28 22:10:51 -04:00
|
|
|
return outputs
|
1999-09-29 09:44:57 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def build_module(self, module, module_file, package):
|
2007-10-16 15:12:55 -03:00
|
|
|
if isinstance(package, str):
|
2007-04-17 05:48:32 -03:00
|
|
|
package = package.split('.')
|
2007-08-30 00:52:21 -03:00
|
|
|
elif not isinstance(package, (list, tuple)):
|
|
|
|
raise TypeError(
|
|
|
|
"'package' must be a string (dot-separated), list, or tuple")
|
1999-09-29 09:44:57 -03:00
|
|
|
|
|
|
|
# Now put the module source file into the "build" area -- this is
|
2000-02-29 21:19:37 -04:00
|
|
|
# easy, we just copy it somewhere under self.build_lib (the build
|
1999-09-29 09:44:57 -03:00
|
|
|
# directory for Python source).
|
2000-09-30 15:27:54 -03:00
|
|
|
outfile = self.get_module_outfile(self.build_lib, package, module)
|
|
|
|
dir = os.path.dirname(outfile)
|
|
|
|
self.mkpath(dir)
|
|
|
|
return self.copy_file(module_file, outfile, preserve_mode=0)
|
1999-09-29 09:44:57 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def build_modules(self):
|
1999-09-29 09:44:57 -03:00
|
|
|
modules = self.find_modules()
|
2000-03-28 22:10:51 -04:00
|
|
|
for (package, module, module_file) in modules:
|
1999-09-21 15:22:34 -03:00
|
|
|
# Now "build" the module -- ie. copy the source file to
|
2000-02-29 21:19:37 -04:00
|
|
|
# self.build_lib (the build directory for Python source).
|
1999-09-29 09:44:57 -03:00
|
|
|
# (Actually, it gets copied to the directory for this package
|
2000-02-29 21:19:37 -04:00
|
|
|
# under self.build_lib.)
|
2000-09-30 15:27:54 -03:00
|
|
|
self.build_module(module, module_file, package)
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def build_packages(self):
|
1999-09-21 15:22:34 -03:00
|
|
|
for package in self.packages:
|
2000-03-28 22:10:51 -04:00
|
|
|
# Get list of (package, module, module_file) tuples based on
|
|
|
|
# scanning the package directory. 'package' is only included
|
|
|
|
# in the tuple so that 'find_modules()' and
|
|
|
|
# 'find_package_tuples()' have a consistent interface; it's
|
|
|
|
# ignored here (apart from a sanity check). Also, 'module' is
|
|
|
|
# the *unqualified* module name (ie. no dots, no package -- we
|
|
|
|
# already know its package!), and 'module_file' is the path to
|
|
|
|
# the .py file, relative to the current directory
|
|
|
|
# (ie. including 'package_dir').
|
2000-09-30 15:27:54 -03:00
|
|
|
package_dir = self.get_package_dir(package)
|
|
|
|
modules = self.find_package_modules(package, package_dir)
|
1999-09-21 15:22:34 -03:00
|
|
|
|
|
|
|
# Now loop over the modules we found, "building" each one (just
|
2000-02-29 21:19:37 -04:00
|
|
|
# copy it to self.build_lib).
|
2000-03-28 22:10:51 -04:00
|
|
|
for (package_, module, module_file) in modules:
|
|
|
|
assert package == package_
|
2000-09-30 15:27:54 -03:00
|
|
|
self.build_module(module, module_file, package)
|
1999-09-21 15:22:34 -03:00
|
|
|
|
2007-08-30 00:52:21 -03:00
|
|
|
def byte_compile(self, files):
|
2009-10-25 20:08:47 -03:00
|
|
|
if sys.dont_write_bytecode:
|
|
|
|
self.warn('byte-compiling is disabled, skipping.')
|
|
|
|
return
|
|
|
|
|
2000-10-01 23:19:04 -03:00
|
|
|
from distutils.util import byte_compile
|
|
|
|
prefix = self.build_lib
|
|
|
|
if prefix[-1] != os.sep:
|
|
|
|
prefix = prefix + os.sep
|
|
|
|
|
|
|
|
# XXX this code is essentially the same as the 'byte_compile()
|
|
|
|
# method of the "install_lib" command, except for the determination
|
|
|
|
# of the 'prefix' string. Hmmm.
|
|
|
|
if self.compile:
|
|
|
|
byte_compile(files, optimize=0,
|
2002-06-04 17:14:43 -03:00
|
|
|
force=self.force, prefix=prefix, dry_run=self.dry_run)
|
2000-10-01 23:19:04 -03:00
|
|
|
if self.optimize > 0:
|
|
|
|
byte_compile(files, optimize=self.optimize,
|
2002-06-04 17:14:43 -03:00
|
|
|
force=self.force, prefix=prefix, dry_run=self.dry_run)
|
2008-03-21 21:35:10 -03:00
|
|
|
|
2008-12-01 00:38:52 -04:00
|
|
|
class build_py_2to3(build_py, Mixin2to3):
|
2008-03-21 21:35:10 -03:00
|
|
|
def run(self):
|
|
|
|
self.updated_files = []
|
2008-03-22 19:07:43 -03:00
|
|
|
|
|
|
|
# Base class code
|
|
|
|
if self.py_modules:
|
|
|
|
self.build_modules()
|
|
|
|
if self.packages:
|
|
|
|
self.build_packages()
|
|
|
|
self.build_package_data()
|
|
|
|
|
|
|
|
# 2to3
|
2008-12-01 00:38:52 -04:00
|
|
|
self.run_2to3(self.updated_files)
|
2008-03-21 21:35:10 -03:00
|
|
|
|
2008-03-22 19:07:43 -03:00
|
|
|
# Remaining base class code
|
|
|
|
self.byte_compile(self.get_outputs(include_bytecode=0))
|
|
|
|
|
2008-03-21 21:35:10 -03:00
|
|
|
def build_module(self, module, module_file, package):
|
|
|
|
res = build_py.build_module(self, module, module_file, package)
|
|
|
|
if res[1]:
|
|
|
|
# file was copied
|
|
|
|
self.updated_files.append(res[0])
|
|
|
|
return res
|