Kaydet (Commit) 16313069 authored tarafından Jürgen Schmidt's avatar Jürgen Schmidt

#122010# update Python to 2.7.5

üst b60db343
...@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES) ...@@ -217,9 +217,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES) if (SYSTEM_PYTHON != YES)
MD5 = 62704ea0f125923208d84ff0568f7d50 MD5 = 6334b666b7ff2038c761d7b27ba699c1
name = Python-2.7.4.tar.bz2 name = Python-2.7.5.tar.bz2
URL1 = http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tar.bz2 URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC)) if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
......
...@@ -42,7 +42,7 @@ all: ...@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION) TARFILE_NAME=Python-$(PYVERSION)
TARFILE_MD5=62704ea0f125923208d84ff0568f7d50 TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1
PATCH_FILES=\ PATCH_FILES=\
python-solaris.patch \ python-solaris.patch \
python-freebsd.patch \ python-freebsd.patch \
......
diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pyport.h diff -ru misc/Python-2.7.5/Include/pyport.h misc/build/Python-2.7.5/Include/pyport.h
--- misc/Python-2.7.3/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500
@@ -9,6 +9,30 @@ @@ -9,6 +9,30 @@
#include <inttypes.h> #include <inttypes.h>
#endif #endif
...@@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pypo ...@@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pypo
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
#endif #endif
diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py misc/build/Python-2.7.3/Lib/distutils/ccompiler.py diff -ru misc/Python-2.7.5/Lib/distutils/ccompiler.py misc/build/Python-2.7.5/Lib/distutils/ccompiler.py
--- misc/Python-2.7.3/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500
@@ -893,6 +893,7 @@ @@ -893,6 +893,7 @@
# on a cygwin built python we can use gcc like an ordinary UNIXish # on a cygwin built python we can use gcc like an ordinary UNIXish
# compiler # compiler
...@@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py misc/build/Python-2.7.3/Li ...@@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/ccompiler.py misc/build/Python-2.7.3/Li
('os2emx', 'emx'), ('os2emx', 'emx'),
# OS name mappings # OS name mappings
diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py diff -ru misc/Python-2.7.5/Lib/distutils/command/build_ext.py misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py
--- misc/Python-2.7.3/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -0500
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
# for extensions under Cygwin and AtheOS Python's library directory must be # for extensions under Cygwin and AtheOS Python's library directory must be
...@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py misc/build/Python- ...@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/build_ext.py misc/build/Python-
template = "python%d.%d" template = "python%d.%d"
pythonlib = (template % pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py misc/build/Python-2.7.3/Lib/distutils/command/install.py diff -ru misc/Python-2.7.5/Lib/distutils/command/install.py misc/build/Python-2.7.5/Lib/distutils/command/install.py
--- misc/Python-2.7.3/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500
@@ -348,9 +348,10 @@ @@ -348,9 +348,10 @@
# Convert directories from Unix /-separated syntax to the local # Convert directories from Unix /-separated syntax to the local
...@@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py misc/build/Python-2. ...@@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/command/install.py misc/build/Python-2.
def handle_extra_path (self): def handle_extra_path (self):
diff -ru misc/Python-2.7.3/Lib/distutils/spawn.py misc/build/Python-2.7.3/Lib/distutils/spawn.py diff -ru misc/Python-2.7.5/Lib/distutils/spawn.py misc/build/Python-2.7.5/Lib/distutils/spawn.py
--- misc/Python-2.7.3/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
paths = path.split(os.pathsep) paths = path.split(os.pathsep)
base, ext = os.path.splitext(executable) base, ext = os.path.splitext(executable)
...@@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/spawn.py misc/build/Python-2.7.3/Lib/di ...@@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/spawn.py misc/build/Python-2.7.3/Lib/di
executable = executable + '.exe' executable = executable + '.exe'
if not os.path.isfile(executable): if not os.path.isfile(executable):
diff -ru misc/Python-2.7.3/Lib/distutils/sysconfig.py misc/build/Python-2.7.3/Lib/distutils/sysconfig.py diff -ru misc/Python-2.7.5/Lib/distutils/sysconfig.py misc/build/Python-2.7.5/Lib/distutils/sysconfig.py
--- misc/Python-2.7.3/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500
@@ -419,6 +419,9 @@ @@ -419,6 +419,9 @@
raise DistutilsPlatformError(my_msg) raise DistutilsPlatformError(my_msg)
...@@ -137,9 +137,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/sysconfig.py misc/build/Python-2.7.3/Li ...@@ -137,9 +137,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/sysconfig.py misc/build/Python-2.7.3/Li
if func: if func:
func() func()
else: else:
diff -ru misc/Python-2.7.3/Lib/distutils/unixccompiler.py misc/build/Python-2.7.3/Lib/distutils/unixccompiler.py diff -ru misc/Python-2.7.5/Lib/distutils/unixccompiler.py misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py
--- misc/Python-2.7.3/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500 --- misc/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
shared_lib_extension = ".so" shared_lib_extension = ".so"
dylib_lib_extension = ".dylib" dylib_lib_extension = ".dylib"
...@@ -149,9 +149,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/unixccompiler.py misc/build/Python-2.7. ...@@ -149,9 +149,9 @@ diff -ru misc/Python-2.7.3/Lib/distutils/unixccompiler.py misc/build/Python-2.7.
exe_extension = ".exe" exe_extension = ".exe"
def preprocess(self, source, def preprocess(self, source,
diff -ru misc/Python-2.7.3/Lib/os.py misc/build/Python-2.7.3/Lib/os.py diff -ru misc/Python-2.7.5/Lib/os.py misc/build/Python-2.7.5/Lib/os.py
--- misc/Python-2.7.3/Lib/os.py 2012-04-09 18:07:30.000000000 -0500 --- misc/Python-2.7.5/Lib/os.py 2012-04-09 18:07:30.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/os.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/os.py 2012-07-25 15:33:16.000000000 -0500
@@ -38,7 +38,21 @@ @@ -38,7 +38,21 @@
except AttributeError: except AttributeError:
return [n for n in dir(module) if n[0] != '_'] return [n for n in dir(module) if n[0] != '_']
...@@ -175,9 +175,9 @@ diff -ru misc/Python-2.7.3/Lib/os.py misc/build/Python-2.7.3/Lib/os.py ...@@ -175,9 +175,9 @@ diff -ru misc/Python-2.7.3/Lib/os.py misc/build/Python-2.7.3/Lib/os.py
name = 'posix' name = 'posix'
linesep = '\n' linesep = '\n'
from posix import * from posix import *
diff -ru misc/Python-2.7.3/Lib/socket.py misc/build/Python-2.7.3/Lib/socket.py diff -ru misc/Python-2.7.5/Lib/socket.py misc/build/Python-2.7.5/Lib/socket.py
--- misc/Python-2.7.3/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500 --- misc/Python-2.7.5/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
'sendall', 'setblocking', 'sendall', 'setblocking',
'settimeout', 'gettimeout', 'shutdown') 'settimeout', 'gettimeout', 'shutdown')
...@@ -187,9 +187,9 @@ diff -ru misc/Python-2.7.3/Lib/socket.py misc/build/Python-2.7.3/Lib/socket.py ...@@ -187,9 +187,9 @@ diff -ru misc/Python-2.7.3/Lib/socket.py misc/build/Python-2.7.3/Lib/socket.py
_socketmethods = _socketmethods + ('ioctl',) _socketmethods = _socketmethods + ('ioctl',)
if sys.platform == "riscos": if sys.platform == "riscos":
diff -ru misc/Python-2.7.3/Makefile.pre.in misc/build/Python-2.7.3/Makefile.pre.in diff -ru misc/Python-2.7.5/Makefile.pre.in misc/build/Python-2.7.5/Makefile.pre.in
--- misc/Python-2.7.3/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500 +++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500
@@ -112,6 +112,16 @@ @@ -112,6 +112,16 @@
BLDSHARED= @BLDSHARED@ $(LDFLAGS) BLDSHARED= @BLDSHARED@ $(LDFLAGS)
LDCXXSHARED= @LDCXXSHARED@ LDCXXSHARED= @LDCXXSHARED@
...@@ -347,9 +347,9 @@ diff -ru misc/Python-2.7.3/Makefile.pre.in misc/build/Python-2.7.3/Makefile.pre. ...@@ -347,9 +347,9 @@ diff -ru misc/Python-2.7.3/Makefile.pre.in misc/build/Python-2.7.3/Makefile.pre.
# Here are a couple of targets for MacOSX again, to install a full # Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the # framework-based Python. frameworkinstall installs everything, the
# subtargets install specific parts. Much of the actual work is offloaded to # subtargets install specific parts. Much of the actual work is offloaded to
diff -ru misc/Python-2.7.3/Modules/Setup.config.in misc/build/Python-2.7.3/Modules/Setup.config.in diff -ru misc/Python-2.7.5/Modules/Setup.config.in misc/build/Python-2.7.5/Modules/Setup.config.in
--- misc/Python-2.7.3/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500
@@ -9,5 +9,9 @@ @@ -9,5 +9,9 @@
# The signal module # The signal module
@USE_SIGNAL_MODULE@signal signalmodule.c @USE_SIGNAL_MODULE@signal signalmodule.c
...@@ -360,9 +360,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.config.in misc/build/Python-2.7.3/Modul ...@@ -360,9 +360,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.config.in misc/build/Python-2.7.3/Modul
+ +
# The rest of the modules previously listed in this file are built # The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later. # by the setup.py script in Python 2.1 and later.
diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist
--- misc/Python-2.7.3/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
posix posixmodule.c # posix (UNIX) system calls posix posixmodule.c # posix (UNIX) system calls
...@@ -372,9 +372,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Se ...@@ -372,9 +372,9 @@ diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Se
# if $HOME is not set # if $HOME is not set
_sre _sre.c # Fredrik Lundh's new regular expressions _sre _sre.c # Fredrik Lundh's new regular expressions
_codecs _codecsmodule.c # access to the builtin codecs and codec registry _codecs _codecsmodule.c # access to the builtin codecs and codec registry
diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure
--- misc/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
...@@ -3572,9 +3572,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2. ...@@ -3572,9 +3572,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.
fi fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure.ac diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac
--- misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500
@@ -401,6 +401,12 @@ @@ -401,6 +401,12 @@
multilib_arg= multilib_arg=
fi fi
...@@ -3588,9 +3588,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac misc/build/Python ...@@ -3588,9 +3588,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure.ac misc/build/Python
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include]) AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [ AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src test -d src || mkdir src
diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in
--- misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500
@@ -359,7 +359,11 @@ @@ -359,7 +359,11 @@
ffi_type *rtype, ffi_type *rtype,
ffi_type **atypes); ffi_type **atypes);
...@@ -3603,9 +3603,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Py ...@@ -3603,9 +3603,9 @@ diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Py
void (*fn)(void), void (*fn)(void),
void *rvalue, void *rvalue,
void **avalue); void **avalue);
diff -ru misc/Python-2.7.3/Modules/config.c.in misc/build/Python-2.7.3/Modules/config.c.in diff -ru misc/Python-2.7.5/Modules/config.c.in misc/build/Python-2.7.5/Modules/config.c.in
--- misc/Python-2.7.3/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500 --- misc/Python-2.7.5/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500
@@ -48,6 +48,9 @@ @@ -48,6 +48,9 @@
{"__builtin__", NULL}, {"__builtin__", NULL},
{"sys", NULL}, {"sys", NULL},
...@@ -3616,9 +3616,9 @@ diff -ru misc/Python-2.7.3/Modules/config.c.in misc/build/Python-2.7.3/Modules/c ...@@ -3616,9 +3616,9 @@ diff -ru misc/Python-2.7.3/Modules/config.c.in misc/build/Python-2.7.3/Modules/c
/* This lives in gcmodule.c */ /* This lives in gcmodule.c */
{"gc", initgc}, {"gc", initgc},
diff -ru misc/Python-2.7.3/Modules/posixmodule.c misc/build/Python-2.7.3/Modules/posixmodule.c diff -ru misc/Python-2.7.5/Modules/posixmodule.c misc/build/Python-2.7.5/Modules/posixmodule.c
--- misc/Python-2.7.3/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500 --- misc/Python-2.7.5/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500
@@ -129,6 +129,15 @@ @@ -129,6 +129,15 @@
#define HAVE_FSYNC 1 #define HAVE_FSYNC 1
#define fsync _commit #define fsync _commit
...@@ -3685,9 +3685,9 @@ diff -ru misc/Python-2.7.3/Modules/posixmodule.c misc/build/Python-2.7.3/Modules ...@@ -3685,9 +3685,9 @@ diff -ru misc/Python-2.7.3/Modules/posixmodule.c misc/build/Python-2.7.3/Modules
/* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\, /* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
where / can be used in place of \ and the trailing slash is optional. where / can be used in place of \ and the trailing slash is optional.
diff -ru misc/Python-2.7.3/Modules/socketmodule.c misc/build/Python-2.7.3/Modules/socketmodule.c diff -ru misc/Python-2.7.5/Modules/socketmodule.c misc/build/Python-2.7.5/Modules/socketmodule.c
--- misc/Python-2.7.3/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500 --- misc/Python-2.7.5/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500
@@ -312,7 +312,7 @@ @@ -312,7 +312,7 @@
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
* EAI_* constants are defined in (the already included) ws2tcpip.h. * EAI_* constants are defined in (the already included) ws2tcpip.h.
...@@ -3697,9 +3697,9 @@ diff -ru misc/Python-2.7.3/Modules/socketmodule.c misc/build/Python-2.7.3/Module ...@@ -3697,9 +3697,9 @@ diff -ru misc/Python-2.7.3/Modules/socketmodule.c misc/build/Python-2.7.3/Module
# include "addrinfo.h" # include "addrinfo.h"
#endif #endif
diff -ru misc/Python-2.7.3/PC/_winreg.c misc/build/Python-2.7.3/PC/_winreg.c diff -ru misc/Python-2.7.5/PC/_winreg.c misc/build/Python-2.7.5/PC/_winreg.c
--- misc/Python-2.7.3/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500 +++ misc/build/Python-2.7.5/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500
@@ -1784,6 +1784,9 @@ @@ -1784,6 +1784,9 @@
} }
...@@ -3710,9 +3710,9 @@ diff -ru misc/Python-2.7.3/PC/_winreg.c misc/build/Python-2.7.3/PC/_winreg.c ...@@ -3710,9 +3710,9 @@ diff -ru misc/Python-2.7.3/PC/_winreg.c misc/build/Python-2.7.3/PC/_winreg.c
PyMODINIT_FUNC init_winreg(void) PyMODINIT_FUNC init_winreg(void)
{ {
diff -ru misc/Python-2.7.3/Python/dynload_win.c misc/build/Python-2.7.3/Python/dynload_win.c diff -ru misc/Python-2.7.5/Python/dynload_win.c misc/build/Python-2.7.5/Python/dynload_win.c
--- misc/Python-2.7.3/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500 +++ misc/build/Python-2.7.5/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
/* Case insensitive string compare, to avoid any dependencies on particular /* Case insensitive string compare, to avoid any dependencies on particular
C RTL implementations */ C RTL implementations */
...@@ -3729,9 +3729,9 @@ diff -ru misc/Python-2.7.3/Python/dynload_win.c misc/build/Python-2.7.3/Python/d ...@@ -3729,9 +3729,9 @@ diff -ru misc/Python-2.7.3/Python/dynload_win.c misc/build/Python-2.7.3/Python/d
/* Function to return the name of the "python" DLL that the supplied module /* Function to return the name of the "python" DLL that the supplied module
diff -ru misc/Python-2.7.3/Python/frozenmain.c misc/build/Python-2.7.3/Python/frozenmain.c diff -ru misc/Python-2.7.5/Python/frozenmain.c misc/build/Python-2.7.5/Python/frozenmain.c
--- misc/Python-2.7.3/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500 +++ misc/build/Python-2.7.5/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#include "Python.h" #include "Python.h"
...@@ -3765,9 +3765,9 @@ diff -ru misc/Python-2.7.3/Python/frozenmain.c misc/build/Python-2.7.3/Python/fr ...@@ -3765,9 +3765,9 @@ diff -ru misc/Python-2.7.3/Python/frozenmain.c misc/build/Python-2.7.3/Python/fr
PyWinFreeze_ExeTerm(); PyWinFreeze_ExeTerm();
#endif #endif
Py_Finalize(); Py_Finalize();
diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure diff -ru misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
--- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/configure 2012-07-25 16:40:08.000000000 -0500 +++ misc/build/Python-2.7.5/configure 2012-07-25 16:40:08.000000000 -0500
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision. # From configure.in Revision.
...@@ -7020,9 +7020,9 @@ diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure ...@@ -7020,9 +7020,9 @@ diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
|| as_fn_error $? "could not create -" "$LINENO" 5 || as_fn_error $? "could not create -" "$LINENO" 5
fi fi
;; ;;
diff -ru misc/Python-2.7.3/configure.in misc/build/Python-2.7.3/configure.in diff -ru misc/Python-2.7.5/configure.in misc/build/Python-2.7.5/configure.in
--- misc/Python-2.7.3/configure.in 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/configure.in 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/configure.in 2012-07-25 16:31:28.000000000 -0500 +++ misc/build/Python-2.7.5/configure.in 2012-07-25 16:31:28.000000000 -0500
@@ -417,6 +417,13 @@ @@ -417,6 +417,13 @@
LDFLAGS="$SGI_ABI $LDFLAGS" LDFLAGS="$SGI_ABI $LDFLAGS"
MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'` MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
...@@ -7192,9 +7192,9 @@ diff -ru misc/Python-2.7.3/configure.in misc/build/Python-2.7.3/configure.in ...@@ -7192,9 +7192,9 @@ diff -ru misc/Python-2.7.3/configure.in misc/build/Python-2.7.3/configure.in
AC_SUBST(UNICODE_OBJS) AC_SUBST(UNICODE_OBJS)
if test "$enable_unicode" = "no" if test "$enable_unicode" = "no"
then then
diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
--- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/setup.py 2012-07-25 16:38:25.000000000 -0500 +++ misc/build/Python-2.7.5/setup.py 2012-07-25 16:38:25.000000000 -0500
@@ -271,6 +271,18 @@ @@ -271,6 +271,18 @@
if not self.configure_ctypes(ext): if not self.configure_ctypes(ext):
return return
......
--- misc/Python-2.7.4/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.4/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500 +++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -427,7 +427,7 @@ @@ -427,7 +427,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS) libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \ if test $(INSTSONAME) != $(LDLIBRARY); then \
......
diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj
--- misc/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
/> />
<Tool <Tool
...@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/ ...@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.4/PCbuild/_bsddb.vcproj misc/build/Python-2.7.4/PCbuild/
AdditionalDependencies="$(bsddbDepLibs)" AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000" BaseAddress="0x1e180000"
TargetMachine="17" TargetMachine="17"
diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj
--- misc/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
/> />
<Tool <Tool
...@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild ...@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes.vcproj misc/build/Python-2.7.4/PCbuild
SubSystem="0" SubSystem="0"
BaseAddress="0x1D1A0000" BaseAddress="0x1D1A0000"
TargetMachine="17" TargetMachine="17"
diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj
--- misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
/> />
<Tool <Tool
...@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PC ...@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.4/PC
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj
--- misc/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PC ...@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.4/PCbuild/_elementtree.vcproj misc/build/Python-2.7.4/PC
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj
--- misc/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuil ...@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.4/PCbuild/_hashlib.vcproj misc/build/Python-2.7.4/PCbuil
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_msi.vcproj diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_msi.vcproj
--- misc/Python-2.7.4/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
...@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_m ...@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.4/PCbuild/_msi.vcproj misc/build/Python-2.7.4/PCbuild/_m
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj
--- misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
...@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7. ...@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.4/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild/_socket.vcproj diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild/_socket.vcproj
--- misc/Python-2.7.4/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
...@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild ...@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.4/PCbuild/_socket.vcproj misc/build/Python-2.7.4/PCbuild
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj
--- misc/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -591,9 +591,9 @@ diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuil ...@@ -591,9 +591,9 @@ diff -u misc/Python-2.7.4/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.4/PCbuil
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_ssl.vcproj diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_ssl.vcproj
--- misc/Python-2.7.4/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
/> />
<Tool <Tool
...@@ -746,9 +746,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_s ...@@ -746,9 +746,9 @@ diff -u misc/Python-2.7.4/PCbuild/_ssl.vcproj misc/build/Python-2.7.4/PCbuild/_s
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj
--- misc/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -813,9 +813,9 @@ diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbui ...@@ -813,9 +813,9 @@ diff -u misc/Python-2.7.4/PCbuild/_testcapi.vcproj misc/build/Python-2.7.4/PCbui
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj
--- misc/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -880,9 +880,9 @@ diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuil ...@@ -880,9 +880,9 @@ diff -u misc/Python-2.7.4/PCbuild/_tkinter.vcproj misc/build/Python-2.7.4/PCbuil
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj
--- misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -81,8 +81,7 @@ @@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC" IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb" ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
...@@ -903,9 +903,9 @@ diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/P ...@@ -903,9 +903,9 @@ diff -u misc/Python-2.7.4/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.4/P
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2.vcproj diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2.vcproj
--- misc/Python-2.7.4/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -970,9 +970,9 @@ diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2 ...@@ -970,9 +970,9 @@ diff -u misc/Python-2.7.4/PCbuild/bz2.vcproj misc/build/Python-2.7.4/PCbuild/bz2
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCbuild/kill_python.vcproj diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCbuild/kill_python.vcproj
--- misc/Python-2.7.4/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe" OutputFile="$(OutDir)\$(ProjectName)_d.exe"
...@@ -1005,9 +1005,9 @@ diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCb ...@@ -1005,9 +1005,9 @@ diff -u misc/Python-2.7.4/PCbuild/kill_python.vcproj misc/build/Python-2.7.4/PCb
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj
--- misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe" OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
...@@ -1024,9 +1024,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/ ...@@ -1024,9 +1024,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.4/
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj
--- misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1" SubSystem="1"
...@@ -1059,9 +1059,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7. ...@@ -1059,9 +1059,9 @@ diff -u misc/Python-2.7.4/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pcbuild.sln diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln
--- misc/Python-2.7.4/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
@@ -38,17 +38,17 @@ @@ -38,17 +38,17 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection EndProjectSection
...@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pc ...@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.4/PCbuild/pcbuild.sln misc/build/Python-2.7.4/PCbuild/pc
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj
--- misc/Python-2.7.4/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
/> />
<Tool <Tool
...@@ -1233,9 +1233,9 @@ diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild ...@@ -1233,9 +1233,9 @@ diff -u misc/Python-2.7.4/PCbuild/pyexpat.vcproj misc/build/Python-2.7.4/PCbuild
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/python.vcproj diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/python.vcproj
--- misc/Python-2.7.4/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
SubSystem="1" SubSystem="1"
StackReserveSize="2000000" StackReserveSize="2000000"
...@@ -1300,9 +1300,9 @@ diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/ ...@@ -1300,9 +1300,9 @@ diff -u misc/Python-2.7.4/PCbuild/python.vcproj misc/build/Python-2.7.4/PCbuild/
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj
--- misc/Python-2.7.4/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
...@@ -1374,9 +1374,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbu ...@@ -1374,9 +1374,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythoncore.vcproj misc/build/Python-2.7.4/PCbu
-</VisualStudioProject> -</VisualStudioProject>
\ No newline at end of file \ No newline at end of file
+</VisualStudioProject> +</VisualStudioProject>
diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild/pythonw.vcproj diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild/pythonw.vcproj
--- misc/Python-2.7.4/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
StackReserveSize="2000000" StackReserveSize="2000000"
BaseAddress="0x1d000000" BaseAddress="0x1d000000"
...@@ -1441,9 +1441,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild ...@@ -1441,9 +1441,9 @@ diff -u misc/Python-2.7.4/PCbuild/pythonw.vcproj misc/build/Python-2.7.4/PCbuild
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/select.vcproj diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/select.vcproj
--- misc/Python-2.7.4/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib" AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
...@@ -1508,9 +1508,9 @@ diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/ ...@@ -1508,9 +1508,9 @@ diff -u misc/Python-2.7.4/PCbuild/select.vcproj misc/build/Python-2.7.4/PCbuild/
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj
--- misc/Python-2.7.4/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -1575,9 +1575,9 @@ diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild ...@@ -1575,9 +1575,9 @@ diff -u misc/Python-2.7.4/PCbuild/sqlite3.vcproj misc/build/Python-2.7.4/PCbuild
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj
--- misc/Python-2.7.4/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -1642,9 +1642,9 @@ diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCb ...@@ -1642,9 +1642,9 @@ diff -u misc/Python-2.7.4/PCbuild/unicodedata.vcproj misc/build/Python-2.7.4/PCb
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj
--- misc/Python-2.7.4/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -1709,9 +1709,9 @@ diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuil ...@@ -1709,9 +1709,9 @@ diff -u misc/Python-2.7.4/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.4/PCbuil
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
diff -u misc/Python-2.7.4/PCbuild/winsound.vcproj misc/build/Python-2.7.4/PCbuild/winsound.vcproj diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuild/winsound.vcproj
--- misc/Python-2.7.4/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
......
--- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.4/configure 2012-07-22 15:01:20.000000000 -0500 +++ misc/build/Python-2.7.5/configure 2012-07-22 15:01:20.000000000 -0500
@@ -2982,7 +2982,9 @@ @@ -2982,7 +2982,9 @@
if test -z "$MACHDEP" if test -z "$MACHDEP"
then then
......
--- misc/Python-2.7.4/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500 --- misc/Python-2.7.5/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500
@@ -0,0 +1,612 @@ @@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h +# Generated by h2py from /usr/include/netinet/in.h
+ +
...@@ -613,14 +613,14 @@ ...@@ -613,14 +613,14 @@
+IPV6CTL_NORBIT_RAIF = 49 +IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50 +IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51 +IPV6CTL_MAXID = 51
--- misc/Python-2.7.4/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500 --- misc/Python-2.7.5/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
+++ misc/build/Python-2.7.4/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+#! /bin/sh +#! /bin/sh
+set -v +set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h +python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
--- misc/Python-2.7.4/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500 --- misc/Python-2.7.5/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
+++ misc/build/Python-2.7.4/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500 +++ misc/build/Python-2.7.5/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500
@@ -421,7 +421,7 @@ @@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger # #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests # problems with some operating systems (issue #3863): skip problematic tests
...@@ -630,8 +630,8 @@ ...@@ -630,8 +630,8 @@
'os2emx') 'os2emx')
def _run_and_join(self, script): def _run_and_join(self, script):
--- misc/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.4/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500
@@ -6289,7 +6289,7 @@ @@ -6289,7 +6289,7 @@
rm -rf conftest* rm -rf conftest*
;; ;;
...@@ -651,8 +651,8 @@ ...@@ -651,8 +651,8 @@
powerpc*-*-rtems*) powerpc*-*-rtems*)
TARGET=POWERPC; TARGETDIR=powerpc TARGET=POWERPC; TARGETDIR=powerpc
;; ;;
--- misc/Python-2.7.4/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500 --- misc/Python-2.7.5/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500
+++ misc/build/Python-2.7.4/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500
@@ -97,20 +97,15 @@ @@ -97,20 +97,15 @@
{ {
#define IOCTL_BUFSZ 1024 #define IOCTL_BUFSZ 1024
...@@ -704,8 +704,8 @@ ...@@ -704,8 +704,8 @@
" an integer and optionally an integer or buffer argument", " an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) { conv_descriptor, &fd, &code, &arg)) {
return NULL; return NULL;
--- misc/Python-2.7.4/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500 +++ misc/build/Python-2.7.5/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500
@@ -38,13 +38,18 @@ @@ -38,13 +38,18 @@
#endif #endif
#endif #endif
...@@ -759,9 +759,9 @@ ...@@ -759,9 +759,9 @@
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs); pthread_attr_destroy(&attrs);
#endif #endif
diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure
--- misc/Python-2.7.4/configure 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.4/configure 2012-08-01 18:44:40.000000000 -0500 +++ misc/build/Python-2.7.5/configure 2012-08-01 18:44:40.000000000 -0500
@@ -4916,7 +4916,7 @@ @@ -4916,7 +4916,7 @@
;; ;;
SunOS*) SunOS*)
...@@ -783,9 +783,9 @@ diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure ...@@ -783,9 +783,9 @@ diff -ruN misc/Python-2.7.4/configure misc/build/Python-2.7.4/configure
INSTSONAME="$LDLIBRARY".$SOVERSION INSTSONAME="$LDLIBRARY".$SOVERSION
;; ;;
hp*|HP*) hp*|HP*)
diff -ruN misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py diff -ruN misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
--- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.4/setup.py 2012-08-01 18:44:40.000000000 -0500 +++ misc/build/Python-2.7.5/setup.py 2012-08-01 18:44:40.000000000 -0500
@@ -1555,7 +1540,7 @@ @@ -1555,7 +1540,7 @@
macros = dict() macros = dict()
libraries = [] libraries = []
......
diff -ru misc/Python-2.7.4/Modules/Setup.dist misc/build/Python-2.7.4/Modules/Setup.dist diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist
--- misc/Python-2.7.4/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 --- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.4/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500 +++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -248,14 +248,14 @@ @@ -248,14 +248,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files # Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here. # md5.c and md5.h are included here.
......
--- misc/Python-2.7.4/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 --- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.4/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500 +++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -603,11 +603,6 @@ @@ -603,11 +603,6 @@
in platform-specific #ifdefs. in platform-specific #ifdefs.
**************************************************************************/ **************************************************************************/
......
diff -ru misc/Python-2.7.4/PCbuild/build_ssl.py misc/build/Python-2.7.4/PCbuild/build_ssl.py diff -ru misc/Python-2.7.5/PCbuild/build_ssl.py misc/build/Python-2.7.5/PCbuild/build_ssl.py
--- misc/Python-2.7.4/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500 --- misc/Python-2.7.5/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.4/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500 +++ misc/build/Python-2.7.5/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
@@ -253,4 +253,4 @@ @@ -253,4 +253,4 @@
sys.exit(rc) sys.exit(rc)
if __name__=='__main__': if __name__=='__main__':
- main() - main()
+ sys.exit(0) + sys.exit(0)
diff -ru misc/Python-2.7.4/setup.py misc/build/Python-2.7.4/setup.py diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py
--- misc/Python-2.7.4/setup.py 2012-04-09 18:07:36.000000000 -0500 --- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.4/setup.py 2012-07-25 14:37:37.000000000 -0500 +++ misc/build/Python-2.7.5/setup.py 2012-07-25 14:37:37.000000000 -0500
@@ -702,7 +702,15 @@ @@ -702,7 +702,15 @@
exts.append( Extension('_socket', ['socketmodule.c'], exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) ) depends = ['socketmodule.h']) )
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# in the python project accordingly !!! # in the python project accordingly !!!
PYMAJOR=2 PYMAJOR=2
PYMINOR=7 PYMINOR=7
PYMICRO=4 PYMICRO=5
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX" .IF "$(GUI)" == "UNX"
......
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