[Libreoffice-commits] .: 2 commits - python/makefile.mk python/prj python/Python-2.6.1-arch_i386.patch python/Python-2.6.1-arch_ppc.patch python/Python-2.6.1-nohardlink.patch python/Python-2.6.1.patch python/Python-2.6.1-py2422.patch python/Python-2.6.1-py4768.patch python/Python-2.6.1-py8067.patch python/Python-2.6.1-svn-1.7.patch python/Python-2.6.1-sysbase.patch python/Python-2.6.1-urllib.patch python/Python-2.6.1-vc10.patch python/Python-2.6.1-vc12.patch python/Python-2.6.2-bdb48.patch python/Python-2.6.2-cross.fix-configure.patch python/Python-2.6.2-cross.patch python/Python-aix.patch python/Python.mipsel-py4305.patch python/Python-parallel-make.patch python/Python-ssl.patch python/pyversion.Makefile python/pyversion.mk python/README RepositoryModule_ooo.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 07:41:25 PST 2012
RepositoryModule_ooo.mk | 1
python/Python-2.6.1-arch_i386.patch | 11
python/Python-2.6.1-arch_ppc.patch | 11
python/Python-2.6.1-nohardlink.patch | 20
python/Python-2.6.1-py2422.patch | 71
python/Python-2.6.1-py4768.patch | 11
python/Python-2.6.1-py8067.patch | 12
python/Python-2.6.1-svn-1.7.patch | 12
python/Python-2.6.1-sysbase.patch | 13
python/Python-2.6.1-urllib.patch | 93
python/Python-2.6.1-vc10.patch | 6367 ----
python/Python-2.6.1-vc12.patch | 69
python/Python-2.6.1.patch | 571
python/Python-2.6.2-bdb48.patch | 163
python/Python-2.6.2-cross.fix-configure.patch |34111 --------------------------
python/Python-2.6.2-cross.patch | 2029 -
python/Python-aix.patch | 152
python/Python-parallel-make.patch | 36
python/Python-ssl.patch | 205
python/Python.mipsel-py4305.patch | 49
python/README | 1
python/makefile.mk | 282
python/prj/build.lst | 3
python/prj/d.lst | 172
python/pyversion.Makefile | 25
python/pyversion.mk | 25
26 files changed, 1 insertion(+), 44514 deletions(-)
New commits:
commit 2e1ab301c581992d76e25c767294f87c5f25da9c
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 29 16:15:49 2012 +0100
RepositoryModule: add python3
Change-Id: I02c946c22daf68c664be6c3b07a8dfc6e486493a
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 6b942c3..30182fc 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
padmin \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
psprint_config \
+ $(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
commit 49286faa3f99ccf6990ad651208188eb1d817061
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 29 16:11:24 2012 +0100
python: replaced by python3, so remove it
Change-Id: I3dc55f05502af56bd30825d297a6964295e6efa3
diff --git a/python/Python-2.6.1-arch_i386.patch b/python/Python-2.6.1-arch_i386.patch
deleted file mode 100644
index 6dca2c3..0000000
--- a/python/Python-2.6.1-arch_i386.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/Python-2.6.1/configure 2010-05-06 20:24:36.000000000 +0200
-+++ misc/build/Python-2.6.1/configure 2010-05-06 20:25:17.000000000 +0200
-@@ -4653,7 +4653,7 @@
- if test "${enable_universalsdk}"; then
- UNIVERSAL_ARCH_FLAGS=""
- if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
-- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
-+ UNIVERSAL_ARCH_FLAGS="-arch i386"
- ARCH_RUN_32BIT=""
-
- elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
diff --git a/python/Python-2.6.1-arch_ppc.patch b/python/Python-2.6.1-arch_ppc.patch
deleted file mode 100644
index d4073ac..0000000
--- a/python/Python-2.6.1-arch_ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/Python-2.6.1/configure 2010-05-06 20:24:36.000000000 +0200
-+++ misc/build/Python-2.6.1/configure 2010-05-06 20:25:17.000000000 +0200
-@@ -4653,7 +4653,7 @@
- if test "${enable_universalsdk}"; then
- UNIVERSAL_ARCH_FLAGS=""
- if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
-- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
-+ UNIVERSAL_ARCH_FLAGS="-arch ppc"
- ARCH_RUN_32BIT=""
-
- elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
diff --git a/python/Python-2.6.1-nohardlink.patch b/python/Python-2.6.1-nohardlink.patch
deleted file mode 100644
index 2592253..0000000
--- a/python/Python-2.6.1-nohardlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/Python-2.6.1/Makefile.pre.in 2011-03-08 18:23:37.230410480 +0100
-+++ misc/build/Python-2.6.1/Makefile.pre.in 2011-03-08 18:22:57.935746999 +0100
-@@ -414,7 +414,7 @@
- SONAME="-Wl,-h$(INSTSONAME)"; \
- fi; \
- $(LDSHARED) $(LDFLAGS) $(SONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-- $(LN) -f $(INSTSONAME) $@; \
-+ $(LN) -fs $(INSTSONAME) $@; \
- else\
- $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
- fi
-@@ -767,7 +767,7 @@
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
- fi
-- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
- -rm -f $(DESTDIR)$(BINDIR)/python-config
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
-
diff --git a/python/Python-2.6.1-py2422.patch b/python/Python-2.6.1-py2422.patch
deleted file mode 100644
index a76e26b..0000000
--- a/python/Python-2.6.1-py2422.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.python.org/issue2422 - adaption of the patch there to honour our G_SLICE
---- misc/Python-2.6.1/Objects/obmalloc.c 2011-07-26 13:10:12.668380720 +0100
-+++ misc/build/Python-2.6.1/Objects/obmalloc.c 2011-07-26 13:17:41.951444953 +0100
-@@ -1,7 +1,18 @@
- #include "Python.h"
-+#include <stdlib.h>
-
- #ifdef WITH_PYMALLOC
-
-+static int running_with_system_allocator = -1;
-+
-+/* If we're using GCC, use __builtin_expect() to reduce overhead of
-+ the allocator checks */
-+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-+# define UNLIKELY(value) __builtin_expect((value), 0)
-+#else
-+# define UNLIKELY(value) (value)
-+#endif
-+
- /* An object allocator for Python.
-
- Here is an introduction to the layers of the Python memory architecture,
-@@ -728,6 +739,11 @@
- poolp next;
- uint size;
-
-+ if (UNLIKELY(running_with_system_allocator == -1))
-+ running_with_system_allocator = (getenv("G_SLICE") != NULL);
-+ if (UNLIKELY(running_with_system_allocator))
-+ goto redirect;
-+
- /*
- * Limit ourselves to PY_SSIZE_T_MAX bytes to prevent security holes.
- * Most python internals blindly use a signed Py_ssize_t to track
-@@ -927,6 +943,9 @@
- if (p == NULL) /* free(NULL) has no effect */
- return;
-
-+ if (UNLIKELY(running_with_system_allocator > 0))
-+ goto redirect;
-+
- pool = POOL_ADDR(p);
- if (Py_ADDRESS_IN_RANGE(p, pool)) {
- /* We allocated this address. */
-@@ -1121,6 +1140,7 @@
- return;
- }
-
-+redirect:
- /* We didn't allocate this address. */
- free(p);
- }
-@@ -1150,6 +1170,10 @@
- if (nbytes > PY_SSIZE_T_MAX)
- return NULL;
-
-+ /* Treat running_with_system_allocator == -1 the same as 0 */
-+ if (UNLIKELY(running_with_system_allocator > 0))
-+ goto redirect;
-+
- pool = POOL_ADDR(p);
- if (Py_ADDRESS_IN_RANGE(p, pool)) {
- /* We're in charge of this block */
-@@ -1177,6 +1201,7 @@
- }
- return bp;
- }
-+redirect:
- /* We're not managing this block. If nbytes <=
- * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
- * block. However, if we do, we need to copy the valid data from
diff --git a/python/Python-2.6.1-py4768.patch b/python/Python-2.6.1-py4768.patch
deleted file mode 100644
index 7617f5d..0000000
--- a/python/Python-2.6.1-py4768.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/Python-2.6.1/Lib/email/encoders.py
-+++ misc/build/Python-2.6.1/Lib/email/encoders.py
-@@ -42,7 +42,7 @@
- Also, add an appropriate Content-Transfer-Encoding header.
- """
- orig = msg.get_payload()
-- encdata = _bencode(orig)
-+ encdata = str(_bencode(orig)).encode('ascii')
- msg.set_payload(encdata)
- msg['Content-Transfer-Encoding'] = 'base64'
-
diff --git a/python/Python-2.6.1-py8067.patch b/python/Python-2.6.1-py8067.patch
deleted file mode 100644
index 7a88a93..0000000
--- a/python/Python-2.6.1-py8067.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.python.org/issue8067 - needed for building on Mac OSX >= 10.6
---- misc/Python-2.6.1/configure 2010-05-06 20:59:52.000000000 +0200
-+++ misc/build/Python-2.6.1/configure 2010-05-06 20:59:46.000000000 +0200
-@@ -2120,6 +2120,8 @@
- # has no effect, don't bother defining them
- Darwin/[6789].*)
- define_xopen_source=no;;
-+ Darwin/1[0-9].*)
-+ define_xopen_source=no;;
- # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
- # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
- # or has another value. By not (re)defining it, the defaults come in place.
diff --git a/python/Python-2.6.1-svn-1.7.patch b/python/Python-2.6.1-svn-1.7.patch
deleted file mode 100644
index b3d0014..0000000
--- a/python/Python-2.6.1-svn-1.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/build/Python-2.6.1/Makefile.pre.in 2012-05-17 22:05:39.445274789 +0200
-+++ misc/build.new/Python-2.6.1/Makefile.pre.in 2012-05-17 22:05:15.214276225 +0200
-@@ -34,7 +34,8 @@
- LINKCC= @LINKCC@
- AR= @AR@
- RANLIB= @RANLIB@
--SVNVERSION= @SVNVERSION@
-+# svnversion 1.7 changed its output from "exported" to "Unversioned directory"
-+SVNVERSION="echo exported"
-
- # Shell used by make (some versions default to the login shell, which is bad)
- SHELL= /bin/sh
diff --git a/python/Python-2.6.1-sysbase.patch b/python/Python-2.6.1-sysbase.patch
deleted file mode 100644
index fb81056..0000000
--- a/python/Python-2.6.1-sysbase.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/Python-2.6.1/configure Thu Mar 17 13:00:41 2011
-+++ misc/build/Python-2.6.1/configure Thu Mar 17 12:58:50 2011
-@@ -2042,7 +2042,9 @@
- if test -z "$MACHDEP"
- then
- ac_sys_system=`uname -s`
-- if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
-+ if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
-+ ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
-+ elif test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
- -o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
- ac_sys_release=`uname -v`
- else
diff --git a/python/Python-2.6.1-urllib.patch b/python/Python-2.6.1-urllib.patch
deleted file mode 100644
index 6e20390..0000000
--- a/python/Python-2.6.1-urllib.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- misc/Python-2.6.1/Lib/urllib.py 2008-09-21 23:27:51.000000000 +0200
-+++ misc/build/Python-2.6.1/Lib/urllib.py 2010-11-23 15:41:08.000000000 +0100
-@@ -176,6 +176,9 @@ class URLopener:
- def open(self, fullurl, data=None):
- """Use URLopener().open(file) instead of open(file, 'r')."""
- fullurl = unwrap(toBytes(fullurl))
-+ # percent encode url. fixing lame server errors like space within url
-+ # parts
-+ fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|")
- if self.tempcache and fullurl in self.tempcache:
- filename, headers = self.tempcache[fullurl]
- fp = open(filename, 'rb')
-@@ -233,41 +236,45 @@ class URLopener:
- except IOError, msg:
- pass
- fp = self.open(url, data)
-- headers = fp.info()
-- if filename:
-- tfp = open(filename, 'wb')
-- else:
-- import tempfile
-- garbage, path = splittype(url)
-- garbage, path = splithost(path or "")
-- path, garbage = splitquery(path or "")
-- path, garbage = splitattr(path or "")
-- suffix = os.path.splitext(path)[1]
-- (fd, filename) = tempfile.mkstemp(suffix)
-- self.__tempfiles.append(filename)
-- tfp = os.fdopen(fd, 'wb')
-- result = filename, headers
-- if self.tempcache is not None:
-- self.tempcache[url] = result
-- bs = 1024*8
-- size = -1
-- read = 0
-- blocknum = 0
-- if reporthook:
-- if "content-length" in headers:
-- size = int(headers["Content-Length"])
-- reporthook(blocknum, bs, size)
-- while 1:
-- block = fp.read(bs)
-- if block == "":
-- break
-- read += len(block)
-- tfp.write(block)
-- blocknum += 1
-- if reporthook:
-- reporthook(blocknum, bs, size)
-- fp.close()
-- tfp.close()
-+ try:
-+ headers = fp.info()
-+ if filename:
-+ tfp = open(filename, 'wb')
-+ else:
-+ import tempfile
-+ garbage, path = splittype(url)
-+ garbage, path = splithost(path or "")
-+ path, garbage = splitquery(path or "")
-+ path, garbage = splitattr(path or "")
-+ suffix = os.path.splitext(path)[1]
-+ (fd, filename) = tempfile.mkstemp(suffix)
-+ self.__tempfiles.append(filename)
-+ tfp = os.fdopen(fd, 'wb')
-+ try:
-+ result = filename, headers
-+ if self.tempcache is not None:
-+ self.tempcache[url] = result
-+ bs = 1024*8
-+ size = -1
-+ read = 0
-+ blocknum = 0
-+ if reporthook:
-+ if "content-length" in headers:
-+ size = int(headers["Content-Length"])
-+ reporthook(blocknum, bs, size)
-+ while 1:
-+ block = fp.read(bs)
-+ if block == "":
-+ break
-+ read += len(block)
-+ tfp.write(block)
-+ blocknum += 1
-+ if reporthook:
-+ reporthook(blocknum, bs, size)
-+ finally:
-+ tfp.close()
-+ finally:
-+ fp.close()
- del fp
- del tfp
-
diff --git a/python/Python-2.6.1-vc10.patch b/python/Python-2.6.1-vc10.patch
deleted file mode 100644
index 0f4a0d0..0000000
--- a/python/Python-2.6.1-vc10.patch
+++ /dev/null
@@ -1,6367 +0,0 @@
---- misc/build/Python-2.6.1/PCbuild/make_buildinfo.c.orig 2007-12-06 22:13:06.000000000 +0100
-+++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.c 2010-10-28 23:51:41.312500000 +0200
-@@ -82,8 +82,8 @@
- if ((do_unlink = make_buildinfo2()))
- strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV ");
- else
-- strcat_s(command, CMD_SIZE, "..\\Modules\\getbuildinfo.c");
-- strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\Include -I..\\PC");
-+ strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
-+ strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\..\\Include -I..\\..\\PC");
- puts(command); fflush(stdout);
- result = system(command);
- if (do_unlink)
---- misc/build/Python-2.6.1/PC/msvcrtmodule.c.old 2010-09-24 22:03:40.593750000 +0200
-+++ misc/build/Python-2.6.1/PC/msvcrtmodule.c 2010-09-24 22:04:39.625000000 +0200
-@@ -23,7 +23,7 @@
- #include <sys/locking.h>
-
- #ifdef _MSC_VER
--#if _MSC_VER >= 1500
-+#if _MSC_VER == 1500
- #include <crtassem.h>
- #endif
- #endif
---- /dev/null 2010-10-29 00:42:37.000000000 +0200
-+++ misc/build/Python-2.6.1/PC/VS10.0/build_ssl.py 2010-10-29 00:41:17.250000000 +0200
-@@ -0,0 +1,258 @@
-+# Script for building the _ssl and _hashlib modules for Windows.
-+# Uses Perl to setup the OpenSSL environment correctly
-+# and build OpenSSL, then invokes a simple nmake session
-+# for the actual _ssl.pyd and _hashlib.pyd DLLs.
-+
-+# THEORETICALLY, you can:
-+# * Unpack the latest SSL release one level above your main Python source
-+# directory. It is likely you will already find the zlib library and
-+# any other external packages there.
-+# * Install ActivePerl and ensure it is somewhere on your path.
-+# * Run this script from the PCBuild directory.
-+#
-+# it should configure and build SSL, then build the _ssl and _hashlib
-+# Python extensions without intervention.
-+
-+# Modified by Christian Heimes
-+# Now this script supports pre-generated makefiles and assembly files.
-+# Developers don't need an installation of Perl anymore to build Python. A svn
-+# checkout from our svn repository is enough.
-+#
-+# In Order to create the files in the case of an update you still need Perl.
-+# Run build_ssl in this order:
-+# python.exe build_ssl.py Release x64
-+# python.exe build_ssl.py Release Win32
-+
-+import os, sys, re, shutil
-+
-+# Find all "foo.exe" files on the PATH.
-+def find_all_on_path(filename, extras = None):
-+ entries = os.environ["PATH"].split(os.pathsep)
-+ ret = []
-+ for p in entries:
-+ fname = os.path.abspath(os.path.join(p, filename))
-+ if os.path.isfile(fname) and fname not in ret:
-+ ret.append(fname)
-+ if extras:
-+ for p in extras:
-+ fname = os.path.abspath(os.path.join(p, filename))
-+ if os.path.isfile(fname) and fname not in ret:
-+ ret.append(fname)
-+ return ret
-+
-+# Find a suitable Perl installation for OpenSSL.
-+# cygwin perl does *not* work. ActivePerl does.
-+# Being a Perl dummy, the simplest way I can check is if the "Win32" package
-+# is available.
-+def find_working_perl(perls):
-+ for perl in perls:
-+ fh = os.popen(perl + ' -e "use Win32;"')
-+ fh.read()
-+ rc = fh.close()
-+ if rc:
-+ continue
-+ return perl
-+ print("Can not find a suitable PERL:")
-+ if perls:
-+ print(" the following perl interpreters were found:")
-+ for p in perls:
-+ print(" ", p)
-+ print(" None of these versions appear suitable for building OpenSSL")
-+ else:
-+ print(" NO perl interpreters were found on this machine at all!")
-+ print(" Please install ActivePerl and ensure it appears on your path")
-+ return None
-+
-+# Locate the best SSL directory given a few roots to look into.
-+def find_best_ssl_dir(sources):
-+ candidates = []
-+ for s in sources:
-+ try:
-+ # note: do not abspath s; the build will fail if any
-+ # higher up directory name has spaces in it.
-+ fnames = os.listdir(s)
-+ except os.error:
-+ fnames = []
-+ for fname in fnames:
-+ fqn = os.path.join(s, fname)
-+ if os.path.isdir(fqn) and fname.startswith("openssl-"):
-+ candidates.append(fqn)
-+ # Now we have all the candidates, locate the best.
-+ best_parts = []
-+ best_name = None
-+ for c in candidates:
-+ parts = re.split("[.-]", os.path.basename(c))[1:]
-+ # eg - openssl-0.9.7-beta1 - ignore all "beta" or any other qualifiers
-+ if len(parts) >= 4:
-+ continue
-+ if parts > best_parts:
-+ best_parts = parts
-+ best_name = c
-+ if best_name is not None:
-+ print("Found an SSL directory at '%s'" % (best_name,))
-+ else:
-+ print("Could not find an SSL directory in '%s'" % (sources,))
-+ sys.stdout.flush()
-+ return best_name
-+
-+def create_makefile64(makefile, m32):
-+ """Create and fix makefile for 64bit
-+
-+ Replace 32 with 64bit directories
-+ """
-+ if not os.path.isfile(m32):
-+ return
-+ # 2.4 compatibility
-+ fin = open(m32)
-+ if 1: # with open(m32) as fin:
-+ fout = open(makefile, 'w')
-+ if 1: # with open(makefile, 'w') as fout:
-+ for line in fin:
-+ line = line.replace("=tmp32", "=tmp64")
-+ line = line.replace("=out32", "=out64")
-+ line = line.replace("=inc32", "=inc64")
-+ # force 64 bit machine
-+ line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64")
-+ line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ")
-+ # don't link against the lib on 64bit systems
-+ line = line.replace("bufferoverflowu.lib", "")
-+ fout.write(line)
-+ os.unlink(m32)
-+
-+def fix_makefile(makefile):
-+ """Fix some stuff in all makefiles
-+ """
-+ if not os.path.isfile(makefile):
-+ return
-+ # 2.4 compatibility
-+ fin = open(makefile)
-+ if 1: # with open(makefile) as fin:
-+ lines = fin.readlines()
-+ fin.close()
-+ fout = open(makefile, 'w')
-+ if 1: # with open(makefile, 'w') as fout:
-+ for line in lines:
-+ if line.startswith("PERL="):
-+ continue
-+ if line.startswith("CP="):
-+ line = "CP=copy\n"
-+ if line.startswith("MKDIR="):
-+ line = "MKDIR=mkdir\n"
-+ if line.startswith("CFLAG="):
-+ line = line.strip()
-+ for algo in ("RC5", "MDC2", "IDEA"):
-+ noalgo = " -DOPENSSL_NO_%s" % algo
-+ if noalgo not in line:
-+ line = line + noalgo
-+ line = line + '\n'
-+ fout.write(line)
-+ fout.close()
-+
-+def run_configure(configure, do_script):
-+ print("perl Configure "+configure)
-+ os.system("perl Configure "+configure)
-+ print(do_script)
-+ os.system(do_script)
-+
-+def main():
-+ build_all = "-a" in sys.argv
-+ if sys.argv[1] == "Release":
-+ debug = False
-+ elif sys.argv[1] == "Debug":
-+ debug = True
-+ else:
-+ raise ValueError(str(sys.argv))
-+
-+ if sys.argv[2] == "Win32":
-+ arch = "x86"
-+ configure = "VC-WIN32"
-+ do_script = "ms\\do_nasm"
-+ makefile="ms\\nt.mak"
-+ m32 = makefile
-+ elif sys.argv[2] == "x64":
-+ arch="amd64"
-+ configure = "VC-WIN64A"
-+ do_script = "ms\\do_win64a"
-+ makefile = "ms\\nt64.mak"
-+ m32 = makefile.replace('64', '')
-+ #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
-+ else:
-+ raise ValueError(str(sys.argv))
-+
-+ make_flags = ""
-+ if build_all:
-+ make_flags = "-a"
-+ # perl should be on the path, but we also look in "\perl" and "c:\\perl"
-+ # as "well known" locations
-+ perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
-+ perl = find_working_perl(perls)
-+ if perl is None:
-+ print("No Perl installation was found. Existing Makefiles are used.")
-+
-+ print("Found a working perl at '%s'" % (perl,))
-+ sys.stdout.flush()
-+ # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
-+ ssl_dir = find_best_ssl_dir(("..\\..",))
-+ if ssl_dir is None:
-+ sys.exit(1)
-+
-+ old_cd = os.getcwd()
-+ try:
-+ os.chdir(ssl_dir)
-+ # rebuild makefile when we do the role over from 32 to 64 build
-+ if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile):
-+ os.unlink(m32)
-+
-+ # If the ssl makefiles do not exist, we invoke Perl to generate them.
-+ # Due to a bug in this script, the makefile sometimes ended up empty
-+ # Force a regeneration if it is.
-+ if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
-+ if perl is None:
-+ print("Perl is required to build the makefiles!")
-+ sys.exit(1)
-+
-+ print("Creating the makefiles...")
-+ sys.stdout.flush()
-+ # Put our working Perl at the front of our path
-+ os.environ["PATH"] = os.path.dirname(perl) + \
-+ os.pathsep + \
-+ os.environ["PATH"]
-+ run_configure(configure, do_script)
-+ if debug:
-+ print("OpenSSL debug builds aren't supported.")
-+ #if arch=="x86" and debug:
-+ # # the do_masm script in openssl doesn't generate a debug
-+ # # build makefile so we generate it here:
-+ # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
-+
-+ if arch == "amd64":
-+ create_makefile64(makefile, m32)
-+ fix_makefile(makefile)
-+ shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
-+ shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
-+
-+ # Now run make.
-+ if arch == "amd64":
-+ rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm")
-+ if rc:
-+ print("ml64 assembler has failed.")
-+ sys.exit(rc)
-+
-+ shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
-+ shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
-+
-+ #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
-+ makeCommand = "nmake /nologo -f \"%s\"" % makefile
-+ print("Executing ssl makefiles:", makeCommand)
-+ sys.stdout.flush()
-+ rc = os.system(makeCommand)
-+ if rc:
-+ print("Executing "+makefile+" failed")
-+ print(rc)
-+ sys.exit(rc)
-+ finally:
-+ os.chdir(old_cd)
-+ sys.exit(rc)
-+
-+if __name__=='__main__':
-+ sys.exit(0)
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_ctypes.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_ctypes.vcxproj 2010-10-04 12:52:04.859375000 +0200
-@@ -0,0 +1,289 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{0E9791DB-593A-465F-98BC-681011311618}</ProjectGuid>
-+ <RootNamespace>_ctypes</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+ <ImportGroup Label="ExtensionSettings">
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <PropertyGroup Label="UserMacros" />
-+ <PropertyGroup>
-+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ </PropertyGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ </ClCompile>
-+ <Link>
-+ <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-+ <SubSystem>NotSet</SubSystem>
-+ <BaseAddress>0x1D1A0000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemGroup>
-+ <ClInclude Include="..\..\Modules\_ctypes\ctypes.h" />
-+ <ClInclude Include="..\..\Modules\_ctypes\ctypes_dlfcn.h" />
-+ <ClInclude Include="..\..\Modules\_ctypes\libffi_msvc\ffi.h" />
-+ <ClInclude Include="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h" />
-+ <ClInclude Include="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h" />
-+ <ClInclude Include="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h" />
-+ </ItemGroup>
-+ <ItemGroup>
-+ <ClCompile Include="..\..\Modules\_ctypes\_ctypes.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\callbacks.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\callproc.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\cfield.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\libffi_msvc\ffi.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\malloc_closure.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\stgdict.c" />
-+ <ClCompile Include="..\..\Modules\_ctypes\libffi_msvc\win32.c">
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</ExcludedFromBuild>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</ExcludedFromBuild>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-+ </ClCompile>
-+ </ItemGroup>
-+ <ItemGroup>
-+ <CustomBuild Include="..\..\Modules\_ctypes\libffi_msvc\win64.asm">
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)"
-+</Command>
-+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)win64.obj;%(Outputs)</Outputs>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</ExcludedFromBuild>
-+ <Command Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)"
-+</Command>
-+ <Outputs Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(IntDir)win64.obj;%(Outputs)</Outputs>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</ExcludedFromBuild>
-+ <Command Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)"
-+</Command>
-+ <Outputs Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">$(IntDir)win64.obj;%(Outputs)</Outputs>
-+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)"
-+</Command>
-+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)win64.obj;%(Outputs)</Outputs>
-+ </CustomBuild>
-+ </ItemGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+ <ImportGroup Label="ExtensionTargets">
-+ </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes_test.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_ctypes_test.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes_test.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_ctypes_test.vcxproj 2010-10-04 12:52:04.875000000 +0200
-@@ -0,0 +1,187 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{9EC7190A-249F-4180-A900-548FDCF3055F}</ProjectGuid>
-+ <RootNamespace>_ctypes_test</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+ <ImportGroup Label="ExtensionSettings">
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <PropertyGroup Label="UserMacros" />
-+ <PropertyGroup>
-+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ </PropertyGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemGroup>
-+ <ClInclude Include="..\..\Modules\_ctypes\_ctypes_test.h" />
-+ </ItemGroup>
-+ <ItemGroup>
-+ <ClCompile Include="..\..\Modules\_ctypes\_ctypes_test.c" />
-+ </ItemGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+ <ImportGroup Label="ExtensionTargets">
-+ </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_elementtree.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_elementtree.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_elementtree.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_elementtree.vcxproj 2010-10-04 12:52:04.875000000 +0200
-@@ -0,0 +1,264 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{17E1E049-C309-4D79-843F-AE483C264AEA}</ProjectGuid>
-+ <RootNamespace>_elementtree</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+ <ImportGroup Label="ExtensionSettings">
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <PropertyGroup Label="UserMacros" />
-+ <PropertyGroup>
-+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ </PropertyGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <ClCompile>
-+ <AdditionalIncludeDirectories>..;..\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+ <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ </ClCompile>
-+ <Link>
-+ <BaseAddress>0x1D100000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemGroup>
-+ <ClInclude Include="..\..\Modules\expat\ascii.h" />
-+ <ClInclude Include="..\..\Modules\expat\asciitab.h" />
-+ <ClInclude Include="..\..\Modules\expat\expat.h" />
-+ <ClInclude Include="..\..\Modules\expat\expat_config.h" />
-+ <ClInclude Include="..\..\Modules\expat\expat_external.h" />
-+ <ClInclude Include="..\..\Modules\expat\iasciitab.h" />
-+ <ClInclude Include="..\..\Modules\expat\internal.h" />
-+ <ClInclude Include="..\..\Modules\expat\latin1tab.h" />
-+ <ClInclude Include="..\..\Modules\expat\macconfig.h" />
-+ <ClInclude Include="..\..\Modules\expat\nametab.h" />
-+ <ClInclude Include="..\..\Modules\expat\pyexpatns.h" />
-+ <ClInclude Include="..\..\Modules\expat\utf8tab.h" />
-+ <ClInclude Include="..\..\Modules\expat\winconfig.h" />
-+ <ClInclude Include="..\..\Modules\expat\xmlrole.h" />
-+ <ClInclude Include="..\..\Modules\expat\xmltok.h" />
-+ </ItemGroup>
-+ <ItemGroup>
-+ <ClCompile Include="..\..\Modules\_elementtree.c" />
-+ <ClCompile Include="..\..\Modules\expat\xmlparse.c" />
-+ <ClCompile Include="..\..\Modules\expat\xmlrole.c" />
-+ <ClCompile Include="..\..\Modules\expat\xmltok.c" />
-+ </ItemGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+ <ImportGroup Label="ExtensionTargets">
-+ </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_msi.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_msi.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj 2010-10-04 12:52:04.890625000 +0200
-@@ -0,0 +1,220 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{31FFC478-7B4A-43E8-9954-8D03E2187E9C}</ProjectGuid>
-+ <RootNamespace>_msi</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+ <ImportGroup Label="ExtensionSettings">
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <PropertyGroup Label="UserMacros" />
-+ <PropertyGroup>
-+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ </PropertyGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1D160000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemGroup>
-+ <ClCompile Include="..\..\PC\_msi.c" />
-+ </ItemGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+ <ImportGroup Label="ExtensionTargets">
-+ </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_multiprocessing.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_multiprocessing.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_multiprocessing.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_multiprocessing.vcxproj 2010-10-04 12:52:04.906250000 +0200
-@@ -0,0 +1,228 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{9e48b300-37d1-11dd-8c41-005056c00008}</ProjectGuid>
-+ <RootNamespace>_multiprocessing</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-+ <ImportGroup Label="ExtensionSettings">
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pgupdate.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="pginstrument.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+ <Import Project="pyd_d.props" />
-+ <Import Project="x64.props" />
-+ </ImportGroup>
-+ <PropertyGroup Label="UserMacros" />
-+ <PropertyGroup>
-+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ </PropertyGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-+ <Midl>
-+ <TargetEnvironment>X64</TargetEnvironment>
-+ </Midl>
-+ <Link>
-+ <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <BaseAddress>0x1e1D0000</BaseAddress>
-+ <TargetMachine>MachineX64</TargetMachine>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemGroup>
-+ <ClInclude Include="..\..\Modules\_multiprocessing\multiprocessing.h" />
-+ <ClInclude Include="..\..\Modules\_multiprocessing\connection.h" />
-+ </ItemGroup>
-+ <ItemGroup>
-+ <ClCompile Include="..\..\Modules\_multiprocessing\multiprocessing.c" />
-+ <ClCompile Include="..\..\Modules\_multiprocessing\pipe_connection.c" />
-+ <ClCompile Include="..\..\Modules\_multiprocessing\semaphore.c" />
-+ <ClCompile Include="..\..\Modules\_multiprocessing\socket_connection.c" />
-+ <ClCompile Include="..\..\Modules\_multiprocessing\win32_functions.c" />
-+ </ItemGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-+ <ImportGroup Label="ExtensionTargets">
-+ </ImportGroup>
-+</Project>
-\ No newline at end of file
-diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_socket.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_socket.vcxproj
---- misc/build/Python-2.6.1/PC/VS10.0.old//_socket.vcxproj 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/Python-2.6.1/PC/VS10.0/_socket.vcxproj 2010-10-04 12:52:04.906250000 +0200
-@@ -0,0 +1,223 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+ <ItemGroup Label="ProjectConfigurations">
-+ <ProjectConfiguration Include="Debug|Win32">
-+ <Configuration>Debug</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Debug|x64">
-+ <Configuration>Debug</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|Win32">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGInstrument|x64">
-+ <Configuration>PGInstrument</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|Win32">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="PGUpdate|x64">
-+ <Configuration>PGUpdate</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|Win32">
-+ <Configuration>Release</Configuration>
-+ <Platform>Win32</Platform>
-+ </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
-+ </ItemGroup>
-+ <PropertyGroup Label="Globals">
-+ <ProjectGuid>{86937F53-C189-40EF-8CE8-8759D8E7D480}</ProjectGuid>
-+ <RootNamespace>_socket</RootNamespace>
-+ <Keyword>Win32Proj</Keyword>
-+ </PropertyGroup>
-+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
-+ </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" Label="Configuration">
-+ <ConfigurationType>DynamicLibrary</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ <WholeProgramOptimization>true</WholeProgramOptimization>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list