]> granicus.if.org Git - python/commitdiff
Merged revisions 55325-55327 via svnmerge from
authorGuido van Rossum <guido@python.org>
Mon, 14 May 2007 22:51:27 +0000 (22:51 +0000)
committerGuido van Rossum <guido@python.org>
Mon, 14 May 2007 22:51:27 +0000 (22:51 +0000)
svn+ssh://pythondev@svn.python.org/python/branches/p3yk

................
  r55326 | guido.van.rossum | 2007-05-14 15:07:35 -0700 (Mon, 14 May 2007) | 2 lines

  Don't use err.message, use err.args[0].
................
  r55327 | guido.van.rossum | 2007-05-14 15:11:37 -0700 (Mon, 14 May 2007) | 259 lines

  Merged revisions 54988-55226,55228-55323 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r54995 | neal.norwitz | 2007-04-26 23:45:32 -0700 (Thu, 26 Apr 2007) | 3 lines

    This gets the test working on Solaris.  It seems a little hokey to me,
    but the test passed on Linux and Solaris, hopefully other platforms too.
  ........
    r55002 | georg.brandl | 2007-04-27 12:20:00 -0700 (Fri, 27 Apr 2007) | 2 lines

    Version fix (bug #1708710)
  ........
    r55021 | neal.norwitz | 2007-04-29 16:53:24 -0700 (Sun, 29 Apr 2007) | 1 line

    There really are some tests that are problematic.
  ........
    r55024 | kristjan.jonsson | 2007-04-30 08:17:46 -0700 (Mon, 30 Apr 2007) | 1 line

    Complete revamp of PCBuild8 directory.  Use subdirectories for each project under the main pcbuild solution.  Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented.  Also, some of the projects that require external libraries need extra work to fully compile on x64.
  ........
    r55025 | thomas.heller | 2007-04-30 08:44:17 -0700 (Mon, 30 Apr 2007) | 4 lines

    Make sure to call PyErr_NoMemory() in several places where
    PyMem_Malloc() could potentially fail.

    Will backport to the release25-maint branch.
  ........
    r55027 | thomas.heller | 2007-04-30 09:04:57 -0700 (Mon, 30 Apr 2007) | 8 lines

    When accessing the .value attribute of a c_wchar_p instance, and the
    instance does not point to a valid wchar_t zero-terminated string,
    raise a ValueError.  c_char_p does this already.

    The ValueError message now contains the correct pointer address.

    Will backport to release25-maint.
  ........
    r55036 | georg.brandl | 2007-04-30 23:04:11 -0700 (Mon, 30 Apr 2007) | 2 lines

    Bug #1710295: exceptions are now new-style classes.
  ........
    r55038 | georg.brandl | 2007-04-30 23:08:15 -0700 (Mon, 30 Apr 2007) | 2 lines

    Patch #1710352: add missing public functions to locale.__all__.
  ........
    r55041 | vinay.sajip | 2007-05-01 03:20:03 -0700 (Tue, 01 May 2007) | 1 line

    Added new optional credentials argument to SMTPHandler.__init__, and smtp.login() is now called in SMTPHandler.emit() if credentials are specified.
  ........
    r55042 | vinay.sajip | 2007-05-01 03:21:45 -0700 (Tue, 01 May 2007) | 1 line

    Added documentation for new optional credentials argument to SMTPHandler.__init__().
  ........
    r55070 | neal.norwitz | 2007-05-01 21:47:55 -0700 (Tue, 01 May 2007) | 3 lines

    Stop using PyMem_FREE while the GIL is not held.  For details see:
    http://mail.python.org/pipermail/python-dev/2007-May/072896.html
  ........
    r55080 | armin.rigo | 2007-05-02 12:23:31 -0700 (Wed, 02 May 2007) | 6 lines

    Fix for #1303614 and #1174712:
    - __dict__ descriptor abuse for subclasses of built-in types
    - subclassing from both ModuleType and another built-in types

    Thanks zseil for the patch.
  ........
    r55083 | georg.brandl | 2007-05-02 13:02:29 -0700 (Wed, 02 May 2007) | 3 lines

    Actually raise an exception before calling ast_error_finish.
    Triggers an assertion otherwise.
  ........
    r55087 | neal.norwitz | 2007-05-02 23:47:18 -0700 (Wed, 02 May 2007) | 1 line

    Handle a couple of uncaught errors.  This should be backported
  ........
    r55090 | neal.norwitz | 2007-05-03 00:20:57 -0700 (Thu, 03 May 2007) | 4 lines

    Remove dead code.  This code couldn't be reached because earlier in
    the function there is another check for z != Py_None.
  ........
    r55092 | thomas.heller | 2007-05-03 05:02:08 -0700 (Thu, 03 May 2007) | 1 line

    Fix building _ctypes.pyd for x64 / Windows.
  ........
    r55093 | thomas.heller | 2007-05-03 05:05:20 -0700 (Thu, 03 May 2007) | 1 line

    Don't truncate pointers to integers (on win64 platform).
  ........
    r55094 | walter.doerwald | 2007-05-03 08:13:55 -0700 (Thu, 03 May 2007) | 3 lines

    Clarify the behaviour of PyUnicode_DecodeUTF16(): A BOM is only skipped
    in native order mode, and only if it's the first two bytes.
  ........
    r55101 | kristjan.jonsson | 2007-05-03 13:04:53 -0700 (Thu, 03 May 2007) | 2 lines

    Fix pcbuild8 after recent overhaul:  Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
    Todo:  Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
  ........
    r55102 | kristjan.jonsson | 2007-05-03 13:09:56 -0700 (Thu, 03 May 2007) | 1 line

    Fix those parts in the testsuite that assumed that sys.maxint would cause overflow on x64.  Now the testsuite is well behaved on that platform.
  ........
    r55103 | kristjan.jonsson | 2007-05-03 13:27:03 -0700 (Thu, 03 May 2007) | 11 lines

    Fix problems in x64 build that were discovered by the testsuite:
    - Reenable modules on x64 that had been disabled aeons ago for Itanium.
    - Cleared up confusion about compilers for 64 bit windows.  There is only Itanium and x64.  Added macros MS_WINI64 and MS_WINX64 for those rare cases where it matters, such as the disabling of modules above.
    - Set target platform (_WIN32_WINNT and WINVER) to 0x0501 (XP) for x64, and 0x0400 (NT 4.0) otherwise, which are the targeted minimum platforms.
    - Fixed thread_nt.h.  The emulated InterlockedCompareExchange function didn?\194?\180t work on x64, probaby due to the lack of a "volatile" specifier.  Anyway, win95 is no longer a target platform.
    - Itertools module used wrong constant to check for overflow in count()
    - PyInt_AsSsize_t couldn't deal with attribute error when accessing the __long__ member.
    - PyLong_FromSsize_t() incorrectly specified that the operand were unsigned.

    With these changes, the x64 passes the testsuite, for those modules present.
  ........
    r55107 | kristjan.jonsson | 2007-05-03 17:25:08 -0700 (Thu, 03 May 2007) | 1 line

    Revert compiler comment to AMD64 for x64/AMD64 builds.
  ........
    r55115 | thomas.heller | 2007-05-04 00:14:39 -0700 (Fri, 04 May 2007) | 4 lines

    Fix some ctypes test crashes, when running with a debug Python
    version on win64 by using proper argtypes and restype function
    attributes.
  ........
    r55117 | thomas.heller | 2007-05-04 01:20:41 -0700 (Fri, 04 May 2007) | 4 lines

    On 64-bit Windows, ffi_arg must be 8 bytes long.  This fixes the
    remaining crashes in the ctypes tests, when functions return float or
    double types.
  ........
    r55120 | kristjan.jonsson | 2007-05-04 08:48:15 -0700 (Fri, 04 May 2007) | 1 line

    Update the pcbuild8 solution.  Straightened out the _ctypes project by using a .vsproj file and a masm64.rules file to avoid redundancy
  ........
    r55121 | kristjan.jonsson | 2007-05-04 10:28:06 -0700 (Fri, 04 May 2007) | 1 line

    Minor fix of PCBuild8/_ctypes vcproj, moving include dir into the .vsprops file.
  ........
    r55129 | thomas.heller | 2007-05-04 12:54:22 -0700 (Fri, 04 May 2007) | 3 lines

    Do not truncate 64-bit pointers to 32-bit integers.

    Fixes SF #1703286, will backport to release25-maint.
  ........
    r55131 | thomas.heller | 2007-05-04 12:56:32 -0700 (Fri, 04 May 2007) | 1 line

    Oops, these tests do not run on Windows CE.
  ........
    r55140 | brett.cannon | 2007-05-04 18:34:02 -0700 (Fri, 04 May 2007) | 2 lines

    Deprecate BaseException.message as per PEP 352.
  ........
    r55154 | georg.brandl | 2007-05-05 11:55:37 -0700 (Sat, 05 May 2007) | 2 lines

    Bug #1713535: typo in logging example.
  ........
    r55158 | vinay.sajip | 2007-05-06 10:53:37 -0700 (Sun, 06 May 2007) | 1 line

    Updates of recent changes to logging.
  ........
    r55165 | neal.norwitz | 2007-05-07 00:02:26 -0700 (Mon, 07 May 2007) | 1 line

    Verify changes to the trunk go to the normal checkins list
  ........
    r55169 | kristjan.jonsson | 2007-05-07 09:46:54 -0700 (Mon, 07 May 2007) | 1 line

    As per Armin Rigo's suggestion, remove special handing from intobject.c to deal with the peculiarities of classobject's implementation of the number protocol.  The nb_long method of classobject now falls back to nb_int if there is no __long__ attribute present.
  ........
    r55197 | collin.winter | 2007-05-08 21:14:36 -0700 (Tue, 08 May 2007) | 9 lines

    Fix a bug in test.test_support.open_urlresource().

    If the call to requires() doesn't precede the filesystem check, we get the following situation:
    1. ./python Lib/test/regrtest.py test_foo # test needs urlfetch, not enabled, so skipped
    2. ./python Lib/test/regrtest.py -u urlfetch test_foo # test runs
    3. ./python Lib/test/regrtest.py test_foo # test runs (!)

    By moving the call to requires() *before* the filesystem check, the fact that fetched files are cached on the local disk becomes an implementation detail, rather than a semantics-changing point of note.
  ........
    r55198 | neal.norwitz | 2007-05-08 23:43:15 -0700 (Tue, 08 May 2007) | 1 line

    Add markup for True/False.  Will backport
  ........
    r55205 | walter.doerwald | 2007-05-09 11:10:47 -0700 (Wed, 09 May 2007) | 4 lines

    Backport checkin:
    Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr()
    instead of memchr().
  ........
    r55241 | neal.norwitz | 2007-05-10 22:55:15 -0700 (Thu, 10 May 2007) | 6 lines

    Don't ever report a failure when the sum of the reference count differences
    are zero.  This should help reduce the false positives.

    The message about references leaking is maintained to provide as much
    info as possible rather than simply suppressing the message at the source.
  ........
    r55242 | neal.norwitz | 2007-05-10 23:23:01 -0700 (Thu, 10 May 2007) | 1 line

    Fix typo in docstring (the module is popen2, not 3).
  ........
    r55244 | neal.norwitz | 2007-05-10 23:56:52 -0700 (Thu, 10 May 2007) | 1 line

    Remove trailing whitespace in docstring
  ........
    r55245 | neal.norwitz | 2007-05-10 23:57:33 -0700 (Thu, 10 May 2007) | 1 line

    Deprecate os.popen* and popen2 module in favor of the subprocess module.
  ........
    r55247 | neal.norwitz | 2007-05-11 00:13:30 -0700 (Fri, 11 May 2007) | 1 line

    Deprecate os.popen* and popen2 module in favor of the subprocess module. (forgot the doc)
  ........
    r55253 | georg.brandl | 2007-05-11 02:41:37 -0700 (Fri, 11 May 2007) | 3 lines

    Remove an XXX that is unnecessary.
  ........
    r55258 | georg.brandl | 2007-05-11 04:04:26 -0700 (Fri, 11 May 2007) | 2 lines

    Patch #1714700: clarify os.linesep vs. tfiles opened in text mode.
     (backport)
  ........
    r55259 | georg.brandl | 2007-05-11 04:43:56 -0700 (Fri, 11 May 2007) | 2 lines

    Update DDJ link.
  ........
    r55273 | raymond.hettinger | 2007-05-11 10:59:59 -0700 (Fri, 11 May 2007) | 1 line

    Better tests for posixpath.commonprefix
  ........
    r55287 | georg.brandl | 2007-05-12 14:06:41 -0700 (Sat, 12 May 2007) | 2 lines

    Bug #1046945: document SWIG options of distutils.
  ........
    r55290 | georg.brandl | 2007-05-13 01:04:07 -0700 (Sun, 13 May 2007) | 2 lines

    Add bz2 to content encodings.
  ........
    r55297 | neal.norwitz | 2007-05-13 13:45:05 -0700 (Sun, 13 May 2007) | 3 lines

    Remove Amoeba doc which was removed in version 1.0! according to Misc/HISTORY.
    Hopefully Guido won't shed a tear. :-)
  ........
    r55298 | neal.norwitz | 2007-05-13 13:54:19 -0700 (Sun, 13 May 2007) | 1 line

    Remove references to stdwin which was removed long ago.
  ........
    r55299 | neal.norwitz | 2007-05-13 14:13:42 -0700 (Sun, 13 May 2007) | 3 lines

    Remove support for freebsd[23] which haven't been released since 2000
    or earlier.  http://www.freebsd.org/releases/index.html
  ........
    r55320 | raymond.hettinger | 2007-05-14 13:52:31 -0700 (Mon, 14 May 2007) | 1 line

    Small speedup.
  ........
................

137 files changed:
Demo/threads/README
Doc/Makefile.deps
Doc/api/concrete.tex
Doc/dist/dist.tex
Doc/lib/lib.tex
Doc/lib/libamoeba.tex [deleted file]
Doc/lib/libdifflib.tex
Doc/lib/libexcs.tex
Doc/lib/liblogging.tex
Doc/lib/libos.tex
Doc/lib/libpopen2.tex
Doc/lib/libpprint.tex
Doc/lib/libstdwin.tex [deleted file]
Doc/tools/listmodules
Doc/tut/tut.tex
Include/pymem.h
Lib/ConfigParser.py
Lib/ctypes/test/test_checkretval.py
Lib/ctypes/test/test_loading.py
Lib/ctypes/test/test_python_api.py
Lib/ctypes/test/test_random_things.py
Lib/genericpath.py
Lib/locale.py
Lib/logging/handlers.py
Lib/mimetypes.py
Lib/os.py
Lib/plat-freebsd2/IN.py [deleted file]
Lib/plat-freebsd2/regen [deleted file]
Lib/plat-freebsd3/IN.py [deleted file]
Lib/plat-freebsd3/regen [deleted file]
Lib/plat-mac/pimp.py
Lib/popen2.py
Lib/test/crashers/dangerous_subclassing.py [deleted file]
Lib/test/crashers/modify_dict_attr.py [deleted file]
Lib/test/regrtest.py
Lib/test/string_tests.py
Lib/test/test___all__.py
Lib/test/test_bz2.py
Lib/test/test_cmd_line.py
Lib/test/test_defaultdict.py
Lib/test/test_descr.py
Lib/test/test_exceptions.py
Lib/test/test_fileio.py
Lib/test/test_format.py
Lib/test/test_index.py
Lib/test/test_itertools.py
Lib/test/test_pep352.py
Lib/test/test_popen2.py
Lib/test/test_posixpath.py
Lib/test/test_pty.py
Lib/test/test_support.py
Lib/test/test_unittest.py
Misc/build.sh
Misc/cheatsheet
Modules/_ctypes/callbacks.c
Modules/_ctypes/callproc.c
Modules/_ctypes/cfield.c
Modules/_ctypes/ctypes.h
Modules/_ctypes/libffi_msvc/ffitarget.h
Modules/_ctypes/stgdict.c
Modules/datetimemodule.c
Modules/getbuildinfo.c
Modules/itertoolsmodule.c
Modules/posixmodule.c
Objects/exceptions.c
Objects/floatobject.c
Objects/intobject.c
Objects/typeobject.c
PC/config.c
PC/make_versioninfo.c
PC/pyconfig.h
PCbuild8/PGInstrument.vsprops [new file with mode: 0644]
PCbuild8/PGUpdate.vsprops [new file with mode: 0644]
PCbuild8/Uninstal.wse [deleted file]
PCbuild8/_bsddb.vcproj [deleted file]
PCbuild8/_bsddb/_bsddb.vcproj [new file with mode: 0644]
PCbuild8/_ctypes.vcproj [deleted file]
PCbuild8/_ctypes/_ctypes.vcproj [new file with mode: 0644]
PCbuild8/_ctypes/_ctypes.vsprops [new file with mode: 0644]
PCbuild8/_ctypes/masm64.rules [new file with mode: 0644]
PCbuild8/_ctypes_test.vcproj [deleted file]
PCbuild8/_ctypes_test/_ctypes_test.vcproj [new file with mode: 0644]
PCbuild8/_elementtree.vcproj [deleted file]
PCbuild8/_elementtree/_elementtree.vcproj [new file with mode: 0644]
PCbuild8/_msi.vcproj [deleted file]
PCbuild8/_msi/_msi.vcproj [new file with mode: 0644]
PCbuild8/_socket.vcproj [deleted file]
PCbuild8/_socket/_socket.vcproj [new file with mode: 0644]
PCbuild8/_sqlite3.vcproj [deleted file]
PCbuild8/_sqlite3/_sqlite3.vcproj [new file with mode: 0644]
PCbuild8/_ssl.mak [deleted file]
PCbuild8/_ssl.vcproj [deleted file]
PCbuild8/_testcapi.vcproj [deleted file]
PCbuild8/_testcapi/_testcapi.vcproj [new file with mode: 0644]
PCbuild8/_tkinter.vcproj [deleted file]
PCbuild8/_tkinter/_tkinter.vcproj [new file with mode: 0644]
PCbuild8/build.bat [new file with mode: 0644]
PCbuild8/build_pgo.bat [new file with mode: 0644]
PCbuild8/build_ssl.py [deleted file]
PCbuild8/bz2.vcproj [deleted file]
PCbuild8/bz2/bz2.vcproj [new file with mode: 0644]
PCbuild8/db.build [deleted file]
PCbuild8/field3.py [deleted file]
PCbuild8/make_buildinfo/make_buildinfo.c [moved from PCbuild8/make_buildinfo.c with 65% similarity]
PCbuild8/make_buildinfo/make_buildinfo.vcproj [moved from PCbuild8/make_buildinfo.vcproj with 65% similarity]
PCbuild8/make_versioninfo.vcproj [deleted file]
PCbuild8/make_versioninfo/make_versioninfo.vcproj [new file with mode: 0644]
PCbuild8/pcbuild.sln
PCbuild8/pyd.vsprops [new file with mode: 0644]
PCbuild8/pyd_d.vsprops [new file with mode: 0644]
PCbuild8/pyexpat.vcproj [deleted file]
PCbuild8/pyexpat/pyexpat.vcproj [new file with mode: 0644]
PCbuild8/pyproject.vsprops [new file with mode: 0644]
PCbuild8/python.build [deleted file]
PCbuild8/python.iss [deleted file]
PCbuild8/python.vcproj [deleted file]
PCbuild8/python/python.vcproj [new file with mode: 0644]
PCbuild8/python20.wse [deleted file]
PCbuild8/pythoncore.vcproj [deleted file]
PCbuild8/pythoncore/getbuildinfo.vsprops [new file with mode: 0644]
PCbuild8/pythoncore/pythoncore.vcproj [new file with mode: 0644]
PCbuild8/pythonw.vcproj [deleted file]
PCbuild8/pythonw/pythonw.vcproj [new file with mode: 0644]
PCbuild8/readme.txt
PCbuild8/rmpyc.py
PCbuild8/rt.bat
PCbuild8/select.vcproj [deleted file]
PCbuild8/select/select.vcproj [new file with mode: 0644]
PCbuild8/unicodedata.vcproj [deleted file]
PCbuild8/unicodedata/unicodedata.vcproj [new file with mode: 0644]
PCbuild8/w9xpopen.vcproj [deleted file]
PCbuild8/winsound.vcproj [deleted file]
PCbuild8/winsound/winsound.vcproj [new file with mode: 0644]
Python/ast.c
Python/ceval.c
Python/thread_nt.h
Tools/msi/msilib.py

index fee6aad326d08c48ab076837250b9f6563adb6af..a379521e8d94842df055286851aed7f17492ada0 100644 (file)
@@ -3,10 +3,8 @@ This directory contains some demonstrations of the thread module.
 These are mostly "proof of concept" type applications:
 
 Generator.py   Generator class implemented with threads.
-find.py                Parallelized "find(1)" (looks for directories).
 sync.py                Condition variables primitives by Tim Peters.
 telnet.py      Version of ../sockets/telnet.py using threads.
-wpi.py         Version of ../scripts/pi.py using threads (needs stdwin).
 
 Coroutine.py   Coroutines using threads, by Tim Peters (22 May 94)
 fcmp.py                Example of above, by Tim
index 024665351b109983c12c81286d21771b523b5d0e..96800ac7bc2581bab954495d7dbee063db309c6e 100644 (file)
@@ -204,7 +204,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
        lib/libcrypto.tex \
        lib/libhashlib.tex \
        lib/libhmac.tex \
-       lib/libstdwin.tex \
        lib/libsun.tex \
        lib/libxdrlib.tex \
        lib/libimghdr.tex \
index e1ab3ec6f3fb21659f0dbabf8f8962f69a10ae5d..7e37395251f1909ecf4b652dd18e97c6bb002b4c 100644 (file)
@@ -1188,10 +1188,10 @@ These are the UTF-16 codec APIs:
    *byteorder == 1:  big endian
 \end{verbatim}
 
-  and then switches according to all byte order marks (BOM) it finds
-  in the input data.  BOMs are not copied into the resulting Unicode
-  string.  After completion, \var{*byteorder} is set to the current
-  byte order at the end of input data.
+  and then switches if the first two bytes of the input data are a byte order
+  mark (BOM) and the specified byte order is native order.  This BOM is not
+  copied into the resulting Unicode string.  After completion, \var{*byteorder}
+  is set to the current byte order at the.
 
   If \var{byteorder} is \NULL{}, the codec starts in native order mode.
 
index 928b64240572e8263ebcd96ddd1a972822469f81..ff5106a1691524b9dae2325936cbbeef32952508 100644 (file)
@@ -486,9 +486,24 @@ list; the \command{build\_ext} command knows how to deal with SWIG
 extensions: it will run SWIG on the interface file and compile the
 resulting C/\Cpp{} file into your extension.
 
-\XXX{SWIG support is rough around the edges and largely untested;
-  especially SWIG support for \Cpp{} extensions!  Explain in more detail
-  here when the interface firms up.}
+\XXX{SWIG support is rough around the edges and largely untested!}
+
+This warning notwithstanding, options to SWIG can be currently passed
+like this:
+
+\begin{verbatim}
+setup(...
+      ext_modules=[Extension('_foo', ['foo.i'], 
+                             swig_opts=['-modern', '-I../include'])],
+      py_modules=['foo'],
+     )
+\end{verbatim}
+
+Or on the commandline like this:
+
+\begin{verbatim}
+> python setup.py build_ext --swig-opts="-modern -I../include"
+\end{verbatim}
 
 On some platforms, you can include non-source files that are processed
 by the compiler and included in your extension.  Currently, this just
@@ -1017,6 +1032,7 @@ Options for 'build_ext' command:
   --include-dirs (-I)  list of directories to search for header files
   --define (-D)        C preprocessor macros to define
   --undef (-U)         C preprocessor macros to undefine
+  --swig-opts          list of SWIG command line options        
 [...]
 \end{verbatim}
 
index d87cd5e9efbbc4c5c408c8ab99b795d71769a34d..05d84c317c9abdcc8293e72ef3439f750855d8a6 100644 (file)
@@ -423,11 +423,6 @@ and how to embed it in other applications.
 % OTHER PLATFORM-SPECIFIC STUFF
 % =============
 
-% XXX(nnorwitz): all these modules (down to next comment) need to be (re)moved.
-%\input{libamoeba}              % AMOEBA ONLY
-
-%\input{libstdwin}              % STDWIN ONLY
-
 \input{libsun}                  % SUNOS ONLY
 \input{libsunaudio}
 % XXX(nnorwitz): the modules below this comment should be kept.
diff --git a/Doc/lib/libamoeba.tex b/Doc/lib/libamoeba.tex
deleted file mode 100644 (file)
index ce6babc..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-\chapter{Amoeba Specific Services}
-
-\section{\module{amoeba} ---
-         Amoeba system support}
-
-\declaremodule{builtin}{amoeba}
-  \platform{Amoeba}
-\modulesynopsis{Functions for the Amoeba operating system.}
-
-
-This module provides some object types and operations useful for
-Amoeba applications.  It is only available on systems that support
-Amoeba operations.  RPC errors and other Amoeba errors are reported as
-the exception \code{amoeba.error = 'amoeba.error'}.
-
-The module \module{amoeba} defines the following items:
-
-\begin{funcdesc}{name_append}{path, cap}
-Stores a capability in the Amoeba directory tree.
-Arguments are the pathname (a string) and the capability (a capability
-object as returned by
-\function{name_lookup()}).
-\end{funcdesc}
-
-\begin{funcdesc}{name_delete}{path}
-Deletes a capability from the Amoeba directory tree.
-Argument is the pathname.
-\end{funcdesc}
-
-\begin{funcdesc}{name_lookup}{path}
-Looks up a capability.
-Argument is the pathname.
-Returns a
-\dfn{capability}
-object, to which various interesting operations apply, described below.
-\end{funcdesc}
-
-\begin{funcdesc}{name_replace}{path, cap}
-Replaces a capability in the Amoeba directory tree.
-Arguments are the pathname and the new capability.
-(This differs from
-\function{name_append()}
-in the behavior when the pathname already exists:
-\function{name_append()}
-finds this an error while
-\function{name_replace()}
-allows it, as its name suggests.)
-\end{funcdesc}
-
-\begin{datadesc}{capv}
-A table representing the capability environment at the time the
-interpreter was started.
-(Alas, modifying this table does not affect the capability environment
-of the interpreter.)
-For example,
-\code{amoeba.capv['ROOT']}
-is the capability of your root directory, similar to
-\code{getcap("ROOT")}
-in C.
-\end{datadesc}
-
-\begin{excdesc}{error}
-The exception raised when an Amoeba function returns an error.
-The value accompanying this exception is a pair containing the numeric
-error code and the corresponding string, as returned by the C function
-\cfunction{err_why()}.
-\end{excdesc}
-
-\begin{funcdesc}{timeout}{msecs}
-Sets the transaction timeout, in milliseconds.
-Returns the previous timeout.
-Initially, the timeout is set to 2 seconds by the Python interpreter.
-\end{funcdesc}
-
-\subsection{Capability Operations}
-
-Capabilities are written in a convenient \ASCII{} format, also used by the
-Amoeba utilities
-\emph{c2a}(U)
-and
-\emph{a2c}(U).
-For example:
-
-\begin{verbatim}
->>> amoeba.name_lookup('/profile/cap')
-aa:1c:95:52:6a:fa/14(ff)/8e:ba:5b:8:11:1a
->>> 
-\end{verbatim}
-%
-The following methods are defined for capability objects.
-
-\begin{methoddesc}[capability]{dir_list}{}
-Returns a list of the names of the entries in an Amoeba directory.
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{b_read}{offset, maxsize}
-Reads (at most)
-\var{maxsize}
-bytes from a bullet file at offset
-\var{offset.}
-The data is returned as a string.
-EOF is reported as an empty string.
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{b_size}{}
-Returns the size of a bullet file.
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{dir_append}{}
-\funcline{dir_delete}{}
-\funcline{dir_lookup}{}
-\funcline{dir_replace}{}
-Like the corresponding
-\samp{name_}*
-functions, but with a path relative to the capability.
-(For paths beginning with a slash the capability is ignored, since this
-is the defined semantics for Amoeba.)
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{std_info}{}
-Returns the standard info string of the object.
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{tod_gettime}{}
-Returns the time (in seconds since the Epoch, in UCT, as for \POSIX) from
-a time server.
-\end{methoddesc}
-
-\begin{methoddesc}[capability]{tod_settime}{t}
-Sets the time kept by a time server.
-\end{methoddesc}
index acb5ed1c31bc17a33bda6dbba7e6efd425035403..7fb8e920dd46aecbb00649476b64c9c295f334ae 100644 (file)
@@ -302,7 +302,7 @@ emu
 
 
 \begin{seealso}
-  \seetitle[http://www.ddj.com/documents/s=1103/ddj8807c/]
+  \seetitle[http://www.ddj.com/184407970?pgno=5]
            {Pattern Matching: The Gestalt Approach}{Discussion of a
             similar algorithm by John W. Ratcliff and D. E. Metzener.
             This was published in
index d119ed98931235a341b5016b2c4b4284bf738209..631c798a0e942d7c13f95bd9b8b37daed5eda763 100644 (file)
@@ -23,14 +23,10 @@ an ``associated value'' indicating the detailed cause of the error.
 This may be a string or a tuple containing several items of
 information (e.g., an error code and a string explaining the code).
 The associated value is the second argument to the
-\keyword{raise}\stindex{raise} statement.  For string exceptions, the
-associated value itself will be stored in the variable named as the
-second argument of the \keyword{except} clause (if any).  For class
-exceptions, that variable receives the exception instance.  If the
-exception class is derived from the standard root class
-\exception{BaseException}, the associated value is present as the
-exception instance's \member{args} attribute.  If there is a single argument
-(as is preferred), it is bound to the \member{message} attribute.
+\keyword{raise}\stindex{raise} statement.  If the exception class is
+derived from the standard root class \exception{BaseException}, the
+associated value is present as the exception instance's \member{args}
+attribute.
 
 User code can raise built-in exceptions.  This can be used to test an
 exception handler or to report an error condition ``just like'' the
@@ -56,14 +52,8 @@ The base class for all built-in exceptions.  It is not meant to be directly
 inherited by user-defined classes (for that use \exception{Exception}).  If
 \function{str()} or \function{unicode()} is called on an instance of this
 class, the representation of the argument(s) to the instance are returned or
-the emptry string when there were no arguments.  If only a single argument is
-passed in, it is stored in the \member{message} attribute.  If more than one
-argument is passed in, \member{message} is set to the empty string.  These
-semantics are meant to reflect the fact that \member{message} is to store a
-text message explaining why the exception had been raised.  If more data needs
-to be attached to the exception, attach it through arbitrary attributes on the
-instance.  All arguments are also stored in \member{args} as a tuple, but it will
-eventually be deprecated and thus its use is discouraged.
+the emptry string when there were no arguments.  All arguments are 
+stored in \member{args} as a tuple.
 \versionadded{2.5}
 \end{excdesc}
 
index dabab53b60cebc492d8cbd1982d2d044a8f1de74..5783cbf44ec7d2b40189cf3d618c302450fc7172 100644 (file)
@@ -203,7 +203,7 @@ logged messages. For example:
 \begin{verbatim}
  FORMAT = "%(asctime)-15s %(clientip)s %(user)-8s %(message)s"
  logging.basicConfig(format=FORMAT)
- dict = { 'clientip' : '192.168.0.1', 'user' : 'fbloggs' }
+ d = {'clientip': '192.168.0.1', 'user': 'fbloggs'}
  logging.warning("Protocol problem: %s", "connection reset", extra=d)
 \end{verbatim}
 
@@ -1296,13 +1296,16 @@ The \class{SMTPHandler} class, located in the
 \module{logging.handlers} module, supports sending logging messages to
 an email address via SMTP.
 
-\begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject}
+\begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject\optional{,
+                               credentials}}
 Returns a new instance of the \class{SMTPHandler} class. The
 instance is initialized with the from and to addresses and subject
 line of the email. The \var{toaddrs} should be a list of strings. To specify a
 non-standard SMTP port, use the (host, port) tuple format for the
 \var{mailhost} argument. If you use a string, the standard SMTP port
-is used.
+is used. If your SMTP server requires authentication, you can specify a
+(username, password) tuple for the \var{credentials} argument.
+\versionchanged[\var{credentials} was added]{2.6}
 \end{classdesc}
 
 \begin{methoddesc}{emit}{record}
index 638ed6b6ed20730b48ab4b5886a32fceca4a31b2..2454e57c1050b1ce1625aa1ceb5c2a8573b9a3ef 100644 (file)
@@ -361,9 +361,8 @@ object, except that when the exit status is zero (termination without
 errors), \code{None} is returned.
 Availability: Macintosh, \UNIX, Windows.
 
-The \module{subprocess} module provides more powerful facilities for
-spawning new processes and retrieving their results; using that module
-is preferable to using this function.
+\deprecated{2.6}{This function is obsolete.  Use the
+                 \module{subprocess} module.}
 
 \versionchanged[This function worked unreliably under Windows in
   earlier versions of Python.  This was due to the use of the
@@ -380,10 +379,9 @@ Availability: Macintosh, \UNIX, Windows.
 \end{funcdesc}
 
 There are a number of different \function{popen*()} functions that
-provide slightly different ways to create subprocesses.  Note that the
-\module{subprocess} module is easier to use and more powerful;
-consider using that module before writing code using the
-lower-level \function{popen*()} functions.
+provide slightly different ways to create subprocesses.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 
 For each of the \function{popen*()} variants, if \var{bufsize} is
 specified, it specifies the buffer size for the I/O pipes.
@@ -400,8 +398,7 @@ be passed to the shell (as with \function{os.system()}).
 These methods do not make it possible to retrieve the exit status from
 the child processes.  The only way to control the input and output
 streams and also retrieve the return codes is to use the
-\class{Popen3} and \class{Popen4} classes from the \refmodule{popen2}
-module; these are only available on \UNIX.
+\refmodule{subprocess} module; these are only available on \UNIX.
 
 For a discussion of possible deadlock conditions related to the use
 of these functions, see ``\ulink{Flow Control
@@ -411,6 +408,8 @@ Issues}{popen2-flow-control.html}''
 \begin{funcdesc}{popen2}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
@@ -418,6 +417,8 @@ Availability: Macintosh, \UNIX, Windows.
 \begin{funcdesc}{popen3}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout}, \var{child_stderr})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
@@ -425,6 +426,8 @@ Availability: Macintosh, \UNIX, Windows.
 \begin{funcdesc}{popen4}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout_and_stderr})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
@@ -2006,9 +2009,12 @@ Also available via \module{os.path}.
 
 \begin{datadesc}{linesep}
 The string used to separate (or, rather, terminate) lines on the
-current platform.  This may be a single character, such as \code{'\e
-n'} for \POSIX{} or \code{'\e r'} for Mac OS, or multiple characters,
-for example, \code{'\e r\e n'} for Windows.
+current platform.  This may be a single character, such as 
+\code{'\e n'} for \POSIX{} or \code{'\e r'} for Mac OS, or multiple 
+characters, for example, \code{'\e r\e n'} for Windows.
+Do not use \var{os.linesep} as a line terminator when writing files 
+opened in text mode (the default); use a single \code{'\e n'} instead, 
+on all platforms. 
 \end{datadesc}
 
 \begin{datadesc}{devnull}
index 322a9b96352a42bbce5c212cbb5c0fafc38de957..5d40e1a7f96590a960fe26b97c049395770df748 100644 (file)
@@ -5,6 +5,7 @@
 \modulesynopsis{Subprocesses with accessible standard I/O streams.}
 \sectionauthor{Drew Csillag}{drew_csillag@geocities.com}
 
+\deprecated{2.6}{This module is obsolete.  Use the \module{subprocess} module.}
 
 This module allows you to spawn processes and connect to their
 input/output/error pipes and obtain their return codes under
index 9203b3aed14cc5166463db4d0f7a08e5199d497a..ce35b44b6c97d3f0cbc3db231fb1128b571b1cdb 100644 (file)
@@ -118,7 +118,7 @@ were added]{2.4}
 \begin{funcdesc}{isreadable}{object}
 Determine if the formatted representation of \var{object} is
 ``readable,'' or can be used to reconstruct the value using
-\function{eval()}\bifuncindex{eval}.  This always returns false for
+\function{eval()}\bifuncindex{eval}.  This always returns \code{False} for
 recursive objects.
 
 \begin{verbatim}
@@ -176,10 +176,10 @@ objects don't need to be created.
 \begin{methoddesc}[PrettyPrinter]{isreadable}{object}
 Determine if the formatted representation of the object is
 ``readable,'' or can be used to reconstruct the value using
-\function{eval()}\bifuncindex{eval}.  Note that this returns false for
+\function{eval()}\bifuncindex{eval}.  Note that this returns \code{False} for
 recursive objects.  If the \var{depth} parameter of the
 \class{PrettyPrinter} is set and the object is deeper than allowed,
-this returns false.
+this returns \code{False}.
 \end{methoddesc}
 
 \begin{methoddesc}[PrettyPrinter]{isrecursive}{object}
@@ -199,7 +199,7 @@ object to be presented.  The second is a dictionary which contains the
 context (direct and indirect containers for \var{object} that are
 affecting the presentation) as the keys; if an object needs to be
 presented which is already represented in \var{context}, the third
-return value should be true.  Recursive calls to the \method{format()}
+return value should be \code{True}.  Recursive calls to the \method{format()}
 method should add additional entries for containers to this
 dictionary.  The third argument, \var{maxlevels}, gives the requested
 limit to recursion; this will be \code{0} if there is no requested
diff --git a/Doc/lib/libstdwin.tex b/Doc/lib/libstdwin.tex
deleted file mode 100644 (file)
index f2278e5..0000000
+++ /dev/null
@@ -1,832 +0,0 @@
-\chapter{Standard Windowing Interface}
-
-The modules in this chapter are available only on those systems where
-the STDWIN library is available.  STDWIN runs on \UNIX{} under X11 and
-on the Macintosh.  See CWI report CS-R8817.
-
-\warning{Using STDWIN is not recommended for new
-applications.  It has never been ported to Microsoft Windows or
-Windows NT, and for X11 or the Macintosh it lacks important
-functionality --- in particular, it has no tools for the construction
-of dialogs.  For most platforms, alternative, native solutions exist
-(though none are currently documented in this manual): Tkinter for
-\UNIX{} under X11, native Xt with Motif or Athena widgets for \UNIX{}
-under X11, Win32 for Windows and Windows NT, and a collection of
-native toolkit interfaces for the Macintosh.}
-
-
-\section{\module{stdwin} ---
-         Platform-independent Graphical User Interface System}
-
-\declaremodule{builtin}{stdwin}
-\modulesynopsis{Older graphical user interface system for X11 and Macintosh.}
-
-
-This module defines several new object types and functions that
-provide access to the functionality of STDWIN.
-
-On \UNIX{} running X11, it can only be used if the \envvar{DISPLAY}
-environment variable is set or an explicit
-\programopt{-display} \var{displayname} argument is passed to the
-Python interpreter.
-
-Functions have names that usually resemble their C STDWIN counterparts
-with the initial `w' dropped.  Points are represented by pairs of
-integers; rectangles by pairs of points.  For a complete description
-of STDWIN please refer to the documentation of STDWIN for C
-programmers (aforementioned CWI report).
-
-\subsection{Functions Defined in Module \module{stdwin}}
-\nodename{STDWIN Functions}
-
-The following functions are defined in the \module{stdwin} module:
-
-\begin{funcdesc}{open}{title}
-Open a new window whose initial title is given by the string argument.
-Return a window object; window object methods are described
-below.\footnote{
-       The Python version of STDWIN does not support draw procedures;
-       all drawing requests are reported as draw events.}
-\end{funcdesc}
-
-\begin{funcdesc}{getevent}{}
-Wait for and return the next event.
-An event is returned as a triple: the first element is the event
-type, a small integer; the second element is the window object to which
-the event applies, or
-\code{None}
-if it applies to no window in particular;
-the third element is type-dependent.
-Names for event types and command codes are defined in the standard
-module \refmodule{stdwinevents}.
-\end{funcdesc}
-
-\begin{funcdesc}{pollevent}{}
-Return the next event, if one is immediately available.
-If no event is available, return \code{()}.
-\end{funcdesc}
-
-\begin{funcdesc}{getactive}{}
-Return the window that is currently active, or \code{None} if no
-window is currently active.  (This can be emulated by monitoring
-WE_ACTIVATE and WE_DEACTIVATE events.)
-\end{funcdesc}
-
-\begin{funcdesc}{listfontnames}{pattern}
-Return the list of font names in the system that match the pattern (a
-string).  The pattern should normally be \code{'*'}; returns all
-available fonts.  If the underlying window system is X11, other
-patterns follow the standard X11 font selection syntax (as used e.g.
-in resource definitions), i.e. the wildcard character \code{'*'}
-matches any sequence of characters (including none) and \code{'?'}
-matches any single character.
-On the Macintosh this function currently returns an empty list.
-\end{funcdesc}
-
-\begin{funcdesc}{setdefscrollbars}{hflag, vflag}
-Set the flags controlling whether subsequently opened windows will
-have horizontal and/or vertical scroll bars.
-\end{funcdesc}
-
-\begin{funcdesc}{setdefwinpos}{h, v}
-Set the default window position for windows opened subsequently.
-\end{funcdesc}
-
-\begin{funcdesc}{setdefwinsize}{width, height}
-Set the default window size for windows opened subsequently.
-\end{funcdesc}
-
-\begin{funcdesc}{getdefscrollbars}{}
-Return the flags controlling whether subsequently opened windows will
-have horizontal and/or vertical scroll bars.
-\end{funcdesc}
-
-\begin{funcdesc}{getdefwinpos}{}
-Return the default window position for windows opened subsequently.
-\end{funcdesc}
-
-\begin{funcdesc}{getdefwinsize}{}
-Return the default window size for windows opened subsequently.
-\end{funcdesc}
-
-\begin{funcdesc}{getscrsize}{}
-Return the screen size in pixels.
-\end{funcdesc}
-
-\begin{funcdesc}{getscrmm}{}
-Return the screen size in millimetres.
-\end{funcdesc}
-
-\begin{funcdesc}{fetchcolor}{colorname}
-Return the pixel value corresponding to the given color name.
-Return the default foreground color for unknown color names.
-Hint: the following code tests whether you are on a machine that
-supports more than two colors:
-\begin{verbatim}
-if stdwin.fetchcolor('black') != \
-          stdwin.fetchcolor('red') != \
-          stdwin.fetchcolor('white'):
-    print 'color machine'
-else:
-    print 'monochrome machine'
-\end{verbatim}
-\end{funcdesc}
-
-\begin{funcdesc}{setfgcolor}{pixel}
-Set the default foreground color.
-This will become the default foreground color of windows opened
-subsequently, including dialogs.
-\end{funcdesc}
-
-\begin{funcdesc}{setbgcolor}{pixel}
-Set the default background color.
-This will become the default background color of windows opened
-subsequently, including dialogs.
-\end{funcdesc}
-
-\begin{funcdesc}{getfgcolor}{}
-Return the pixel value of the current default foreground color.
-\end{funcdesc}
-
-\begin{funcdesc}{getbgcolor}{}
-Return the pixel value of the current default background color.
-\end{funcdesc}
-
-\begin{funcdesc}{setfont}{fontname}
-Set the current default font.
-This will become the default font for windows opened subsequently,
-and is also used by the text measuring functions \function{textwidth()},
-\function{textbreak()}, \function{lineheight()} and
-\function{baseline()} below.  This accepts two more optional
-parameters, size and style:  Size is the font size (in `points').
-Style is a single character specifying the style, as follows:
-\code{'b'} = bold,
-\code{'i'} = italic,
-\code{'o'} = bold + italic,
-\code{'u'} = underline;
-default style is roman.
-Size and style are ignored under X11 but used on the Macintosh.
-(Sorry for all this complexity --- a more uniform interface is being designed.)
-\end{funcdesc}
-
-\begin{funcdesc}{menucreate}{title}
-Create a menu object referring to a global menu (a menu that appears in
-all windows).
-Methods of menu objects are described below.
-Note: normally, menus are created locally; see the window method
-\method{menucreate()} below.
-\warning{The menu only appears in a window as long as the object
-returned by this call exists.}
-\end{funcdesc}
-
-\begin{funcdesc}{newbitmap}{width, height}
-Create a new bitmap object of the given dimensions.
-Methods of bitmap objects are described below.
-Not available on the Macintosh.
-\end{funcdesc}
-
-\begin{funcdesc}{fleep}{}
-Cause a beep or bell (or perhaps a `visual bell' or flash, hence the
-name).
-\end{funcdesc}
-
-\begin{funcdesc}{message}{string}
-Display a dialog box containing the string.
-The user must click OK before the function returns.
-\end{funcdesc}
-
-\begin{funcdesc}{askync}{prompt, default}
-Display a dialog that prompts the user to answer a question with yes or
-no.  Return 0 for no, 1 for yes.  If the user hits the Return key, the
-default (which must be 0 or 1) is returned.  If the user cancels the
-dialog, \exception{KeyboardInterrupt} is raised.
-\end{funcdesc}
-
-\begin{funcdesc}{askstr}{prompt, default}
-Display a dialog that prompts the user for a string.
-If the user hits the Return key, the default string is returned.
-If the user cancels the dialog, \exception{KeyboardInterrupt} is
-raised.
-\end{funcdesc}
-
-\begin{funcdesc}{askfile}{prompt, default, new}
-Ask the user to specify a filename.  If \var{new} is zero it must be
-an existing file; otherwise, it must be a new file.  If the user
-cancels the dialog, \exception{KeyboardInterrupt} is raised.
-\end{funcdesc}
-
-\begin{funcdesc}{setcutbuffer}{i, string}
-Store the string in the system's cut buffer number \var{i}, where it
-can be found (for pasting) by other applications.  On X11, there are 8
-cut buffers (numbered 0..7).  Cut buffer number 0 is the `clipboard'
-on the Macintosh.
-\end{funcdesc}
-
-\begin{funcdesc}{getcutbuffer}{i}
-Return the contents of the system's cut buffer number \var{i}.
-\end{funcdesc}
-
-\begin{funcdesc}{rotatecutbuffers}{n}
-On X11, rotate the 8 cut buffers by \var{n}.  Ignored on the
-Macintosh.
-\end{funcdesc}
-
-\begin{funcdesc}{getselection}{i}
-Return X11 selection number \var{i.}  Selections are not cut buffers.
-Selection numbers are defined in module \refmodule{stdwinevents}.
-Selection \constant{WS_PRIMARY} is the \dfn{primary} selection (used
-by \program{xterm}, for instance); selection \constant{WS_SECONDARY}
-is the \dfn{secondary} selection; selection \constant{WS_CLIPBOARD} is
-the \dfn{clipboard} selection (used by \program{xclipboard}).  On the
-Macintosh, this always returns an empty string.
-\end{funcdesc}
-
-\begin{funcdesc}{resetselection}{i}
-Reset selection number \var{i}, if this process owns it.  (See window
-method \method{setselection()}).
-\end{funcdesc}
-
-\begin{funcdesc}{baseline}{}
-Return the baseline of the current font (defined by STDWIN as the
-vertical distance between the baseline and the top of the
-characters).
-\end{funcdesc}
-
-\begin{funcdesc}{lineheight}{}
-Return the total line height of the current font.
-\end{funcdesc}
-
-\begin{funcdesc}{textbreak}{str, width}
-Return the number of characters of the string that fit into a space of
-\var{width}
-bits wide when drawn in the current font.
-\end{funcdesc}
-
-\begin{funcdesc}{textwidth}{str}
-Return the width in bits of the string when drawn in the current font.
-\end{funcdesc}
-
-\begin{funcdesc}{connectionnumber}{}
-\funcline{fileno}{}
-(X11 under \UNIX{} only) Return the ``connection number'' used by the
-underlying X11 implementation.  (This is normally the file number of
-the socket.)  Both functions return the same value;
-\method{connectionnumber()} is named after the corresponding function in
-X11 and STDWIN, while \method{fileno()} makes it possible to use the
-\module{stdwin} module as a ``file'' object parameter to
-\function{select.select()}.  Note that if \constant{select()} implies that
-input is possible on \module{stdwin}, this does not guarantee that an
-event is ready --- it may be some internal communication going on
-between the X server and the client library.  Thus, you should call
-\function{stdwin.pollevent()} until it returns \code{None} to check for
-events if you don't want your program to block.  Because of internal
-buffering in X11, it is also possible that \function{stdwin.pollevent()}
-returns an event while \function{select()} does not find \module{stdwin} to
-be ready, so you should read any pending events with
-\function{stdwin.pollevent()} until it returns \code{None} before entering
-a blocking \function{select()} call.
-\withsubitem{(in module select)}{\ttindex{select()}}
-\end{funcdesc}
-
-\subsection{Window Objects}
-\nodename{STDWIN Window Objects}
-
-Window objects are created by \function{stdwin.open()}.  They are closed
-by their \method{close()} method or when they are garbage-collected.
-Window objects have the following methods:
-
-\begin{methoddesc}[window]{begindrawing}{}
-Return a drawing object, whose methods (described below) allow drawing
-in the window.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{change}{rect}
-Invalidate the given rectangle; this may cause a draw event.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{gettitle}{}
-Returns the window's title string.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{getdocsize}{}
-\begin{sloppypar}
-Return a pair of integers giving the size of the document as set by
-\method{setdocsize()}.
-\end{sloppypar}
-\end{methoddesc}
-
-\begin{methoddesc}[window]{getorigin}{}
-Return a pair of integers giving the origin of the window with respect
-to the document.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{gettitle}{}
-Return the window's title string.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{getwinsize}{}
-Return a pair of integers giving the size of the window.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{getwinpos}{}
-Return a pair of integers giving the position of the window's upper
-left corner (relative to the upper left corner of the screen).
-\end{methoddesc}
-
-\begin{methoddesc}[window]{menucreate}{title}
-Create a menu object referring to a local menu (a menu that appears
-only in this window).
-Methods of menu objects are described below.
-\warning{The menu only appears as long as the object
-returned by this call exists.}
-\end{methoddesc}
-
-\begin{methoddesc}[window]{scroll}{rect, point}
-Scroll the given rectangle by the vector given by the point.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setdocsize}{point}
-Set the size of the drawing document.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setorigin}{point}
-Move the origin of the window (its upper left corner)
-to the given point in the document.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setselection}{i, str}
-Attempt to set X11 selection number \var{i} to the string \var{str}.
-(See \module{stdwin} function \function{getselection()} for the
-meaning of \var{i}.)  Return true if it succeeds.
-If  succeeds, the window ``owns'' the selection until
-(a) another application takes ownership of the selection; or
-(b) the window is deleted; or
-(c) the application clears ownership by calling
-\function{stdwin.resetselection(\var{i})}.  When another application
-takes ownership of the selection, a \constant{WE_LOST_SEL} event is
-received for no particular window and with the selection number as
-detail.  Ignored on the Macintosh.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{settimer}{dsecs}
-Schedule a timer event for the window in \code{\var{dsecs}/10}
-seconds.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{settitle}{title}
-Set the window's title string.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setwincursor}{name}
-\begin{sloppypar}
-Set the window cursor to a cursor of the given name.  It raises
-\exception{RuntimeError} if no cursor of the given name exists.
-Suitable names include
-\code{'ibeam'},
-\code{'arrow'},
-\code{'cross'},
-\code{'watch'}
-and
-\code{'plus'}.
-On X11, there are many more (see \code{<X11/cursorfont.h>}).
-\end{sloppypar}
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setwinpos}{h, v}
-Set the position of the window's upper left corner (relative to
-the upper left corner of the screen).
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setwinsize}{width, height}
-Set the window's size.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{show}{rect}
-Try to ensure that the given rectangle of the document is visible in
-the window.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{textcreate}{rect}
-Create a text-edit object in the document at the given rectangle.
-Methods of text-edit objects are described below.
-\end{methoddesc}
-
-\begin{methoddesc}[window]{setactive}{}
-Attempt to make this window the active window.  If successful, this
-will generate a WE_ACTIVATE event (and a WE_DEACTIVATE event in case
-another window in this application became inactive).
-\end{methoddesc}
-
-\begin{methoddesc}[window]{close}{}
-Discard the window object.  It should not be used again.
-\end{methoddesc}
-
-\subsection{Drawing Objects}
-
-Drawing objects are created exclusively by the window method
-\method{begindrawing()}.  Only one drawing object can exist at any
-given time; the drawing object must be deleted to finish drawing.  No
-drawing object may exist when \function{stdwin.getevent()} is called.
-Drawing objects have the following methods:
-
-\begin{methoddesc}[drawing]{box}{rect}
-Draw a box just inside a rectangle.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{circle}{center, radius}
-Draw a circle with given center point and radius.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{elarc}{center, (rh, rv), (a1, a2)}
-Draw an elliptical arc with given center point.
-\code{(\var{rh}, \var{rv})}
-gives the half sizes of the horizontal and vertical radii.
-\code{(\var{a1}, \var{a2})}
-gives the angles (in degrees) of the begin and end points.
-0 degrees is at 3 o'clock, 90 degrees is at 12 o'clock.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{erase}{rect}
-Erase a rectangle.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{fillcircle}{center, radius}
-Draw a filled circle with given center point and radius.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{fillelarc}{center, (rh, rv), (a1, a2)}
-Draw a filled elliptical arc; arguments as for \method{elarc()}.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{fillpoly}{points}
-Draw a filled polygon given by a list (or tuple) of points.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{invert}{rect}
-Invert a rectangle.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{line}{p1, p2}
-Draw a line from point
-\var{p1}
-to
-\var{p2}.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{paint}{rect}
-Fill a rectangle.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{poly}{points}
-Draw the lines connecting the given list (or tuple) of points.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{shade}{rect, percent}
-Fill a rectangle with a shading pattern that is about
-\var{percent}
-percent filled.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{text}{p, str}
-Draw a string starting at point p (the point specifies the
-top left coordinate of the string).
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{xorcircle}{center, radius}
-\funcline{xorelarc}{center, (rh, rv), (a1, a2)}
-\funcline{xorline}{p1, p2}
-\funcline{xorpoly}{points}
-Draw a circle, an elliptical arc, a line or a polygon, respectively,
-in XOR mode.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{setfgcolor}{}
-\funcline{setbgcolor}{}
-\funcline{getfgcolor}{}
-\funcline{getbgcolor}{}
-These functions are similar to the corresponding functions described
-above for the \module{stdwin}
-module, but affect or return the colors currently used for drawing
-instead of the global default colors.
-When a drawing object is created, its colors are set to the window's
-default colors, which are in turn initialized from the global default
-colors when the window is created.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{setfont}{}
-\funcline{baseline}{}
-\funcline{lineheight}{}
-\funcline{textbreak}{}
-\funcline{textwidth}{}
-These functions are similar to the corresponding functions described
-above for the \module{stdwin}
-module, but affect or use the current drawing font instead of
-the global default font.
-When a drawing object is created, its font is set to the window's
-default font, which is in turn initialized from the global default
-font when the window is created.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{bitmap}{point, bitmap, mask}
-Draw the \var{bitmap} with its top left corner at \var{point}.
-If the optional \var{mask} argument is present, it should be either
-the same object as \var{bitmap}, to draw only those bits that are set
-in the bitmap, in the foreground color, or \code{None}, to draw all
-bits (ones are drawn in the foreground color, zeros in the background
-color).
-Not available on the Macintosh.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{cliprect}{rect}
-Set the ``clipping region'' to a rectangle.
-The clipping region limits the effect of all drawing operations, until
-it is changed again or until the drawing object is closed.  When a
-drawing object is created the clipping region is set to the entire
-window.  When an object to be drawn falls partly outside the clipping
-region, the set of pixels drawn is the intersection of the clipping
-region and the set of pixels that would be drawn by the same operation
-in the absence of a clipping region.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{noclip}{}
-Reset the clipping region to the entire window.
-\end{methoddesc}
-
-\begin{methoddesc}[drawing]{close}{}
-\funcline{enddrawing}{}
-Discard the drawing object.  It should not be used again.
-\end{methoddesc}
-
-\subsection{Menu Objects}
-
-A menu object represents a menu.
-The menu is destroyed when the menu object is deleted.
-The following methods are defined:
-
-
-\begin{methoddesc}[menu]{additem}{text, shortcut}
-Add a menu item with given text.
-The shortcut must be a string of length 1, or omitted (to specify no
-shortcut).
-\end{methoddesc}
-
-\begin{methoddesc}[menu]{setitem}{i, text}
-Set the text of item number \var{i}.
-\end{methoddesc}
-
-\begin{methoddesc}[menu]{enable}{i, flag}
-Enable or disables item \var{i}.
-\end{methoddesc}
-
-\begin{methoddesc}[menu]{check}{i, flag}
-Set or clear the \dfn{check mark} for item \var{i}.
-\end{methoddesc}
-
-\begin{methoddesc}[menu]{close}{}
-Discard the menu object.  It should not be used again.
-\end{methoddesc}
-
-\subsection{Bitmap Objects}
-
-A bitmap represents a rectangular array of bits.
-The top left bit has coordinate (0, 0).
-A bitmap can be drawn with the \method{bitmap()} method of a drawing object.
-Bitmaps are currently not available on the Macintosh.
-
-The following methods are defined:
-
-
-\begin{methoddesc}[bitmap]{getsize}{}
-Return a tuple representing the width and height of the bitmap.
-(This returns the values that have been passed to the
-\function{newbitmap()} function.)
-\end{methoddesc}
-
-\begin{methoddesc}[bitmap]{setbit}{point, bit}
-Set the value of the bit indicated by \var{point} to \var{bit}.
-\end{methoddesc}
-
-\begin{methoddesc}[bitmap]{getbit}{point}
-Return the value of the bit indicated by \var{point}.
-\end{methoddesc}
-
-\begin{methoddesc}[bitmap]{close}{}
-Discard the bitmap object.  It should not be used again.
-\end{methoddesc}
-
-\subsection{Text-edit Objects}
-
-A text-edit object represents a text-edit block.
-For semantics, see the STDWIN documentation for \C{} programmers.
-The following methods exist:
-
-
-\begin{methoddesc}[text-edit]{arrow}{code}
-Pass an arrow event to the text-edit block.
-The \var{code} must be one of \constant{WC_LEFT}, \constant{WC_RIGHT}, 
-\constant{WC_UP} or \constant{WC_DOWN} (see module
-\refmodule{stdwinevents}).
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{draw}{rect}
-Pass a draw event to the text-edit block.
-The rectangle specifies the redraw area.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{event}{type, window, detail}
-Pass an event gotten from
-\function{stdwin.getevent()}
-to the text-edit block.
-Return true if the event was handled.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{getfocus}{}
-Return 2 integers representing the start and end positions of the
-focus, usable as slice indices on the string returned by
-\method{gettext()}.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{getfocustext}{}
-Return the text in the focus.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{getrect}{}
-Return a rectangle giving the actual position of the text-edit block.
-(The bottom coordinate may differ from the initial position because
-the block automatically shrinks or grows to fit.)
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{gettext}{}
-Return the entire text buffer.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{move}{rect}
-Specify a new position for the text-edit block in the document.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{replace}{str}
-Replace the text in the focus by the given string.
-The new focus is an insert point at the end of the string.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{setfocus}{i, j}
-Specify the new focus.
-Out-of-bounds values are silently clipped.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{settext}{str}
-Replace the entire text buffer by the given string and set the focus
-to \code{(0, 0)}.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{setview}{rect}
-Set the view rectangle to \var{rect}.  If \var{rect} is \code{None},
-viewing mode is reset.  In viewing mode, all output from the text-edit
-object is clipped to the viewing rectangle.  This may be useful to
-implement your own scrolling text subwindow.
-\end{methoddesc}
-
-\begin{methoddesc}[text-edit]{close}{}
-Discard the text-edit object.  It should not be used again.
-\end{methoddesc}
-
-\subsection{Example}
-\nodename{STDWIN Example}
-
-Here is a minimal example of using STDWIN in Python.
-It creates a window and draws the string ``Hello world'' in the top
-left corner of the window.
-The window will be correctly redrawn when covered and re-exposed.
-The program quits when the close icon or menu item is requested.
-
-\begin{verbatim}
-import stdwin
-from stdwinevents import *
-
-def main():
-    mywin = stdwin.open('Hello')
-    #
-    while 1:
-        (type, win, detail) = stdwin.getevent()
-        if type == WE_DRAW:
-            draw = win.begindrawing()
-            draw.text((0, 0), 'Hello, world')
-            del draw
-        elif type == WE_CLOSE:
-            break
-
-main()
-\end{verbatim}
-
-
-\section{\module{stdwinevents} ---
-         Constants for use with \module{stdwin}}
-
-\declaremodule{standard}{stdwinevents}
-\modulesynopsis{Constant definitions for use with \module{stdwin}}
-
-
-This module defines constants used by STDWIN for event types
-(\constant{WE_ACTIVATE} etc.), command codes (\constant{WC_LEFT} etc.)
-and selection types (\constant{WS_PRIMARY} etc.).
-Read the file for details.
-Suggested usage is
-
-\begin{verbatim}
->>> from stdwinevents import *
->>> 
-\end{verbatim}
-
-
-\section{\module{rect} ---
-         Functions for use with \module{stdwin}}
-
-\declaremodule{standard}{rect}
-\modulesynopsis{Geometry-related utility function for use with
-                \module{stdwin}.}
-
-
-This module contains useful operations on rectangles.
-A rectangle is defined as in module \refmodule{stdwin}:
-a pair of points, where a point is a pair of integers.
-For example, the rectangle
-
-\begin{verbatim}
-(10, 20), (90, 80)
-\end{verbatim}
-
-is a rectangle whose left, top, right and bottom edges are 10, 20, 90
-and 80, respectively.  Note that the positive vertical axis points
-down (as in \refmodule{stdwin}).
-
-The module defines the following objects:
-
-\begin{excdesc}{error}
-The exception raised by functions in this module when they detect an
-error.  The exception argument is a string describing the problem in
-more detail.
-\end{excdesc}
-
-\begin{datadesc}{empty}
-The rectangle returned when some operations return an empty result.
-This makes it possible to quickly check whether a result is empty:
-
-\begin{verbatim}
->>> import rect
->>> r1 = (10, 20), (90, 80)
->>> r2 = (0, 0), (10, 20)
->>> r3 = rect.intersect([r1, r2])
->>> if r3 is rect.empty: print 'Empty intersection'
-Empty intersection
->>> 
-\end{verbatim}
-\end{datadesc}
-
-\begin{funcdesc}{is_empty}{r}
-Returns true if the given rectangle is empty.
-A rectangle
-\code{(\var{left}, \var{top}), (\var{right}, \var{bottom})}
-is empty if
-\begin{math}\var{left} \geq \var{right}\end{math} or
-\begin{math}\var{top} \geq \var{bottom}\end{math}.
-\end{funcdesc}
-
-\begin{funcdesc}{intersect}{list}
-Returns the intersection of all rectangles in the list argument.
-It may also be called with a tuple argument.  Raises
-\exception{rect.error} if the list is empty.  Returns
-\constant{rect.empty} if the intersection of the rectangles is empty.
-\end{funcdesc}
-
-\begin{funcdesc}{union}{list}
-Returns the smallest rectangle that contains all non-empty rectangles in
-the list argument.  It may also be called with a tuple argument or
-with two or more rectangles as arguments.  Returns
-\constant{rect.empty} if the list is empty or all its rectangles are
-empty.
-\end{funcdesc}
-
-\begin{funcdesc}{pointinrect}{point, rect}
-Returns true if the point is inside the rectangle.  By definition, a
-point \code{(\var{h}, \var{v})} is inside a rectangle
-\code{(\var{left}, \var{top}), (\var{right}, \var{bottom})} if
-\begin{math}\var{left} \leq \var{h} < \var{right}\end{math} and
-\begin{math}\var{top} \leq \var{v} < \var{bottom}\end{math}.
-\end{funcdesc}
-
-\begin{funcdesc}{inset}{rect, (dh, dv)}
-Returns a rectangle that lies inside the \var{rect} argument by
-\var{dh} pixels horizontally and \var{dv} pixels vertically.  If
-\var{dh} or \var{dv} is negative, the result lies outside \var{rect}.
-\end{funcdesc}
-
-\begin{funcdesc}{rect2geom}{rect}
-Converts a rectangle to geometry representation:
-\code{(\var{left}, \var{top}), (\var{width}, \var{height})}.
-\end{funcdesc}
-
-\begin{funcdesc}{geom2rect}{geom}
-Converts a rectangle given in geometry representation back to the
-standard rectangle representation
-\code{(\var{left}, \var{top}), (\var{right}, \var{bottom})}.
-\end{funcdesc}
index 846997265b08dad9f9f52c1f3211236fb1a4dd6a..a60496b75e596ee7c446457bfe26d44f923da0bb 100755 (executable)
@@ -34,12 +34,11 @@ import getopt
 import glob
 import os
 import re
-import string
 import sys
 
 
-REMOVE_DIRS = ["dos-8x3", "encodings", "distutils",
-               "lib-old", "lib-stdwin", "test"]
+REMOVE_DIRS = ["encodings", "distutils",
+               "lib-old", ""test"]
 
 
 def main():
@@ -156,17 +155,17 @@ def main():
     else:
         modules = modules_by_name.keys()
         modules.sort()
-        print string.join(modules, "\n")
+        print "\n".join(modules)
 
 
 def ignore_from_modulelist(data, ignore_dict):
-    for name in string.split(data):
+    for name in data.split():
         ignore_dict[name] = name
 
 def ignore_from_idx(data, ignore_dict):
-    data = string.replace(data, r"\hackscore  {}", "_")
+    data = data.replace(r"\hackscore  {}", "_")
     rx = re.compile(r"\\indexentry\s*{([^@]*)@")
-    for line in string.split(data, "\n"):
+    for line in data.split("\n"):
         m = rx.match(line)
         if m:
             name = m.group(1)
index 6558be2abe4c40f5cde5483d5601abfe80e63138..df6f3517c1621e94f7cc86bf66acff939d0c81a1 100644 (file)
@@ -184,12 +184,12 @@ your local Python guru or system administrator.  (E.g.,
 \file{/usr/local/python} is a popular alternative location.)
 
 On Windows machines, the Python installation is usually placed in
-\file{C:\e Python24}, though you can change this when you're running
+\file{C:\e Python26}, though you can change this when you're running
 the installer.  To add this directory to your path, 
 you can type the following command into the command prompt in a DOS box:
 
 \begin{verbatim}
-set path=%path%;C:\python24
+set path=%path%;C:\python26
 \end{verbatim}
 
 
@@ -2605,8 +2605,8 @@ the core of the language but are nevertheless built in, either for
 efficiency or to provide access to operating system primitives such as
 system calls.  The set of such modules is a configuration option which
 also depends on the underlying platform  For example,
-the \module{amoeba} module is only provided on systems that somehow
-support Amoeba primitives.  One particular module deserves some
+the \module{winreg} module is only provided on Windows systems.
+One particular module deserves some
 attention: \ulink{\module{sys}}{../lib/module-sys.html}%
 \refstmodindex{sys}, which is built into every 
 Python interpreter.  The variables \code{sys.ps1} and
@@ -3539,7 +3539,7 @@ as desired.
 ...    print 'x =', x
 ...    print 'y =', y
 ...
-<type 'instance'>
+<type 'exceptions.Exception'>
 ('spam', 'eggs')
 ('spam', 'eggs')
 x = spam
@@ -4638,7 +4638,7 @@ operating system:
 >>> os.system('time 0:02')
 0
 >>> os.getcwd()      # Return the current working directory
-'C:\\Python24'
+'C:\\Python26'
 >>> os.chdir('/server/accesslogs')
 \end{verbatim}
 
@@ -5243,7 +5243,7 @@ applications include caching objects that are expensive to create:
     Traceback (most recent call last):
       File "<pyshell#108>", line 1, in -toplevel-
         d['primary']                # entry was automatically removed
-      File "C:/PY24/lib/weakref.py", line 46, in __getitem__
+      File "C:/python26/lib/weakref.py", line 46, in __getitem__
         o = self.data[key]()
     KeyError: 'primary'
 \end{verbatim}
index 671f967c8913b6ccbc90351abe63daf431c42ad8..7f74f3701b0a78fd39720077ec983e3c2d039780 100644 (file)
@@ -30,6 +30,8 @@ extern "C" {
    debugging info to dynamic memory blocks.  The system routines have no idea
    what to do with that stuff, and the Python wrappers have no idea what to do
    with raw blocks obtained directly by the system routines then.
+
+   The GIL must be held when using these APIs.
 */
 
 /*
index 6457e0fe823e2365e23672fc4d8a6cf19511e4f7..28299bd14274047efa2ff37d21d0d05da11c8389 100644 (file)
@@ -106,6 +106,21 @@ MAX_INTERPOLATION_DEPTH = 10
 class Error(Exception):
     """Base class for ConfigParser exceptions."""
 
+    def _get_message(self):
+        """Getter for 'message'; needed only to override deprecation in
+        BaseException."""
+        return self.__message
+
+    def _set_message(self, value):
+        """Setter for 'message'; needed only to override deprecation in
+        BaseException."""
+        self.__message = value
+
+    # BaseException.message has been deprecated since Python 2.6.  To prevent
+    # DeprecationWarning from popping up over this pre-existing attribute, use
+    # a new property that takes lookup precedence.
+    message = property(_get_message, _set_message)
+
     def __init__(self, msg=''):
         self.message = msg
         Exception.__init__(self, msg)
index e055c49a35c4047550f5db7525c3b024613c6d69..28be6c619f70c4a85d217802bce0cf6b070c4cd0 100644 (file)
@@ -34,7 +34,7 @@ class Test(unittest.TestCase):
         def test_oledll(self):
             self.failUnlessRaises(WindowsError,
                                   oledll.oleaut32.CreateTypeLib2,
-                                  0, 0, 0)
+                                  0, None, None)
 
 if __name__ == "__main__":
     unittest.main()
index f265a7351bba10faeb38c740c0b51cdf3d33fc88..256cdf9260ff530546e1f9f0e807d03f27086f44 100644 (file)
@@ -73,5 +73,33 @@ class LoaderTest(unittest.TestCase):
 
             self.failUnlessRaises(AttributeError, dll.__getitem__, 1234)
 
+    if os.name == "nt":
+        def test_1703286_A(self):
+            from _ctypes import LoadLibrary, FreeLibrary
+            # On winXP 64-bit, advapi32 loads at an address that does
+            # NOT fit into a 32-bit integer.  FreeLibrary must be able
+            # to accept this address.
+
+            # These are tests for http://www.python.org/sf/1703286
+            handle = LoadLibrary("advapi32")
+            FreeLibrary(handle)
+
+        def test_1703286_B(self):
+            # Since on winXP 64-bit advapi32 loads like described
+            # above, the (arbitrarily selected) CloseEventLog function
+            # also has a high address.  'call_function' should accept
+            # addresses so large.
+            from _ctypes import call_function
+            advapi32 = windll.advapi32
+            # Calling CloseEventLog with a NULL argument should fail,
+            # but the call should not segfault or so.
+            self.failUnlessEqual(0, advapi32.CloseEventLog(None))
+            windll.kernel32.GetProcAddress.argtypes = c_void_p, c_char_p
+            windll.kernel32.GetProcAddress.restype = c_void_p
+            proc = windll.kernel32.GetProcAddress(advapi32._handle, "CloseEventLog")
+            self.failUnless(proc)
+            # This is the real test: call the function via 'call_function'
+            self.failUnlessEqual(0, call_function(proc, (None,)))
+
 if __name__ == "__main__":
     unittest.main()
index 9d134740f5afb34988e6cf7add17ce473fec4c68..265ee558d42e15f9eb2bc45fd3919f7649e43d10 100644 (file)
@@ -10,7 +10,10 @@ from _ctypes import PyObj_FromPtr
 ################################################################
 
 from sys import getrefcount as grc
-
+if sys.version_info > (2, 4):
+    c_py_ssize_t = c_size_t
+else:
+    c_py_ssize_t = c_int
 
 class PythonAPITestCase(unittest.TestCase):
 
@@ -18,7 +21,7 @@ class PythonAPITestCase(unittest.TestCase):
         PyString_FromStringAndSize = pythonapi.PyString_FromStringAndSize
 
         PyString_FromStringAndSize.restype = py_object
-        PyString_FromStringAndSize.argtypes = c_char_p, c_int
+        PyString_FromStringAndSize.argtypes = c_char_p, c_py_ssize_t
 
         self.failUnlessEqual(PyString_FromStringAndSize("abcdefghi", 3), "abc")
 
@@ -66,7 +69,7 @@ class PythonAPITestCase(unittest.TestCase):
 
     def test_PyOS_snprintf(self):
         PyOS_snprintf = pythonapi.PyOS_snprintf
-        PyOS_snprintf.argtypes = POINTER(c_char), c_int, c_char_p
+        PyOS_snprintf.argtypes = POINTER(c_char), c_size_t, c_char_p
 
         buf = c_buffer(256)
         PyOS_snprintf(buf, sizeof(buf), "Hello from %s", "ctypes")
index 78a665bc5f95d7e59b61022bb7e65a04ea039f67..12b4e62a1981709b887fd927a81cd9ca5cc39009 100644 (file)
@@ -13,6 +13,10 @@ if sys.platform == "win32":
 
         def test(self):
             from _ctypes import call_function
+            windll.kernel32.LoadLibraryA.restype = c_void_p
+            windll.kernel32.GetProcAddress.argtypes = c_void_p, c_char_p
+            windll.kernel32.GetProcAddress.restype = c_void_p
+
             hdll = windll.kernel32.LoadLibraryA("kernel32")
             funcaddr = windll.kernel32.GetProcAddress(hdll, "GetModuleHandleA")
 
index ef8ea7fd4efa9fdf928244fe5c179192c9bc5665..73d7b26b3e27a137a1ff7897bb3143d5b7fd75bd 100644 (file)
@@ -70,11 +70,10 @@ def commonprefix(m):
     if not m: return ''
     s1 = min(m)
     s2 = max(m)
-    n = min(len(s1), len(s2))
-    for i in range(n):
-        if s1[i] != s2[i]:
+    for i, c in enumerate(s1):
+        if c != s2[i]:
             return s1[:i]
-    return s1[:n]
+    return s1
 
 # Split a path in root and extension.
 # The extension is everything starting at the last dot in the last
index 35f4a7953e2df48501436747f4c8b91b0d1d0f56..dea0ab770526d69a9b937868d119c3ad50ceb893 100644 (file)
@@ -19,9 +19,11 @@ import sys, encodings, encodings.aliases
 
 # Yuck:  LC_MESSAGES is non-standard:  can't tell whether it exists before
 # trying the import.  So __all__ is also fiddled at the end of the file.
-__all__ = ["setlocale","Error","localeconv","strcoll","strxfrm",
-           "format","str","atof","atoi","LC_CTYPE","LC_COLLATE",
-           "LC_TIME","LC_MONETARY","LC_NUMERIC", "LC_ALL","CHAR_MAX"]
+__all__ = ["getlocale", "getdefaultlocale", "getpreferredencoding", "Error",
+           "setlocale", "resetlocale", "localeconv", "strcoll", "strxfrm",
+           "str", "atof", "atoi", "format", "format_string", "currency",
+           "normalize", "LC_CTYPE", "LC_COLLATE", "LC_TIME", "LC_MONETARY",
+           "LC_NUMERIC", "LC_ALL", "CHAR_MAX"]
 
 try:
 
index 71ec9c3a7ec8c04a0abdb959a4d64f5e72d8f259..00dd05b9ef508ae57ed50f349d555c36275d1a78 100644 (file)
@@ -726,22 +726,25 @@ class SMTPHandler(logging.Handler):
     """
     A handler class which sends an SMTP email for each logging event.
     """
-    def __init__(self, mailhost, fromaddr, toaddrs, subject):
+    def __init__(self, mailhost, fromaddr, toaddrs, subject, credentials=None):
         """
         Initialize the handler.
 
         Initialize the instance with the from and to addresses and subject
         line of the email. To specify a non-standard SMTP port, use the
-        (host, port) tuple format for the mailhost argument.
+        (host, port) tuple format for the mailhost argument. To specify
+        authentication credentials, supply a (username, password) tuple
+        for the credentials argument.
         """
         logging.Handler.__init__(self)
         if type(mailhost) == types.TupleType:
-            host, port = mailhost
-            self.mailhost = host
-            self.mailport = port
+            self.mailhost, self.mailport = mailhost
         else:
-            self.mailhost = mailhost
-            self.mailport = None
+            self.mailhost, self.mailport = mailhost, None
+        if type(credentials) == types.TupleType:
+            self.username, self.password = credentials
+        else:
+            self.username = None
         self.fromaddr = fromaddr
         if type(toaddrs) == types.StringType:
             toaddrs = [toaddrs]
@@ -797,6 +800,8 @@ class SMTPHandler(logging.Handler):
                             ",".join(self.toaddrs),
                             self.getSubject(record),
                             formatdate(), msg)
+            if self.username:
+                smtp.login(self.username, self.password)
             smtp.sendmail(self.fromaddr, self.toaddrs, msg)
             smtp.quit()
         except (KeyboardInterrupt, SystemExit):
index 8774170fe20aa23f5ae54b85d78939f76912cbf8..1b73a656b81c6c0e7f9dfb17d2e3ce7d9457214a 100644 (file)
@@ -329,11 +329,13 @@ def _default_mime_types():
         '.tgz': '.tar.gz',
         '.taz': '.tar.gz',
         '.tz': '.tar.gz',
+        '.tbz2': '.tar.bz2',
         }
 
     encodings_map = {
         '.gz': 'gzip',
         '.Z': 'compress',
+        '.bz2': 'bzip2',
         }
 
     # Before adding new types, make sure they are either registered with IANA,
index 34359c183d3d36d18bb6d72fbcb76f90d8b7bb27..268b3cf7c8e80439498b986775267e894041d8f7 100644 (file)
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -664,9 +664,15 @@ if _exists("fork"):
             is a string it will be passed to the shell (as with os.system()). If
             'bufsize' is specified, it sets the buffer size for the I/O pipes.  The
             file objects (child_stdin, child_stdout) are returned."""
-            import popen2
-            stdout, stdin = popen2.popen2(cmd, bufsize)
-            return stdin, stdout
+            import warnings
+            msg = "os.popen2 is deprecated.  Use the subprocess module."
+            warnings.warn(msg, DeprecationWarning, stacklevel=2)
+
+            import subprocess
+            PIPE = subprocess.PIPE
+            p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
+                                 stdin=PIPE, stdout=PIPE, close_fds=True)
+            return p.stdin, p.stdout
         __all__.append("popen2")
 
     if not _exists("popen3"):
@@ -677,9 +683,16 @@ if _exists("fork"):
             is a string it will be passed to the shell (as with os.system()). If
             'bufsize' is specified, it sets the buffer size for the I/O pipes.  The
             file objects (child_stdin, child_stdout, child_stderr) are returned."""
-            import popen2
-            stdout, stdin, stderr = popen2.popen3(cmd, bufsize)
-            return stdin, stdout, stderr
+            import warnings
+            msg = "os.popen3 is deprecated.  Use the subprocess module."
+            warnings.warn(msg, DeprecationWarning, stacklevel=2)
+
+            import subprocess
+            PIPE = subprocess.PIPE
+            p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
+                                 stdin=PIPE, stdout=PIPE, stderr=PIPE,
+                                 close_fds=True)
+            return p.stdin, p.stdout, p.stderr
         __all__.append("popen3")
 
     if not _exists("popen4"):
@@ -690,9 +703,16 @@ if _exists("fork"):
             is a string it will be passed to the shell (as with os.system()). If
             'bufsize' is specified, it sets the buffer size for the I/O pipes.  The
             file objects (child_stdin, child_stdout_stderr) are returned."""
-            import popen2
-            stdout, stdin = popen2.popen4(cmd, bufsize)
-            return stdin, stdout
+            import warnings
+            msg = "os.popen4 is deprecated.  Use the subprocess module."
+            warnings.warn(msg, DeprecationWarning, stacklevel=2)
+
+            import subprocess
+            PIPE = subprocess.PIPE
+            p = subprocess.Popen(cmd, shell=True, bufsize=bufsize,
+                                 stdin=PIPE, stdout=PIPE,
+                                 stderr=subprocess.STDOUT, close_fds=True)
+            return p.stdin, p.stdout
         __all__.append("popen4")
 
 import copy_reg as _copy_reg
diff --git a/Lib/plat-freebsd2/IN.py b/Lib/plat-freebsd2/IN.py
deleted file mode 100644 (file)
index 64dab8b..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-# Generated by h2py from /usr/include/netinet/in.h
-IPPROTO_IP = 0
-IPPROTO_ICMP = 1
-IPPROTO_IGMP = 2
-IPPROTO_GGP = 3
-IPPROTO_IPIP = 4
-IPPROTO_TCP = 6
-IPPROTO_ST = 7
-IPPROTO_EGP = 8
-IPPROTO_PIGP = 9
-IPPROTO_RCCMON = 10
-IPPROTO_NVPII = 11
-IPPROTO_PUP = 12
-IPPROTO_ARGUS = 13
-IPPROTO_EMCON = 14
-IPPROTO_XNET = 15
-IPPROTO_CHAOS = 16
-IPPROTO_UDP = 17
-IPPROTO_MUX = 18
-IPPROTO_MEAS = 19
-IPPROTO_HMP = 20
-IPPROTO_PRM = 21
-IPPROTO_IDP = 22
-IPPROTO_TRUNK1 = 23
-IPPROTO_TRUNK2 = 24
-IPPROTO_LEAF1 = 25
-IPPROTO_LEAF2 = 26
-IPPROTO_RDP = 27
-IPPROTO_IRTP = 28
-IPPROTO_TP = 29
-IPPROTO_BLT = 30
-IPPROTO_NSP = 31
-IPPROTO_INP = 32
-IPPROTO_SEP = 33
-IPPROTO_3PC = 34
-IPPROTO_IDPR = 35
-IPPROTO_XTP = 36
-IPPROTO_DDP = 37
-IPPROTO_CMTP = 38
-IPPROTO_TPXX = 39
-IPPROTO_IL = 40
-IPPROTO_SIP = 41
-IPPROTO_SDRP = 42
-IPPROTO_SIPSR = 43
-IPPROTO_SIPFRAG = 44
-IPPROTO_IDRP = 45
-IPPROTO_RSVP = 46
-IPPROTO_GRE = 47
-IPPROTO_MHRP = 48
-IPPROTO_BHA = 49
-IPPROTO_ESP = 50
-IPPROTO_AH = 51
-IPPROTO_INLSP = 52
-IPPROTO_SWIPE = 53
-IPPROTO_NHRP = 54
-IPPROTO_AHIP = 61
-IPPROTO_CFTP = 62
-IPPROTO_HELLO = 63
-IPPROTO_SATEXPAK = 64
-IPPROTO_KRYPTOLAN = 65
-IPPROTO_RVD = 66
-IPPROTO_IPPC = 67
-IPPROTO_ADFS = 68
-IPPROTO_SATMON = 69
-IPPROTO_VISA = 70
-IPPROTO_IPCV = 71
-IPPROTO_CPNX = 72
-IPPROTO_CPHB = 73
-IPPROTO_WSN = 74
-IPPROTO_PVP = 75
-IPPROTO_BRSATMON = 76
-IPPROTO_ND = 77
-IPPROTO_WBMON = 78
-IPPROTO_WBEXPAK = 79
-IPPROTO_EON = 80
-IPPROTO_VMTP = 81
-IPPROTO_SVMTP = 82
-IPPROTO_VINES = 83
-IPPROTO_TTP = 84
-IPPROTO_IGP = 85
-IPPROTO_DGP = 86
-IPPROTO_TCF = 87
-IPPROTO_IGRP = 88
-IPPROTO_OSPFIGP = 89
-IPPROTO_SRPC = 90
-IPPROTO_LARP = 91
-IPPROTO_MTP = 92
-IPPROTO_AX25 = 93
-IPPROTO_IPEIP = 94
-IPPROTO_MICP = 95
-IPPROTO_SCCSP = 96
-IPPROTO_ETHERIP = 97
-IPPROTO_ENCAP = 98
-IPPROTO_APES = 99
-IPPROTO_GMTP = 100
-IPPROTO_DIVERT = 254
-IPPROTO_RAW = 255
-IPPROTO_MAX = 256
-IPPORT_RESERVED = 1024
-IPPORT_USERRESERVED = 5000
-IPPORT_HIFIRSTAUTO = 40000
-IPPORT_HILASTAUTO = 44999
-IPPORT_RESERVEDSTART = 600
-def IN_CLASSA(i): return (((int)(i) & 0x80000000) == 0)
-
-IN_CLASSA_NET = 0xff000000
-IN_CLASSA_NSHIFT = 24
-IN_CLASSA_HOST = 0x00ffffff
-IN_CLASSA_MAX = 128
-def IN_CLASSB(i): return (((int)(i) & 0xc0000000) == 0x80000000)
-
-IN_CLASSB_NET = 0xffff0000
-IN_CLASSB_NSHIFT = 16
-IN_CLASSB_HOST = 0x0000ffff
-IN_CLASSB_MAX = 65536
-def IN_CLASSC(i): return (((int)(i) & 0xe0000000) == 0xc0000000)
-
-IN_CLASSC_NET = 0xffffff00
-IN_CLASSC_NSHIFT = 8
-IN_CLASSC_HOST = 0x000000ff
-def IN_CLASSD(i): return (((int)(i) & 0xf0000000) == 0xe0000000)
-
-IN_CLASSD_NET = 0xf0000000
-IN_CLASSD_NSHIFT = 28
-IN_CLASSD_HOST = 0x0fffffff
-def IN_MULTICAST(i): return IN_CLASSD(i)
-
-def IN_EXPERIMENTAL(i): return (((int)(i) & 0xf0000000) == 0xf0000000)
-
-def IN_BADCLASS(i): return (((int)(i) & 0xf0000000) == 0xf0000000)
-
-INADDR_ANY = 0x00000000
-INADDR_BROADCAST = 0xffffffff
-INADDR_NONE = 0xffffffff
-INADDR_UNSPEC_GROUP = 0xe0000000
-INADDR_ALLHOSTS_GROUP = 0xe0000001
-INADDR_ALLRTRS_GROUP = 0xe0000002
-INADDR_MAX_LOCAL_GROUP = 0xe00000ff
-IN_LOOPBACKNET = 127
-IP_OPTIONS = 1
-IP_HDRINCL = 2
-IP_TOS = 3
-IP_TTL = 4
-IP_RECVOPTS = 5
-IP_RECVRETOPTS = 6
-IP_RECVDSTADDR = 7
-IP_RETOPTS = 8
-IP_MULTICAST_IF = 9
-IP_MULTICAST_TTL = 10
-IP_MULTICAST_LOOP = 11
-IP_ADD_MEMBERSHIP = 12
-IP_DROP_MEMBERSHIP = 13
-IP_MULTICAST_VIF = 14
-IP_RSVP_ON = 15
-IP_RSVP_OFF = 16
-IP_RSVP_VIF_ON = 17
-IP_RSVP_VIF_OFF = 18
-IP_PORTRANGE = 19
-IP_RECVIF = 20
-IP_FW_ADD = 50
-IP_FW_DEL = 51
-IP_FW_FLUSH = 52
-IP_FW_ZERO = 53
-IP_FW_GET = 54
-IP_NAT = 55
-IP_DEFAULT_MULTICAST_TTL = 1
-IP_DEFAULT_MULTICAST_LOOP = 1
-IP_MAX_MEMBERSHIPS = 20
-IP_PORTRANGE_DEFAULT = 0
-IP_PORTRANGE_HIGH = 1
-IP_PORTRANGE_LOW = 2
-IPPROTO_MAXID = (IPPROTO_IDP + 1)
-IPCTL_FORWARDING = 1
-IPCTL_SENDREDIRECTS = 2
-IPCTL_DEFTTL = 3
-IPCTL_DEFMTU = 4
-IPCTL_RTEXPIRE = 5
-IPCTL_RTMINEXPIRE = 6
-IPCTL_RTMAXCACHE = 7
-IPCTL_SOURCEROUTE = 8
-IPCTL_DIRECTEDBROADCAST = 9
-IPCTL_INTRQMAXLEN = 10
-IPCTL_INTRQDROPS = 11
-IPCTL_ACCEPTSOURCEROUTE = 13
-IPCTL_MAXID = 13
-IP_NAT_IN = 0x00000001
-IP_NAT_OUT = 0x00000002
diff --git a/Lib/plat-freebsd2/regen b/Lib/plat-freebsd2/regen
deleted file mode 100755 (executable)
index 8f7e15e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-set -v
-h2py -i '(u_long)' /usr/include/netinet/in.h
diff --git a/Lib/plat-freebsd3/IN.py b/Lib/plat-freebsd3/IN.py
deleted file mode 100644 (file)
index 81a430c..0000000
+++ /dev/null
@@ -1,189 +0,0 @@
-# Generated by h2py from /usr/include/netinet/in.h
-IPPROTO_IP = 0
-IPPROTO_ICMP = 1
-IPPROTO_IGMP = 2
-IPPROTO_GGP = 3
-IPPROTO_IPIP = 4
-IPPROTO_TCP = 6
-IPPROTO_ST = 7
-IPPROTO_EGP = 8
-IPPROTO_PIGP = 9
-IPPROTO_RCCMON = 10
-IPPROTO_NVPII = 11
-IPPROTO_PUP = 12
-IPPROTO_ARGUS = 13
-IPPROTO_EMCON = 14
-IPPROTO_XNET = 15
-IPPROTO_CHAOS = 16
-IPPROTO_UDP = 17
-IPPROTO_MUX = 18
-IPPROTO_MEAS = 19
-IPPROTO_HMP = 20
-IPPROTO_PRM = 21
-IPPROTO_IDP = 22
-IPPROTO_TRUNK1 = 23
-IPPROTO_TRUNK2 = 24
-IPPROTO_LEAF1 = 25
-IPPROTO_LEAF2 = 26
-IPPROTO_RDP = 27
-IPPROTO_IRTP = 28
-IPPROTO_TP = 29
-IPPROTO_BLT = 30
-IPPROTO_NSP = 31
-IPPROTO_INP = 32
-IPPROTO_SEP = 33
-IPPROTO_3PC = 34
-IPPROTO_IDPR = 35
-IPPROTO_XTP = 36
-IPPROTO_DDP = 37
-IPPROTO_CMTP = 38
-IPPROTO_TPXX = 39
-IPPROTO_IL = 40
-IPPROTO_SIP = 41
-IPPROTO_SDRP = 42
-IPPROTO_SIPSR = 43
-IPPROTO_SIPFRAG = 44
-IPPROTO_IDRP = 45
-IPPROTO_RSVP = 46
-IPPROTO_GRE = 47
-IPPROTO_MHRP = 48
-IPPROTO_BHA = 49
-IPPROTO_ESP = 50
-IPPROTO_AH = 51
-IPPROTO_INLSP = 52
-IPPROTO_SWIPE = 53
-IPPROTO_NHRP = 54
-IPPROTO_AHIP = 61
-IPPROTO_CFTP = 62
-IPPROTO_HELLO = 63
-IPPROTO_SATEXPAK = 64
-IPPROTO_KRYPTOLAN = 65
-IPPROTO_RVD = 66
-IPPROTO_IPPC = 67
-IPPROTO_ADFS = 68
-IPPROTO_SATMON = 69
-IPPROTO_VISA = 70
-IPPROTO_IPCV = 71
-IPPROTO_CPNX = 72
-IPPROTO_CPHB = 73
-IPPROTO_WSN = 74
-IPPROTO_PVP = 75
-IPPROTO_BRSATMON = 76
-IPPROTO_ND = 77
-IPPROTO_WBMON = 78
-IPPROTO_WBEXPAK = 79
-IPPROTO_EON = 80
-IPPROTO_VMTP = 81
-IPPROTO_SVMTP = 82
-IPPROTO_VINES = 83
-IPPROTO_TTP = 84
-IPPROTO_IGP = 85
-IPPROTO_DGP = 86
-IPPROTO_TCF = 87
-IPPROTO_IGRP = 88
-IPPROTO_OSPFIGP = 89
-IPPROTO_SRPC = 90
-IPPROTO_LARP = 91
-IPPROTO_MTP = 92
-IPPROTO_AX25 = 93
-IPPROTO_IPEIP = 94
-IPPROTO_MICP = 95
-IPPROTO_SCCSP = 96
-IPPROTO_ETHERIP = 97
-IPPROTO_ENCAP = 98
-IPPROTO_APES = 99
-IPPROTO_GMTP = 100
-IPPROTO_DIVERT = 254
-IPPROTO_RAW = 255
-IPPROTO_MAX = 256
-IPPORT_RESERVED = 1024
-IPPORT_USERRESERVED = 5000
-IPPORT_HIFIRSTAUTO = 49152
-IPPORT_HILASTAUTO = 65535
-IPPORT_RESERVEDSTART = 600
-def IN_CLASSA(i): return (((int)(i) & 0x80000000) == 0)
-
-IN_CLASSA_NET = 0xff000000
-IN_CLASSA_NSHIFT = 24
-IN_CLASSA_HOST = 0x00ffffff
-IN_CLASSA_MAX = 128
-def IN_CLASSB(i): return (((int)(i) & 0xc0000000) == 0x80000000)
-
-IN_CLASSB_NET = 0xffff0000
-IN_CLASSB_NSHIFT = 16
-IN_CLASSB_HOST = 0x0000ffff
-IN_CLASSB_MAX = 65536
-def IN_CLASSC(i): return (((int)(i) & 0xe0000000) == 0xc0000000)
-
-IN_CLASSC_NET = 0xffffff00
-IN_CLASSC_NSHIFT = 8
-IN_CLASSC_HOST = 0x000000ff
-def IN_CLASSD(i): return (((int)(i) & 0xf0000000) == 0xe0000000)
-
-IN_CLASSD_NET = 0xf0000000
-IN_CLASSD_NSHIFT = 28
-IN_CLASSD_HOST = 0x0fffffff
-def IN_MULTICAST(i): return IN_CLASSD(i)
-
-def IN_EXPERIMENTAL(i): return (((int)(i) & 0xf0000000) == 0xf0000000)
-
-def IN_BADCLASS(i): return (((int)(i) & 0xf0000000) == 0xf0000000)
-
-INADDR_ANY = 0x00000000
-INADDR_LOOPBACK = 0x7f000001
-INADDR_BROADCAST = 0xffffffff
-INADDR_NONE = 0xffffffff
-INADDR_UNSPEC_GROUP = 0xe0000000
-INADDR_ALLHOSTS_GROUP = 0xe0000001
-INADDR_ALLRTRS_GROUP = 0xe0000002
-INADDR_MAX_LOCAL_GROUP = 0xe00000ff
-IN_LOOPBACKNET = 127
-IP_OPTIONS = 1
-IP_HDRINCL = 2
-IP_TOS = 3
-IP_TTL = 4
-IP_RECVOPTS = 5
-IP_RECVRETOPTS = 6
-IP_RECVDSTADDR = 7
-IP_RETOPTS = 8
-IP_MULTICAST_IF = 9
-IP_MULTICAST_TTL = 10
-IP_MULTICAST_LOOP = 11
-IP_ADD_MEMBERSHIP = 12
-IP_DROP_MEMBERSHIP = 13
-IP_MULTICAST_VIF = 14
-IP_RSVP_ON = 15
-IP_RSVP_OFF = 16
-IP_RSVP_VIF_ON = 17
-IP_RSVP_VIF_OFF = 18
-IP_PORTRANGE = 19
-IP_RECVIF = 20
-IP_FW_ADD = 50
-IP_FW_DEL = 51
-IP_FW_FLUSH = 52
-IP_FW_ZERO = 53
-IP_FW_GET = 54
-IP_NAT = 55
-IP_DEFAULT_MULTICAST_TTL = 1
-IP_DEFAULT_MULTICAST_LOOP = 1
-IP_MAX_MEMBERSHIPS = 20
-IP_PORTRANGE_DEFAULT = 0
-IP_PORTRANGE_HIGH = 1
-IP_PORTRANGE_LOW = 2
-IPPROTO_MAXID = (IPPROTO_IDP + 1)
-IPCTL_FORWARDING = 1
-IPCTL_SENDREDIRECTS = 2
-IPCTL_DEFTTL = 3
-IPCTL_DEFMTU = 4
-IPCTL_RTEXPIRE = 5
-IPCTL_RTMINEXPIRE = 6
-IPCTL_RTMAXCACHE = 7
-IPCTL_SOURCEROUTE = 8
-IPCTL_DIRECTEDBROADCAST = 9
-IPCTL_INTRQMAXLEN = 10
-IPCTL_INTRQDROPS = 11
-IPCTL_STATS = 12
-IPCTL_ACCEPTSOURCEROUTE = 13
-IPCTL_MAXID = 14
-IP_NAT_IN = 0x00000001
-IP_NAT_OUT = 0x00000002
diff --git a/Lib/plat-freebsd3/regen b/Lib/plat-freebsd3/regen
deleted file mode 100755 (executable)
index 170f155..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-set -v
-h2py -i '(u_long)' /usr/include/netinet/in.h
-
index 09f63db2fa1554cfd2fc84a6f354fba629896038..2a66d19ab94f318dc7d7ed6eb813d05f5b1a4fa6 100644 (file)
@@ -14,7 +14,7 @@ intention is that the end user will use this through a GUI.
 """
 import sys
 import os
-import popen2
+import subprocess
 import urllib
 import urllib2
 import urlparse
@@ -101,10 +101,11 @@ def _cmd(output, dir, *cmditems):
         output.write("+ %s\n" % cmd)
     if NO_EXECUTE:
         return 0
-    child = popen2.Popen4(cmd)
-    child.tochild.close()
+    child = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    child.stdin.close()
     while 1:
-        line = child.fromchild.readline()
+        line = child.stdout.readline()
         if not line:
             break
         if output:
index 6c5cd6198dbdf9c898ed342c2111727f3af523fc..2e258683f3644f03e83e6ff9ee7942694236ace4 100644 (file)
@@ -8,6 +8,9 @@ and popen3(cmd) which return two or three pipes to the spawned command.
 
 import os
 import sys
+import warnings
+warnings.warn("The popen2 module is deprecated.  Use the subprocess module.",
+              DeprecationWarning, stacklevel=2)
 
 __all__ = ["popen2", "popen3", "popen4"]
 
diff --git a/Lib/test/crashers/dangerous_subclassing.py b/Lib/test/crashers/dangerous_subclassing.py
deleted file mode 100644 (file)
index 0479952..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# http://python.org/sf/1174712
-
-import types
-
-class X(types.ModuleType, str):
-    """Such a subclassing is incorrectly allowed --
-    see the SF bug report for explanations"""
-
-if __name__ == '__main__':
-    X('name')    # segfault: ModuleType.__init__() reads
-                 # the dict at the wrong offset
diff --git a/Lib/test/crashers/modify_dict_attr.py b/Lib/test/crashers/modify_dict_attr.py
deleted file mode 100644 (file)
index be675c1..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# http://python.org/sf/1303614
-
-class Y(object):
-    pass
-
-class type_with_modifiable_dict(type, Y):
-    pass
-
-class MyClass(object, metaclass=type_with_modifiable_dict):
-    """This class has its __dict__ attribute indirectly
-    exposed via the __dict__ getter/setter of Y.
-    """
-
-
-if __name__ == '__main__':
-    dictattr = Y.__dict__['__dict__']
-    dictattr.__delete__(MyClass)  # if we set tp_dict to NULL,
-    print(MyClass)         # doing anything with MyClass segfaults
index 7458b5e15bc648296022a9c67fcd60d8de3c553e..3681a9d9caef874976dedd9e7dc9265ee54d8182 100755 (executable)
@@ -689,9 +689,10 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
             deltas.append(sys.gettotalrefcount() - rc - 2)
     print(file=sys.stderr)
     if any(deltas):
-        print(test, 'leaked', deltas, 'references', file=sys.stderr)
+        msg = '%s leaked %s references, sum=%s' % (test, deltas, sum(deltas))
+        print(msg, file=sys.stderr)
         refrep = open(fname, "a")
-        print(test, 'leaked', deltas, 'references', file=refrep)
+        print(msg, file=refrep)
         refrep.close()
 
 def dash_R_cleanup(fs, ps, pic):
index b1b64a877e631ccdc2ff9a78f9c487a9100e9f63..f2c9579dd8039a7c38517e2ef1feb05fb4bbb4fe 100644 (file)
@@ -2,7 +2,7 @@
 Common tests shared by test_str, test_unicode, test_userstring and test_string.
 """
 
-import unittest, string, sys
+import unittest, string, sys, struct
 from test import test_support
 from UserList import UserList
 
@@ -507,7 +507,7 @@ class BaseTest(unittest.TestCase):
 
     def test_replace_overflow(self):
         # Check for overflow checking on 32 bit machines
-        if sys.maxint != 2147483647:
+        if sys.maxint != 2147483647 or struct.calcsize("P") > 4:
             return
         A2_16 = "A" * (2**16)
         self.checkraises(OverflowError, A2_16, "replace", "", A2_16)
index 7a39ca3d3a64d1093af5d63882ddb21fa3349782..e7ed2f7a0c0c2aaf276700e2f96f2ed93a1bde2a 100644 (file)
@@ -7,6 +7,8 @@ warnings.filterwarnings("ignore",
                         "the gopherlib module is deprecated",
                         DeprecationWarning,
                         "<string>")
+warnings.filterwarnings("ignore", ".*popen2 module is deprecated.*",
+                        DeprecationWarning)
 
 class AllTest(unittest.TestCase):
 
index 44684c3c94b317449268656cdaf5741c9278e5e7..0ddfc571f9c7d18b8d8119de43ec541014d23261 100644 (file)
@@ -5,7 +5,7 @@ from test.test_support import TESTFN
 import unittest
 from cStringIO import StringIO
 import os
-import popen2
+import subprocess
 import sys
 
 import bz2
@@ -21,18 +21,20 @@ class BaseTest(unittest.TestCase):
 
     if has_cmdline_bunzip2:
         def decompress(self, data):
-            pop = popen2.Popen3("bunzip2", capturestderr=1)
-            pop.tochild.write(data)
-            pop.tochild.close()
-            ret = pop.fromchild.read()
-            pop.fromchild.close()
+            pop = subprocess.Popen("bunzip2", shell=True,
+                                   stdin=subprocess.PIPE,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.STDOUT)
+            pop.stdin.write(data)
+            pop.stdin.close()
+            ret = pop.stdout.read()
+            pop.stdout.close()
             if pop.wait() != 0:
                 ret = bz2.decompress(data)
             return ret
 
     else:
-        # popen2.Popen3 doesn't exist on Windows, and even if it did, bunzip2
-        # isn't available to run.
+        # bunzip2 isn't available to run on Windows.
         def decompress(self, data):
             return bz2.decompress(data)
 
index cacae7a697aa74ecd38c804d0f5b264a13d6522d..d3f07c7f134ddc49e1c90636e343b910a9034846 100644 (file)
@@ -1,18 +1,19 @@
 
 import test.test_support, unittest
 import sys
-import popen2
 import subprocess
 
 class CmdLineTest(unittest.TestCase):
     def start_python(self, cmd_line):
-        outfp, infp = popen2.popen4('"%s" %s' % (sys.executable, cmd_line))
-        infp.close()
-        data = outfp.read()
-        outfp.close()
+        cmd = '"%s" %s' % (sys.executable, cmd_line)
+        p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        p.stdin.close()
+        data = p.stdout.read()
+        p.stdout.close()
         # try to cleanup the child so we don't appear to leak when running
         # with regrtest -R.  This should be a no-op on Windows.
-        popen2._cleanup()
+        subprocess._cleanup()
         return data
 
     def exit_code(self, *args):
index a8dfdb1d70e877217de5a9215fc9be002ca9715e..18c1eb6aec07670b8660368d83c1c502226ce487 100644 (file)
@@ -137,7 +137,7 @@ class TestDefaultDict(unittest.TestCase):
         try:
             d1[(1,)]
         except KeyError as err:
-            self.assertEqual(err.message, (1,))
+            self.assertEqual(err.args[0], (1,))
         else:
             self.fail("expected KeyError")
 
index 4b6d734b81c1397247d1277526383da8643ae160..e8d94f4bc52e7ad7239a088e74a4728fce078ad5 100644 (file)
@@ -3,6 +3,7 @@
 from test.test_support import verify, vereq, verbose, TestFailed, TESTFN, get_original_stdout
 from copy import deepcopy
 import warnings
+import types
 
 warnings.filterwarnings("ignore",
          r'complex divmod\(\), // and % are deprecated$',
@@ -814,6 +815,16 @@ def pymods():
                 ("getattr", "foo"),
                 ("delattr", "foo")])
 
+    # http://python.org/sf/1174712
+    try:
+        class Module(types.ModuleType, str):
+            pass
+    except TypeError:
+        pass
+    else:
+        raise TestFailed("inheriting from ModuleType and str at the "
+                          "same time should fail")
+
 def multi():
     if verbose: print("Testing multiple inheritance...")
     class C(object):
@@ -2734,8 +2745,73 @@ def setdict():
     cant(a, [])
     cant(a, 1)
     del a.__dict__ # Deleting __dict__ is allowed
-    # Classes don't allow __dict__ assignment
-    cant(C, {})
+
+    class Base(object):
+        pass
+    def verify_dict_readonly(x):
+        """
+        x has to be an instance of a class inheriting from Base.
+        """
+        cant(x, {})
+        try:
+            del x.__dict__
+        except (AttributeError, TypeError):
+            pass
+        else:
+            raise TestFailed, "shouldn't allow del %r.__dict__" % x
+        dict_descr = Base.__dict__["__dict__"]
+        try:
+            dict_descr.__set__(x, {})
+        except (AttributeError, TypeError):
+            pass
+        else:
+            raise TestFailed, "dict_descr allowed access to %r's dict" % x
+
+    # Classes don't allow __dict__ assignment and have readonly dicts
+    class Meta1(type, Base):
+        pass
+    class Meta2(Base, type):
+        pass
+    class D(object):
+        __metaclass__ = Meta1
+    class E(object):
+        __metaclass__ = Meta2
+    for cls in C, D, E:
+        verify_dict_readonly(cls)
+        class_dict = cls.__dict__
+        try:
+            class_dict["spam"] = "eggs"
+        except TypeError:
+            pass
+        else:
+            raise TestFailed, "%r's __dict__ can be modified" % cls
+
+    # Modules also disallow __dict__ assignment
+    class Module1(types.ModuleType, Base):
+        pass
+    class Module2(Base, types.ModuleType):
+        pass
+    for ModuleType in Module1, Module2:
+        mod = ModuleType("spam")
+        verify_dict_readonly(mod)
+        mod.__dict__["spam"] = "eggs"
+
+    # Exception's __dict__ can be replaced, but not deleted
+    class Exception1(Exception, Base):
+        pass
+    class Exception2(Base, Exception):
+        pass
+    for ExceptionType in Exception, Exception1, Exception2:
+        e = ExceptionType()
+        e.__dict__ = {"a": 1}
+        vereq(e.a, 1)
+        try:
+            del e.__dict__
+        except (TypeError, AttributeError):
+            pass
+        else:
+            raise TestFaied, "%r's __dict__ can be deleted" % e
+
 
 def pickles():
     if verbose:
index dbaf01c19a3a099b556d30e48e294d9ebcf507f3..b1d6790c86176394a81975838adc3c820e3cb6b9 100644 (file)
@@ -9,7 +9,9 @@ try:
 except ImportError:
     cPickle = None
 
-from test.test_support import TESTFN, unlink, run_unittest
+from test.test_support import (TESTFN, unlink, run_unittest,
+                                guard_warnings_filter)
+from test.test_pep352 import ignore_message_warning
 
 # XXX This is not really enough, each *operation* should be tested!
 
@@ -278,38 +280,40 @@ class ExceptionTests(unittest.TestCase):
         except NameError:
             pass
 
-        for exc, args, expected in exceptionList:
-            try:
-                e = exc(*args)
-            except:
-                print("\nexc=%r, args=%r" % (exc, args))
-                raise
-            else:
-                # Verify module name
-                self.assertEquals(type(e).__module__, '__builtin__')
-                # Verify no ref leaks in Exc_str()
-                s = str(e)
-                for checkArgName in expected:
-                    value = getattr(e, checkArgName)
-                    self.assertEquals(repr(value),
-                                      repr(expected[checkArgName]),
-                                      '%r.%s == %r, expected %r' % (
-                                      e, checkArgName,
-                                      value, expected[checkArgName]))
-
-                # test for pickling support
-                for p in pickle, cPickle:
-                    if p is None:
-                        continue # cPickle not found -- skip it
-                    for protocol in range(p.HIGHEST_PROTOCOL + 1):
-                        s = p.dumps(e, protocol)
-                        new = p.loads(s)
-                        for checkArgName in expected:
-                            got = repr(getattr(new, checkArgName))
-                            want = repr(expected[checkArgName])
-                            self.assertEquals(got, want,
-                                              'pickled "%r", attribute "%s' %
-                                              (e, checkArgName))
+        with guard_warnings_filter():
+            ignore_message_warning()
+            for exc, args, expected in exceptionList:
+                try:
+                    e = exc(*args)
+                except:
+                    print("\nexc=%r, args=%r" % (exc, args))
+                    raise
+                else:
+                    # Verify module name
+                    self.assertEquals(type(e).__module__, '__builtin__')
+                    # Verify no ref leaks in Exc_str()
+                    s = str(e)
+                    for checkArgName in expected:
+                        value = getattr(e, checkArgName)
+                        self.assertEquals(repr(value),
+                                          repr(expected[checkArgName]),
+                                          '%r.%s == %r, expected %r' % (
+                                          e, checkArgName,
+                                          value, expected[checkArgName]))
+
+                    # test for pickling support
+                    for p in pickle, cPickle:
+                        if p is None:
+                            continue # cPickle not found -- skip it
+                        for protocol in range(p.HIGHEST_PROTOCOL + 1):
+                            s = p.dumps(e, protocol)
+                            new = p.loads(s)
+                            for checkArgName in expected:
+                                got = repr(getattr(new, checkArgName))
+                                want = repr(expected[checkArgName])
+                                self.assertEquals(got, want,
+                                                  'pickled "%r", attribute "%s' %
+                                                  (e, checkArgName))
 
     def testKeywordArgs(self):
         # test that builtin exception don't take keyword args,
index be2f781b5906bcff8d80d7dc1a40230cc2845279..5bad8436ea4d9f8fd80e0f760ee4122285b41a9d 100644 (file)
@@ -166,7 +166,7 @@ class OtherFileTests(unittest.TestCase):
         try:
             f = _fileio._FileIO(TESTFN, bad_mode)
         except ValueError as msg:
-            if msg.message != 0:
+            if msg.args[0] != 0:
                 s = str(msg)
                 if s.find(TESTFN) != -1 or s.find(bad_mode) == -1:
                     self.fail("bad error message for invalid mode: %s" % s)
index a006bbf6a343c2fd5c1aa72aaa017c3edf35cb9a..718320de5416de720b9a1db4e3b1f28e2b0edf56 100644 (file)
@@ -1,5 +1,7 @@
 from test.test_support import verbose, have_unicode, TestFailed
 import sys
+from test.test_support import MAX_Py_ssize_t
+maxsize = MAX_Py_ssize_t
 
 # test string formatting operator (I am not sure if this is being tested
 # elsewhere but, surely, some of the given cases are *not* tested because
@@ -238,11 +240,11 @@ class Foobar(int):
 test_exc('%o', Foobar(), TypeError,
          "expected string or Unicode object, int found")
 
-if sys.maxint == 2**31-1:
+if maxsize == 2**31-1:
     # crashes 2.2.1 and earlier:
     try:
-        "%*d"%(sys.maxint, -127)
+        "%*d"%(maxsize, -127)
     except MemoryError:
         pass
     else:
-        raise TestFailed, '"%*d"%(sys.maxint, -127) should fail'
+        raise TestFailed, '"%*d"%(maxsize, -127) should fail'
index 8055c332b1c4d5d184878daa2c4a8155124529c1..653665e58d78aec0f9ef9c65cc64b62d2121d617 100644 (file)
@@ -1,7 +1,10 @@
 import unittest
 from test import test_support
 import operator
+import sys
 from sys import maxint
+maxsize = test_support.MAX_Py_ssize_t
+minsize = -maxsize-1
 
 class oldstyle:
     def __index__(self):
@@ -177,7 +180,7 @@ class OverflowTestCase(unittest.TestCase):
     def _getitem_helper(self, base):
         class GetItem(base):
             def __len__(self):
-                return maxint
+                return maxint #cannot return long here
             def __getitem__(self, key):
                 return key
             def __getslice__(self, i, j):
@@ -185,8 +188,8 @@ class OverflowTestCase(unittest.TestCase):
         x = GetItem()
         self.assertEqual(x[self.pos], self.pos)
         self.assertEqual(x[self.neg], self.neg)
-        self.assertEqual(x[self.neg:self.pos], (-1, maxint))
-        self.assertEqual(x[self.neg:self.pos:1].indices(maxint), (0, maxint, 1))
+        self.assertEqual(x[self.neg:self.pos], (maxint+minsize, maxsize))
+        self.assertEqual(x[self.neg:self.pos:1].indices(maxsize), (0, maxsize, 1))
 
     def test_getitem(self):
         self._getitem_helper(object)
index c2a539c30a35c692b5a2d1fc26ee14169b63311b..765501d44c1a761e3db464603ad1fa2a4a9ce528 100644 (file)
@@ -5,6 +5,8 @@ from weakref import proxy
 import sys
 import operator
 import random
+maxsize = test_support.MAX_Py_ssize_t
+minsize = -maxsize-1
 
 def lzip(*args):
     return list(zip(*args))
@@ -55,7 +57,7 @@ class TestBasicOps(unittest.TestCase):
         self.assertEqual(take(2, lzip('abc',count(3))), [('a', 3), ('b', 4)])
         self.assertRaises(TypeError, count, 2, 3)
         self.assertRaises(TypeError, count, 'a')
-        self.assertRaises(OverflowError, list, islice(count(sys.maxint-5), 10))
+        self.assertRaises(OverflowError, list, islice(count(maxsize-5), 10))
         c = count(3)
         self.assertEqual(repr(c), 'count(3)')
         next(c)
@@ -336,7 +338,7 @@ class TestBasicOps(unittest.TestCase):
         self.assertRaises(ValueError, islice, range(10), 1, 'a')
         self.assertRaises(ValueError, islice, range(10), 'a', 1, 1)
         self.assertRaises(ValueError, islice, range(10), 1, 'a', 1)
-        self.assertEqual(len(list(islice(count(), 1, 10, sys.maxint))), 1)
+        self.assertEqual(len(list(islice(count(), 1, 10, maxsize))), 1)
 
     def test_takewhile(self):
         data = [1, 3, 5, 20, 2, 4, 6, 8]
index e39a397fd351b0e7621de37dc150ef3f87f491f0..b372ce9e6e13d7d86701c6ee743eeafa335efb52 100644 (file)
@@ -5,6 +5,13 @@ from test.test_support import run_unittest, guard_warnings_filter
 import os
 from platform import system as platform_system
 
+def ignore_message_warning():
+    """Ignore the DeprecationWarning for BaseException.message."""
+    warnings.resetwarnings()
+    warnings.filterwarnings("ignore", "BaseException.message",
+                            DeprecationWarning)
+
+
 class ExceptionClassTests(unittest.TestCase):
 
     """Tests for anything relating to exception objects themselves (e.g.,
@@ -14,9 +21,12 @@ class ExceptionClassTests(unittest.TestCase):
         self.failUnless(issubclass(Exception, object))
 
     def verify_instance_interface(self, ins):
-        for attr in ("args", "message", "__str__", "__repr__"):
-            self.failUnless(hasattr(ins, attr), "%s missing %s attribute" %
-                    (ins.__class__.__name__, attr))
+        with guard_warnings_filter():
+            ignore_message_warning()
+            for attr in ("args", "message", "__str__", "__repr__"):
+                self.failUnless(hasattr(ins, attr),
+                        "%s missing %s attribute" %
+                            (ins.__class__.__name__, attr))
 
     def test_inheritance(self):
         # Make sure the inheritance hierarchy matches the documentation
@@ -79,7 +89,7 @@ class ExceptionClassTests(unittest.TestCase):
             inheritance_tree.close()
         self.failUnlessEqual(len(exc_set), 0, "%s not accounted for" % exc_set)
 
-    interface_tests = ("length", "args", "message", "str", "unicode", "repr")
+    interface_tests = ("length", "args", "message", "str", "repr")
 
     def interface_test_driver(self, results):
         for test_name, (given, expected) in zip(self.interface_tests, results):
@@ -90,29 +100,57 @@ class ExceptionClassTests(unittest.TestCase):
         # Make sure interface works properly when given a single argument
         arg = "spam"
         exc = Exception(arg)
-        results = ([len(exc.args), 1], [exc.args[0], arg], [exc.message, arg],
-                [str(exc), str(arg)], [str(exc), str(arg)],
-            [repr(exc), exc.__class__.__name__ + repr(exc.args)])
-        self.interface_test_driver(results)
+        with guard_warnings_filter():
+            ignore_message_warning()
+            results = ([len(exc.args), 1], [exc.args[0], arg],
+                       [exc.message, arg],
+                       [str(exc), str(arg)],
+                [repr(exc), exc.__class__.__name__ + repr(exc.args)])
+            self.interface_test_driver(results)
 
     def test_interface_multi_arg(self):
         # Make sure interface correct when multiple arguments given
         arg_count = 3
         args = tuple(range(arg_count))
         exc = Exception(*args)
-        results = ([len(exc.args), arg_count], [exc.args, args],
-                [exc.message, ''], [str(exc), str(args)],
-                [str(exc), str(args)],
-                [repr(exc), exc.__class__.__name__ + repr(exc.args)])
-        self.interface_test_driver(results)
+        with guard_warnings_filter():
+            ignore_message_warning()
+            results = ([len(exc.args), arg_count], [exc.args, args],
+                    [exc.message, ''], [str(exc), str(args)],
+                    [repr(exc), exc.__class__.__name__ + repr(exc.args)])
+            self.interface_test_driver(results)
 
     def test_interface_no_arg(self):
         # Make sure that with no args that interface is correct
         exc = Exception()
-        results = ([len(exc.args), 0], [exc.args, tuple()], [exc.message, ''],
-                [str(exc), ''], [str(exc), ''],
-                [repr(exc), exc.__class__.__name__ + '()'])
-        self.interface_test_driver(results)
+        with guard_warnings_filter():
+            ignore_message_warning()
+            results = ([len(exc.args), 0], [exc.args, tuple()],
+                    [exc.message, ''],
+                    [str(exc), ''],
+                    [repr(exc), exc.__class__.__name__ + '()'])
+            self.interface_test_driver(results)
+
+    def test_message_deprecation(self):
+        # As of Python 2.6, BaseException.message is deprecated.
+        with guard_warnings_filter():
+            warnings.resetwarnings()
+            warnings.filterwarnings('error')
+
+            try:
+                BaseException().message
+            except DeprecationWarning:
+                pass
+            else:
+                self.fail("BaseException.message not deprecated")
+
+            exc = BaseException()
+            try:
+                exc.message = ''
+            except DeprecationWarning:
+                pass
+            else:
+                self.fail("BaseException.message assignment not deprecated")
 
 class UsageTests(unittest.TestCase):
 
index 31f22d6adf1b94640dcc8f4b324639b1f1c845a6..023871f598b2bca69e3fce6b2037a44e950265e8 100644 (file)
@@ -1,6 +1,12 @@
 #! /usr/bin/env python
 """Test script for popen2.py"""
 
+import warnings
+warnings.filterwarnings("ignore", ".*popen2 module is deprecated.*",
+                        DeprecationWarning)
+warnings.filterwarnings("ignore", "os\.popen. is deprecated.*",
+                        DeprecationWarning)
+
 import os
 import sys
 import unittest
index 0abf4646c450d2c38633ab2a86a11e9dc75d9bbc..88aa68c5b3caa7c07fbcfb4e02984f9f5b777ab5 100644 (file)
@@ -130,6 +130,16 @@ class PosixPathTest(unittest.TestCase):
             "/home/swen/spam"
         )
 
+        testlist = ['', 'abc', 'Xbcd', 'Xb', 'XY', 'abcd', 'aXc', 'abd', 'ab', 'aX', 'abcX']
+        for s1 in testlist:
+            for s2 in testlist:
+                p = posixpath.commonprefix([s1, s2])
+                self.assert_(s1.startswith(p))
+                self.assert_(s2.startswith(p))
+                if s1 != s2:
+                    n = len(p)
+                    self.assertNotEqual(s1[n:n+1], s2[n:n+1])
+
     def test_getsize(self):
         f = open(test_support.TESTFN, "wb")
         try:
index 5ce387beb4ca983364440dbef9e7df66d86485a1..245a9e4a24eda949a93f7a6b74cb4c8386ecb2de 100644 (file)
@@ -1,3 +1,5 @@
+import errno
+import fcntl
 import pty
 import os
 import sys
@@ -40,6 +42,7 @@ def normalize_output(data):
 
 # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
 # because pty code is not too portable.
+# XXX(nnorwitz):  these tests leak fds when there is an error.
 class PtyTest(unittest.TestCase):
     def setUp(self):
         # isatty() and close() can hang on some platforms.  Set an alarm
@@ -70,6 +73,22 @@ class PtyTest(unittest.TestCase):
 
         self.assertTrue(os.isatty(slave_fd), 'slave_fd is not a tty')
 
+        # Solaris requires reading the fd before anything is returned.
+        # My guess is that since we open and close the slave fd
+        # in master_open(), we need to read the EOF.
+
+        # Ensure the fd is non-blocking in case there's nothing to read.
+        orig_flags = fcntl.fcntl(master_fd, fcntl.F_GETFL)
+        fcntl.fcntl(master_fd, fcntl.F_SETFL, orig_flags | os.O_NONBLOCK)
+        try:
+            s1 = os.read(master_fd, 1024)
+            self.assertEquals('', s1)
+        except OSError as e:
+            if e.errno != errno.EAGAIN:
+                raise
+        # Restore the original flags.
+        fcntl.fcntl(master_fd, fcntl.F_SETFL, orig_flags)
+
         debug("Writing to slave_fd")
         os.write(slave_fd, TEST_STRING_1)
         s1 = os.read(master_fd, 1024)
index 7cbee0ad8fc00ba0d1c3eacb0b9d55f877abf3f5..5692a83acdb69b9bbada26f7ba94fb3f1b9dbcd5 100644 (file)
@@ -256,6 +256,7 @@ def check_syntax_error(testcase, statement):
 def open_urlresource(url):
     import urllib, urlparse
 
+    requires('urlfetch')
     filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
 
     for path in [os.path.curdir, os.path.pardir]:
@@ -263,7 +264,6 @@ def open_urlresource(url):
         if os.path.exists(fn):
             return open(fn)
 
-    requires('urlfetch')
     print('\tfetching %s ...' % url, file=get_original_stdout())
     fn, _ = urllib.urlretrieve(url, filename)
     return open(fn)
index 70f12d22961633f80c269fee3048ca3f672d8e8c..327d65fbf3e9b2702d66d1ea1a0a5cc572b80f62 100644 (file)
@@ -540,7 +540,8 @@ class Test_TestLoader(TestCase):
             # audioop should now be loaded, thanks to loadTestsFromName()
             self.failUnless(module_name in sys.modules)
         finally:
-            del sys.modules[module_name]
+            if module_name in sys.modules:
+                del sys.modules[module_name]
 
     ################################################################
     ### Tests for TestLoader.loadTestsFromName()
@@ -936,7 +937,8 @@ class Test_TestLoader(TestCase):
             # audioop should now be loaded, thanks to loadTestsFromName()
             self.failUnless(module_name in sys.modules)
         finally:
-            del sys.modules[module_name]
+            if module_name in sys.modules:
+                del sys.modules[module_name]
 
     ################################################################
     ### /Tests for TestLoader.loadTestsFromNames()
index 4babcbc5cfc8c052024f5e830e865640efd24038..7e0ef43bbe3248bff67f7d8eb6f0e09255d8c2d6 100755 (executable)
@@ -196,7 +196,7 @@ if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
             ## ensure that the reflog exists so the grep doesn't fail
             touch $REFLOG
             $PYTHON $REGRTEST_ARGS -R 4:3:$REFLOG -u network $LEAKY_SKIPS >& build/$F
-            NUM_FAILURES=`egrep -vc "$LEAKY_TESTS" $REFLOG`
+            NUM_FAILURES=`egrep -vc "($LEAKY_TESTS|sum=0)" $REFLOG`
             update_status "Testing refleaks ($NUM_FAILURES failures)" "$F" $start
             mail_on_failure "refleak" $REFLOG
 
@@ -245,4 +245,3 @@ echo "</html>" >> $RESULT_FILE
 rsync $RSYNC_OPTS html/* $REMOTE_SYSTEM:$REMOTE_DIR
 cd ../build
 rsync $RSYNC_OPTS index.html *.out $REMOTE_SYSTEM:$REMOTE_DIR/results/
-
index 0e34b15fd3ec11d10b3801caaa21754acbc72096..08764ebda6326e5bbba6762b09cd854f71a8f141 100644 (file)
@@ -2054,12 +2054,6 @@ zipfile          Read & write PK zipped files.
             sha         Interface to the SHA message digest algorithm
             HMAC        Keyed-Hashing for Message Authentication -- RFC 2104.
 
-* Stdwin * Standard Window System
-
-            stdwin              Standard Window System interface
-            stdwinevents        Stdwin event, command, and selection constants
-            rect                Rectangle manipulation operations
-
 * SGI IRIX * (4 & 5)
 
             al          SGI audio facilities
index 89b44aa0d9550766e99ba04ea515e1da377c4e5d..cbcf2b8cdd703b02273e6b74a6acb94ad1f26226 100644 (file)
@@ -384,8 +384,27 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
                return E_FAIL;
        }
 
-       result = PyObject_CallFunction(func,
-                                      "iii", rclsid, riid, ppv);
+       {
+               PyObject *py_rclsid = PyLong_FromVoidPtr(rclsid);
+               PyObject *py_riid = PyLong_FromVoidPtr(riid);
+               PyObject *py_ppv = PyLong_FromVoidPtr(ppv);
+               if (!py_rclsid || !py_riid || !py_ppv) {
+                       Py_XDECREF(py_rclsid);
+                       Py_XDECREF(py_riid);
+                       Py_XDECREF(py_ppv);
+                       Py_DECREF(func);
+                       PyErr_WriteUnraisable(context ? context : Py_None);
+                       return E_FAIL;
+               }
+               result = PyObject_CallFunctionObjArgs(func,
+                                                     py_rclsid,
+                                                     py_riid,
+                                                     py_ppv,
+                                                     NULL);
+               Py_DECREF(py_rclsid);
+               Py_DECREF(py_riid);
+               Py_DECREF(py_ppv);
+       }
        Py_DECREF(func);
        if (!result) {
                PyErr_WriteUnraisable(context ? context : Py_None);
index fb70963c883fc858f6b47b961b84b4892ec1c3e3..94cd6f786140279cee7fd85d377a6ada7ca2e203 100644 (file)
@@ -533,8 +533,10 @@ static int ConvParam(PyObject *obj, int index, struct argument *pa)
                size += 1; /* terminating NUL */
                size *= sizeof(wchar_t);
                pa->value.p = PyMem_Malloc(size);
-               if (!pa->value.p)
+               if (!pa->value.p) {
+                       PyErr_NoMemory();
                        return -1;
+               }
                memset(pa->value.p, 0, size);
                pa->keep = PyCObject_FromVoidPtr(pa->value.p, PyMem_Free);
                if (!pa->keep) {
@@ -1120,10 +1122,10 @@ static char free_library_doc[] =
 Free the handle of an executable previously loaded by LoadLibrary.\n";
 static PyObject *free_library(PyObject *self, PyObject *args)
 {
-       HMODULE hMod;
-       if (!PyArg_ParseTuple(args, "i:FreeLibrary", &hMod))
+       void *hMod;
+       if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":FreeLibrary", &hMod))
                return NULL;
-       if (!FreeLibrary(hMod))
+       if (!FreeLibrary((HMODULE)hMod))
                return PyErr_SetFromWindowsErr(GetLastError());
        Py_INCREF(Py_None);
        return Py_None;
@@ -1242,11 +1244,11 @@ static PyObject *py_dl_open(PyObject *self, PyObject *args)
 
 static PyObject *py_dl_close(PyObject *self, PyObject *args)
 {
-       int handle;
+       void *handle;
 
-       if (!PyArg_ParseTuple(args, "i:dlclose", &handle))
+       if (!PyArg_ParseTuple(args, PY_VOID_P_CODE ":dlclose", &handle))
                return NULL;
-       if (dlclose((void*)handle)) {
+       if (dlclose(handle)) {
                PyErr_SetString(PyExc_OSError,
                                       ctypes_dlerror());
                return NULL;
@@ -1258,10 +1260,10 @@ static PyObject *py_dl_close(PyObject *self, PyObject *args)
 static PyObject *py_dl_sym(PyObject *self, PyObject *args)
 {
        char *name;
-       int handle;
+       void *handle;
        void *ptr;
 
-       if (!PyArg_ParseTuple(args, "is:dlsym", &handle, &name))
+       if (!PyArg_ParseTuple(args, PY_VOID_P_CODE "s:dlsym", &handle, &name))
                return NULL;
        ptr = ctypes_dlsym((void*)handle, name);
        if (!ptr) {
@@ -1269,7 +1271,7 @@ static PyObject *py_dl_sym(PyObject *self, PyObject *args)
                                       ctypes_dlerror());
                return NULL;
        }
-       return Py_BuildValue("i", ptr);
+       return PyLong_FromVoidPtr(ptr);
 }
 #endif
 
@@ -1281,12 +1283,12 @@ static PyObject *py_dl_sym(PyObject *self, PyObject *args)
 static PyObject *
 call_function(PyObject *self, PyObject *args)
 {
-       int func;
+       void *func;
        PyObject *arguments;
        PyObject *result;
 
        if (!PyArg_ParseTuple(args,
-                             "iO!",
+                             PY_VOID_P_CODE "O!",
                              &func,
                              &PyTuple_Type, &arguments))
                return NULL;
@@ -1312,12 +1314,12 @@ call_function(PyObject *self, PyObject *args)
 static PyObject *
 call_cdeclfunction(PyObject *self, PyObject *args)
 {
-       int func;
+       void *func;
        PyObject *arguments;
        PyObject *result;
 
        if (!PyArg_ParseTuple(args,
-                             "iO!",
+                             PY_VOID_P_CODE "O!",
                              &func,
                              &PyTuple_Type, &arguments))
                return NULL;
index 9b9088259bf0f9b2845d97695e6879fd6d88cef1..6b0a526aca30dd46f3bec13447246d6e7839ed0e 100644 (file)
@@ -1366,7 +1366,7 @@ z_get(void *ptr, unsigned size)
                if (IsBadStringPtrA(*(char **)ptr, -1)) {
                        PyErr_Format(PyExc_ValueError,
                                     "invalid string pointer %p",
-                                    ptr);
+                                    *(char **)ptr);
                        return NULL;
                }
 #endif
@@ -1426,7 +1426,7 @@ Z_set(void *ptr, PyObject *value, unsigned size)
                size *= sizeof(wchar_t);
                buffer = (wchar_t *)PyMem_Malloc(size);
                if (!buffer)
-                       return NULL;
+                       return PyErr_NoMemory();
                memset(buffer, 0, size);
                keep = PyCObject_FromVoidPtr(buffer, PyMem_Free);
                if (!keep) {
@@ -1451,9 +1451,17 @@ Z_get(void *ptr, unsigned size)
 {
        wchar_t *p;
        p = *(wchar_t **)ptr;
-       if (p)
+       if (p) {
+#if defined(MS_WIN32) && !defined(_WIN32_WCE)
+               if (IsBadStringPtrW(*(wchar_t **)ptr, -1)) {
+                       PyErr_Format(PyExc_ValueError,
+                                    "invalid string pointer %p",
+                                    *(wchar_t **)ptr);
+                       return NULL;
+               }
+#endif
                return PyUnicode_FromWideChar(p, wcslen(p));
-       else {
+       else {
                Py_INCREF(Py_None);
                return Py_None;
        }
index 0af7851020832bcbfe3c5e440b331be6535a8195..5fb603075d3363606872c1088e79c8469d880b97 100644 (file)
@@ -23,6 +23,12 @@ typedef int Py_ssize_t;
 #define PY_LONG_LONG LONG_LONG
 #endif
 
+#if SIZEOF_VOID_P == SIZEOF_LONG
+#define PY_VOID_P_CODE "k"
+#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P == SIZEOF_LONG_LONG)
+#define PY_VOID_P_CODE "K"
+#endif
+
 typedef struct tagPyCArgObject PyCArgObject;
 typedef struct tagCDataObject CDataObject;
 typedef PyObject *(* GETFUNC)(void *, unsigned size);
index 0da79d4c1ad700f5ad9e75d4fdae098967754fe3..85f5ee81bbe6f5e852ae452eb41cb8569dfb966a 100644 (file)
 /* ---- Generic type definitions ----------------------------------------- */
 
 #ifndef LIBFFI_ASM
+#ifndef _WIN64
 typedef unsigned long          ffi_arg;
+#else
+typedef unsigned __int64       ffi_arg;
+#endif
 typedef signed long            ffi_sarg;
 
 typedef enum ffi_abi {
index c34ae01b960674d291ba7edc9e57fca10d3a8605..4241d3cc4cb83069f70cbc29966cac3c290c0a1d 100644 (file)
@@ -72,8 +72,10 @@ StgDict_clone(StgDictObject *dst, StgDictObject *src)
                return 0;
        size = sizeof(ffi_type *) * (src->length + 1);
        dst->ffi_type_pointer.elements = PyMem_Malloc(size);
-       if (dst->ffi_type_pointer.elements == NULL)
+       if (dst->ffi_type_pointer.elements == NULL) {
+               PyErr_NoMemory();
                return -1;
+       }
        memcpy(dst->ffi_type_pointer.elements,
               src->ffi_type_pointer.elements,
               size);
@@ -355,6 +357,10 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
                total_align = align ? align : 1;
                stgdict->ffi_type_pointer.type = FFI_TYPE_STRUCT;
                stgdict->ffi_type_pointer.elements = PyMem_Malloc(sizeof(ffi_type *) * (basedict->length + len + 1));
+               if (stgdict->ffi_type_pointer.elements == NULL) {
+                       PyErr_NoMemory();
+                       return -1;
+               }
                memset(stgdict->ffi_type_pointer.elements, 0,
                       sizeof(ffi_type *) * (basedict->length + len + 1));
                memcpy(stgdict->ffi_type_pointer.elements,
@@ -369,6 +375,10 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
                total_align = 1;
                stgdict->ffi_type_pointer.type = FFI_TYPE_STRUCT;
                stgdict->ffi_type_pointer.elements = PyMem_Malloc(sizeof(ffi_type *) * (len + 1));
+               if (stgdict->ffi_type_pointer.elements == NULL) {
+                       PyErr_NoMemory();
+                       return -1;
+               }
                memset(stgdict->ffi_type_pointer.elements, 0,
                       sizeof(ffi_type *) * (len + 1));
                ffi_ofs = 0;
index 9872685fdcac0040479215ca3e39014bedc557d8..c31d8e645830df8a61480d9419fe6723fa3368b1 100644 (file)
@@ -13,7 +13,9 @@
 /* Differentiate between building the core module and building extension
  * modules.
  */
+#ifndef Py_BUILD_CORE
 #define Py_BUILD_CORE
+#endif
 #include "datetime.h"
 #undef Py_BUILD_CORE
 
index a017dab062acb3517a19d4c7d81fb3e92d5e284b..0f71ca03d0a52894cd4817ea16ebe8048028a6b3 100644 (file)
 #endif
 #endif
 
-#ifdef SUBWCREV
 #define SVNVERSION "$WCRANGE$$WCMODS?M:$"
-#endif
-
 const char *
 Py_GetBuildInfo(void)
 {
@@ -40,9 +37,9 @@ Py_GetBuildInfo(void)
 const char *
 _Py_svnversion(void)
 {
-#ifdef SVNVERSION
-       return SVNVERSION;
-#else
+       /* the following string can be modified by subwcrev.exe */
+       static const char svnversion[] = SVNVERSION;
+       if (!strstr(svnversion, "$"))
+               return svnversion; /* it was interpolated */
        return "exported";
-#endif
 }
index 1b8f51c5ac62e861164b9b069c4ff490bf37204a..eb73f07f366c28a15dfc8f47de5879dd462bc5ba 100644 (file)
@@ -2073,9 +2073,9 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static PyObject *
 count_next(countobject *lz)
 {
-        if (lz->cnt == LONG_MAX) {
+        if (lz->cnt == PY_SSIZE_T_MAX) {
                 PyErr_SetString(PyExc_OverflowError,
-                        "cannot count beyond LONG_MAX");                
+                        "cannot count beyond PY_SSIZE_T_MAX");                
                 return NULL;         
         }
        return PyInt_FromSsize_t(lz->cnt++);
index 425fa5a1181b4c59b51bbf381f8f2f14f1c9e4af..1900656ff3234ff35fe049a6d30cb825e886e34f 100644 (file)
@@ -259,7 +259,6 @@ extern int lstat(const char *, struct stat *);
 #include <process.h>
 #endif
 #include "osdefs.h"
-#define _WIN32_WINNT 0x0400      /* Needed for CryptoAPI on some systems */
 #include <windows.h>
 #include <shellapi.h>  /* for ShellExecute() */
 #define popen  _popen
@@ -6272,8 +6271,8 @@ posix_fdopen(PyObject *self, PyObject *args)
 #else
        fp = fdopen(fd, mode);
 #endif
-       PyMem_FREE(mode);
        Py_END_ALLOW_THREADS
+       PyMem_FREE(mode);
        if (fp == NULL)
                return posix_error();
        f = PyFile_FromFile(fp, "<fdopen>", orgmode, fclose);
index 1096bace5a67801b9cb4d0b9e0015f9388823f89..c15c4aded1e975cd529dd6fb504afed57594b1c3 100644 (file)
@@ -176,13 +176,6 @@ static PyMethodDef BaseException_methods[] = {
 };
 
 
-static PyMemberDef BaseException_members[] = {
-    {"message", T_OBJECT, offsetof(PyBaseExceptionObject, message), 0,
-        PyDoc_STR("exception message")},
-    {NULL}  /* Sentinel */
-};
-
-
 static PyObject *
 BaseException_get_dict(PyBaseExceptionObject *self)
 {
@@ -238,9 +231,42 @@ BaseException_set_args(PyBaseExceptionObject *self, PyObject *val)
     return 0;
 }
 
+static PyObject *
+BaseException_get_message(PyBaseExceptionObject *self)
+{
+       int ret;
+       ret = PyErr_WarnEx(PyExc_DeprecationWarning,
+                               "BaseException.message has been deprecated as "
+                                       "of Python 2.6",
+                               1);
+       if (ret == -1)
+               return NULL;
+
+       Py_INCREF(self->message);
+       return self->message;
+}
+
+static int
+BaseException_set_message(PyBaseExceptionObject *self, PyObject *val)
+{
+       int ret;
+       ret = PyErr_WarnEx(PyExc_DeprecationWarning,
+                               "BaseException.message has been deprecated as "
+                                       "of Python 2.6",
+                               1);
+       if (ret == -1)
+               return -1;
+       Py_INCREF(val);
+       Py_DECREF(self->message);
+       self->message = val;
+       return 0;
+}
+
 static PyGetSetDef BaseException_getset[] = {
     {"__dict__", (getter)BaseException_get_dict, (setter)BaseException_set_dict},
     {"args", (getter)BaseException_get_args, (setter)BaseException_set_args},
+    {"message", (getter)BaseException_get_message,
+           (setter)BaseException_set_message},
     {NULL},
 };
 
@@ -276,7 +302,7 @@ static PyTypeObject _PyExc_BaseException = {
     0,                          /* tp_iter */
     0,                          /* tp_iternext */
     BaseException_methods,      /* tp_methods */
-    BaseException_members,      /* tp_members */
+    0,                          /* tp_members */
     BaseException_getset,       /* tp_getset */
     0,                          /* tp_base */
     0,                          /* tp_dict */
index fde2380fc9367bd6b093818a55ea98b24a32ba78..b5fb9cfc55b0d669ade7576239522e77202df22a 100644 (file)
@@ -675,18 +675,7 @@ float_pow(PyObject *v, PyObject *w, PyObject *z)
 
        /* Sort out special cases here instead of relying on pow() */
        if (iw == 0) {          /* v**0 is 1, even 0**0 */
-               PyFPE_START_PROTECT("pow", return NULL)
-               if ((PyObject *)z != Py_None) {
-                       double iz;
-                       CONVERT_TO_DOUBLE(z, iz);
-                       ix = fmod(1.0, iz);
-                       if (ix != 0 && iz < 0)
-                               ix += iz;
-               }
-               else
-                       ix = 1.0;
-               PyFPE_END_PROTECT(ix)
-               return PyFloat_FromDouble(ix);
+               return PyFloat_FromDouble(1.0);
        }
        if (iv == 0.0) {  /* 0**w is error if w<0, else 1 */
                if (iw < 0.0) {
index 0aae6ac8482190fa060980a205a13535edc3bffa..7f56acff5d220e177a8f1321e6f5daa49e3da6d9 100644 (file)
@@ -214,11 +214,10 @@ PyInt_AsSsize_t(register PyObject *op)
                return -1;
        }
 
-       if (nb->nb_long != 0) {
+       if (nb->nb_long != 0)
                io = (PyIntObject*) (*nb->nb_long) (op);
-       } else {
+       else
                io = (PyIntObject*) (*nb->nb_int) (op);
-       }
        if (io == NULL)
                return -1;
        if (!PyInt_Check(io)) {
index f7431961b14310be6b99f73e8a7935ddb923ce10..f6ae69bda3853df46f9225534932fb3737243e04 100644 (file)
@@ -1360,10 +1360,12 @@ extra_ivars(PyTypeObject *type, PyTypeObject *base)
                        type->tp_itemsize != base->tp_itemsize;
        }
        if (type->tp_weaklistoffset && base->tp_weaklistoffset == 0 &&
-           type->tp_weaklistoffset + sizeof(PyObject *) == t_size)
+           type->tp_weaklistoffset + sizeof(PyObject *) == t_size &&
+           type->tp_flags & Py_TPFLAGS_HEAPTYPE)
                t_size -= sizeof(PyObject *);
        if (type->tp_dictoffset && base->tp_dictoffset == 0 &&
-           type->tp_dictoffset + sizeof(PyObject *) == t_size)
+           type->tp_dictoffset + sizeof(PyObject *) == t_size &&
+           type->tp_flags & Py_TPFLAGS_HEAPTYPE)
                t_size -= sizeof(PyObject *);
 
        return t_size != b_size;
@@ -1389,12 +1391,73 @@ static int object_init(PyObject *, PyObject *, PyObject *);
 static int update_slot(PyTypeObject *, PyObject *);
 static void fixup_slot_dispatchers(PyTypeObject *);
 
+/*
+ * Helpers for  __dict__ descriptor.  We don't want to expose the dicts
+ * inherited from various builtin types.  The builtin base usually provides
+ * its own __dict__ descriptor, so we use that when we can.
+ */
+static PyTypeObject *
+get_builtin_base_with_dict(PyTypeObject *type)
+{
+       while (type->tp_base != NULL) {
+               if (type->tp_dictoffset != 0 &&
+                   !(type->tp_flags & Py_TPFLAGS_HEAPTYPE))
+                       return type;
+               type = type->tp_base;
+       }
+       return NULL;
+}
+
+static PyObject *
+get_dict_descriptor(PyTypeObject *type)
+{
+       static PyObject *dict_str;
+       PyObject *descr;
+
+       if (dict_str == NULL) {
+               dict_str = PyString_InternFromString("__dict__");
+               if (dict_str == NULL)
+                       return NULL;
+       }
+       descr = _PyType_Lookup(type, dict_str);
+       if (descr == NULL || !PyDescr_IsData(descr))
+               return NULL;
+
+       return descr;
+}
+
+static void
+raise_dict_descr_error(PyObject *obj)
+{
+       PyErr_Format(PyExc_TypeError,
+                    "this __dict__ descriptor does not support "
+                    "'%.200s' objects", obj->ob_type->tp_name);
+}
+
 static PyObject *
 subtype_dict(PyObject *obj, void *context)
 {
-       PyObject **dictptr = _PyObject_GetDictPtr(obj);
+       PyObject **dictptr;
        PyObject *dict;
+       PyTypeObject *base;
 
+       base = get_builtin_base_with_dict(obj->ob_type);
+       if (base != NULL) {
+               descrgetfunc func;
+               PyObject *descr = get_dict_descriptor(base);
+               if (descr == NULL) {
+                       raise_dict_descr_error(obj);
+                       return NULL;
+               }
+               func = descr->ob_type->tp_descr_get;
+               if (func == NULL) {
+                       raise_dict_descr_error(obj);
+                       return NULL;
+               }
+               return func(descr, obj, (PyObject *)(obj->ob_type));
+       }
+
+       dictptr = _PyObject_GetDictPtr(obj);
        if (dictptr == NULL) {
                PyErr_SetString(PyExc_AttributeError,
                                "This object has no __dict__");
@@ -1410,9 +1473,27 @@ subtype_dict(PyObject *obj, void *context)
 static int
 subtype_setdict(PyObject *obj, PyObject *value, void *context)
 {
-       PyObject **dictptr = _PyObject_GetDictPtr(obj);
+       PyObject **dictptr;
        PyObject *dict;
+       PyTypeObject *base;
+
+       base = get_builtin_base_with_dict(obj->ob_type);
+       if (base != NULL) {
+               descrsetfunc func;
+               PyObject *descr = get_dict_descriptor(base);
+               if (descr == NULL) {
+                       raise_dict_descr_error(obj);
+                       return -1;
+               }
+               func = descr->ob_type->tp_descr_set;
+               if (func == NULL) {
+                       raise_dict_descr_error(obj);
+                       return -1;
+               }
+               return func(descr, obj, value);
+       }
 
+       dictptr = _PyObject_GetDictPtr(obj);
        if (dictptr == NULL) {
                PyErr_SetString(PyExc_AttributeError,
                                "This object has no __dict__");
index e8cb1d2bc090151bd7f171fac258b974287a0be6..b9978ef72e62c31dd76e13fa2e9281b945b78e06 100644 (file)
@@ -6,21 +6,21 @@
 #include "Python.h"
 
 extern void initarray(void);
-#ifndef MS_WIN64
+#ifndef MS_WINI64
 extern void initaudioop(void);
 #endif
 extern void initbinascii(void);
 extern void initcmath(void);
 extern void initerrno(void);
 extern void initgc(void);
-#ifndef MS_WIN64
+#ifndef MS_WINI64
 extern void initimageop(void);
 #endif
 extern void initmath(void);
 extern void init_md5(void);
 extern void initnt(void);
 extern void initoperator(void);
-#ifndef MS_WIN64
+#ifndef MS_WINI64
 extern void initrgbimg(void);
 #endif
 extern void initsignal(void);
@@ -82,7 +82,7 @@ struct _inittab _PyImport_Inittab[] = {
        {"_ast", init_ast},
        {"atexit", initatexit},
 #ifdef MS_WINDOWS
-#ifndef MS_WIN64
+#ifndef MS_WINI64
         {"audioop", initaudioop},
 #endif
 #endif
@@ -90,14 +90,14 @@ struct _inittab _PyImport_Inittab[] = {
         {"cmath", initcmath},
         {"errno", initerrno},
         {"gc", initgc},
-#ifndef MS_WIN64
+#ifndef MS_WINI64
         {"imageop", initimageop},
 #endif
         {"math", initmath},
         {"_md5", init_md5},
         {"nt", initnt}, /* Use the NT os functions, not posix */
         {"operator", initoperator},
-#ifndef MS_WIN64
+#ifndef MS_WINI64
         {"rgbimg", initrgbimg},
 #endif
         {"signal", initsignal},
index 41c026ff9e7973b79affb6c66b6b0c53d25e4885..b9f9b88fe3a073328c7202270e25ad96474bc277 100644 (file)
@@ -27,7 +27,12 @@ int main(int argc, char **argv)
                PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL);
        printf("#define MS_DLL_ID \"%d.%d\"\n",
               PY_MAJOR_VERSION, PY_MINOR_VERSION);
+       printf("#ifndef _DEBUG\n");
        printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n",
               PY_MAJOR_VERSION, PY_MINOR_VERSION);
+       printf("#else\n");
+       printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n",
+              PY_MAJOR_VERSION, PY_MINOR_VERSION);
+       printf("#endif\n");
        return 0;
 }
index c432fa89c0360965f2b61c7b077f387bfed328ad..cecc5756634205cf5b8466fa66d4d52eb3ed72d4 100644 (file)
@@ -128,6 +128,8 @@ MS_CORE_DLL.
    defined on Win32 *and* Win64. Win32 only code must therefore be
    guarded as follows:
        #if defined(MS_WIN32) && !defined(MS_WIN64)
+   Some modules are disabled on Itanium processors, therefore we
+   have MS_WINI64 set for those targets, otherwise MS_WINX64
 */
 #ifdef _WIN64
 #define MS_WIN64
@@ -135,17 +137,28 @@ MS_CORE_DLL.
 
 /* set the COMPILER */
 #ifdef MS_WIN64
-#ifdef _M_IX86
-#define COMPILER _Py_PASTE_VERSION("64 bit (Intel)")
-#elif defined(_M_IA64)
+#if defined(_M_IA64)
 #define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
-#elif defined(_M_AMD64)
+#define MS_WINI64
+#elif defined(_M_X64)
 #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
+#define MS_WINX64
 #else
 #define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
 #endif
 #endif /* MS_WIN64 */
 
+/* set the version macros for the windows headers */
+#ifdef MS_WINX64
+/* 64 bit only runs on XP or greater */
+#define _WIN32_WINNT 0x0501
+#define WINVER 0x0501
+#else
+/* NT 4.0 or greater required otherwise */
+#define _WIN32_WINNT 0x0400
+#define WINVER 0x0400
+#endif
+
 /* _W64 is not defined for VC6 or eVC4 */
 #ifndef _W64
 #define _W64
diff --git a/PCbuild8/PGInstrument.vsprops b/PCbuild8/PGInstrument.vsprops
new file mode 100644 (file)
index 0000000..58518b7
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="PGInstrument"\r
+       OutputDirectory="$(SolutionDir)$(PlatformName)PGO"\r
+       IntermediateDirectory="$(PlatformName)PGO"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               LinkTimeCodeGeneration="2"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/PGUpdate.vsprops b/PCbuild8/PGUpdate.vsprops
new file mode 100644 (file)
index 0000000..0501126
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="PGUpdate"\r
+       InheritedPropertySheets=".\PGInstrument.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               LinkTimeCodeGeneration="4"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/Uninstal.wse b/PCbuild8/Uninstal.wse
deleted file mode 100644 (file)
index 306f3bc..0000000
+++ /dev/null
@@ -1,514 +0,0 @@
-Document Type: WSE\r
-item: Global\r
-  Version=8.14\r
-  Flags=00000100\r
-  Split=1420\r
-  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
-  Copy Default=1\r
-  Japanese Font Name=MS Gothic\r
-  Japanese Font Size=10\r
-  Start Gradient=0 0 255\r
-  End Gradient=0 0 0\r
-  Windows Flags=00000000000000000000101000001000\r
-  Message Font=MS Sans Serif\r
-  Font Size=8\r
-  Disk Label=GLBS\r
-  Disk Filename=INSTALL\r
-  Patch Flags=0000000000000001\r
-  Patch Threshold=200\r
-  Patch Memory=4096\r
-  Per-User Version ID=1\r
-  Crystal Format=10111100101100000010001001001001\r
-  Step View=&Properties\r
-end\r
-item: Remark\r
-  Text=Note from Tim:  This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write\r
-end\r
-item: Remark\r
-  Text=uninstall info under HKCU instead of HKLM if our DOADMIN var is false.\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=     Install Support for uninstalling the application.\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=UNINSTALL_PATH\r
-  Value=%_LOGFILE_PATH_%\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=UNINSTALL_PATH\r
-  Value=%UNINSTALL_PATH%\UNWISE.EXE\r
-end\r
-item: Compiler Variable If\r
-  Variable=_EXE_OS_TYPE_\r
-  Value=WIN32\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\UNWISE32.EXE\r
-  Destination=%UNINSTALL_PATH%\r
-  Flags=0000000000000010\r
-end\r
-item: Compiler Variable Else\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\UNWISE.EXE\r
-  Destination=%UNINSTALL_PATH%\r
-  Flags=0000000000000010\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=     Install Support for multiple languages\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=UNINSTALL_LANG\r
-  Value=%UNINSTALL_PATH%\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=UNINSTALL_LANG\r
-  Value=%UNINSTALL_LANG%\UNWISE.INI\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=C\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.FRA\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_C_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.FRA\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=D\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.FRA\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_D_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.FRA\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=E\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.DEU\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_E_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.DEU\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=F\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.PTG\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_F_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.PTG\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=G\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.ESP\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_G_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.ESP\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=H\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.ESP\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_H_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.ESP\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=I\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.ITA\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_I_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.ITA\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=J\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.DAN\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_J_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.DAN\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=K\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.FIN\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_K_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.FIN\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=L\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.ISL\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_L_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.ISL\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=M\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.NLD\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_M_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.NLD\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=N\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.NOR\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_N_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.NOR\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=O\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.SVE\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_O_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.SVE\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable If\r
-  Variable=_LANG_LIST_\r
-  Value=P\r
-  Flags=00000010\r
-end\r
-item: Compiler Variable If\r
-  Value=%_WISE_%\LANGUAGE\UNWISE.JPN\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=LANG\r
-  Value=%_LANG_P_NAME_%\r
-end\r
-item: Install File\r
-  Source=%_WISE_%\LANGUAGE\UNWISE.JPN\r
-  Destination=%UNINSTALL_LANG%\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Compiler Variable End\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=     Install the add/remove or uninstall icon\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=UNINSTALL_PATH\r
-  Value=%UNINSTALL_PATH%\r
-  Flags=00010100\r
-end\r
-item: Set Variable\r
-  Variable=INST_LOG_PATH\r
-  Value=%_LOGFILE_PATH_%\r
-  Flags=00010100\r
-end\r
-item: Check Configuration\r
-  Flags=10111011\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Remark\r
-  Text=Write uninstall info under HKLM.  This if/else/end block added by Tim.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%APPTITLE%\r
-  Value Name=DisplayName\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%UNINSTALL_PATH% %INST_LOG_PATH%\r
-  New Value=\r
-  Value Name=UninstallString\r
-  Root=2\r
-end\r
-item: Else Statement\r
-end\r
-item: Remark\r
-  Text=The same, but write under HKCU instead.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%APPTITLE%\r
-  Value Name=DisplayName\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%UNINSTALL_PATH% %INST_LOG_PATH%\r
-  New Value=\r
-  Value Name=UninstallString\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: Else Statement\r
-end\r
-item: Add ProgMan Icon\r
-  Group=%GROUP%\r
-  Icon Name=Uninstall %APPTITLE%\r
-  Command Line=%UNINSTALL_PATH% %INST_LOG_PATH%\r
-end\r
-item: End Block\r
-end\r
-item: Check Configuration\r
-  Flags=11110010\r
-end\r
-item: If/While Statement\r
-  Variable=DOBRAND\r
-  Value=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=2\r
-  item: Key\r
-    Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-    New Value=%COMPANY%\r
-    Value Name=RegCompany\r
-    Root=2\r
-  end\r
-  item: Key\r
-    Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-    New Value=%NAME%\r
-    Value Name=RegOwner\r
-    Root=2\r
-  end\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
diff --git a/PCbuild8/_bsddb.vcproj b/PCbuild8/_bsddb.vcproj
deleted file mode 100644 (file)
index 22e362a..0000000
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="_bsddb"
-       ProjectGUID="{E1DBB220-D64B-423D-A545-539A55AA7FE2}"
-       SccProjectName="_bsddb"
-       SccLocalPath=".."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\_bsddb"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
-                               OutputFile="./_bsddb_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_bsddb_d.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=".\./_bsddb_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\_bsddb"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
-                               OutputFile="./_bsddb.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_bsddb.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=".\./_bsddb.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\_bsddb"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
-                               OutputFile="./_bsddb.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_bsddb.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=".\./_bsddb.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\_bsddb"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib"
-                               OutputFile="./_bsddb.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_bsddb.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=".\./_bsddb.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_bsddb.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_bsddb/_bsddb.vcproj b/PCbuild8/_bsddb/_bsddb.vcproj
new file mode 100644 (file)
index 0000000..9416b43
--- /dev/null
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_bsddb"\r
+       ProjectGUID="{E644B843-F7CA-4888-AA6D-653C77592856}"\r
+       RootNamespace="_bsddb"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_bsddb.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_ctypes.vcproj b/PCbuild8/_ctypes.vcproj
deleted file mode 100644 (file)
index 80b9c64..0000000
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_ctypes"
-       ProjectGUID="{F22F40F4-D318-40DC-96B3-88DC81CE0894}"
-       RootNamespace="_ctypes"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               MinimalRebuild="false"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-                               OutputFile="$(OutDir)\_ctypes_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               BaseAddress="0x1D1A0000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               MinimalRebuild="false"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-                               OutputFile="$(OutDir)\_ctypes_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               BaseAddress="0x1D1A0000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="0"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-                               OutputFile="$(OutDir)\_ctypes.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               OptimizeReferences="0"
-                               EnableCOMDATFolding="0"
-                               BaseAddress="0x1D1A0000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="0"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
-                               OutputFile="$(OutDir)\_ctypes.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               OptimizeReferences="0"
-                               EnableCOMDATFolding="0"
-                               BaseAddress="0x1D1A0000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_ctypes\_ctypes.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\callbacks.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\callproc.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\cfield.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\malloc_closure.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\stgdict.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_ctypes/_ctypes.vcproj b/PCbuild8/_ctypes/_ctypes.vcproj
new file mode 100644 (file)
index 0000000..85ca24b
--- /dev/null
@@ -0,0 +1,859 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_ctypes"\r
+       ProjectGUID="{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}"\r
+       RootNamespace="_ctypes"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+               <ToolFile\r
+                       RelativePath=".\masm64.rules"\r
+               />\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="MASM64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\_ctypes.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\callbacks.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\callproc.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\cfield.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               DisableSpecificWarnings="4018"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\malloc_closure.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\stgdict.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="MASM64"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\ctypes.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_ctypes/_ctypes.vsprops b/PCbuild8/_ctypes/_ctypes.vsprops
new file mode 100644 (file)
index 0000000..28155bd
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_ctypes"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/_ctypes/masm64.rules b/PCbuild8/_ctypes/masm64.rules
new file mode 100644 (file)
index 0000000..d25d86c
--- /dev/null
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<VisualStudioToolFile\r
+       Name="Microsoft Macro Assembler 64 bit"\r
+       Version="8.00"\r
+       >\r
+       <Rules>\r
+               <CustomBuildRule\r
+                       Name="MASM64"\r
+                       DisplayName="Microsoft Macro Assembler 64 bit"\r
+                       CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"\r
+                       Outputs="[$ObjectFileName]"\r
+                       FileExtensions="*.asm"\r
+                       ExecutionDescription="Assembling (x64) ..."\r
+                       >\r
+                       <Properties>\r
+                               <BooleanProperty\r
+                                       Name="NoLogo"\r
+                                       DisplayName="Suppress Startup Banner"\r
+                                       Description="Suppress the display of the startup banner and information messages.     (/nologo)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/nologo"\r
+                                       DefaultValue="true"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="ObjectFileName"\r
+                                       DisplayName="Object File Name"\r
+                                       PropertyPageName="Object File"\r
+                                       Description="Specifies the name of the output object file.     (/Fo:[file])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Fo&quot;[value]&quot;"\r
+                                       DefaultValue="$(IntDir)\$(InputName).obj"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="PreserveIdentifierCase"\r
+                                       DisplayName="Preserve Identifier Case"\r
+                                       Description="Specifies preservation of case of user identifiers.     (/Cp, /Cx)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       DefaultValue="0"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       DisplayName="Default"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/Cp"\r
+                                                       DisplayName="Preserves Identifier Case (/Cp)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/Cx"\r
+                                                       DisplayName="Preserves case in public and extern symbols. (/Cx)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <StringProperty\r
+                                       Name="PreprocessorDefinitions"\r
+                                       DisplayName="Preprocessor Definitions"\r
+                                       Description="Defines a text macro with the given name.     (/D[symbol])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/D&quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="GeneratePreprocessedSourceListing"\r
+                                       DisplayName="Generate Preprocessed Source Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Generates a preprocessed source listing to the Output Window.     (/EP)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/EP"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="AssembledCodeListingFile"\r
+                                       DisplayName="Assembled Code Listing File"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Generates an assembled code listing file.     (/Fl[file])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Fl&quot;[value]&quot;"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingLineWidth"\r
+                                       DisplayName="Source Listing Line Width"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width.     (/Sl [width])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sl [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingPageLength"\r
+                                       DisplayName="Source Listing Page Length"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length.     (/Sp [length])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sp [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="IncludePaths"\r
+                                       DisplayName="Include Paths"\r
+                                       Description="Sets path for include file. A maximum of 10 /I options is allowed.     (/I [path])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/I &quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="ListAllAvailableInformation"\r
+                                       DisplayName="List All Available Information"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on listing of all available information.     (/Sa)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sa"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="AddFirstPassListing"\r
+                                       DisplayName="Add First Pass Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Adds first-pass listing to listing file.     (/Sf)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sf"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="EnableAssemblyGeneratedCodeListing"\r
+                                       DisplayName="Enable Assembly Generated Code Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on listing of assembly-generated code.     (/Sg)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sg"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="DisableSymbolTable"\r
+                                       DisplayName="Disable Symbol Table"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns off symbol table when producing a listing.     (/Sn)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sn"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingSubTitle"\r
+                                       DisplayName="Source Listing Subtitle"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Specifies subtitle text for source listing. Same as SUBTITLE text.     (/Ss [subtitle])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Ss [value]"\r
+                               />\r
+                               <StringProperty\r
+                                       Name="SourceListingTitle"\r
+                                       DisplayName="Source Listing Title"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Specifies title for source listing. Same as TITLE text.     (/St [title])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/St [value]"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="EnableFalseConditionalsInListing"\r
+                                       DisplayName="Enable False Conditionals In Listing"\r
+                                       PropertyPageName="Listing File"\r
+                                       Description="Turns on false conditionals in listing.     (/Sx)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Sx"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="WarningLevel"\r
+                                       DisplayName="Warning Level"\r
+                                       Description="Sets the warning level, where level = 0, 1, 2, or 3.    (/W0, /W1, /W2, /W3)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       DefaultValue="3"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="/W0"\r
+                                                       DisplayName="Warning Level 0 (/W0)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/W1"\r
+                                                       DisplayName="Warning Level 1 (/W1)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/W2"\r
+                                                       DisplayName="Warning Level 2 (/W2)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/W3"\r
+                                                       DisplayName="Warning Level 3 (/W3)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <BooleanProperty\r
+                                       Name="TreatWarningsAsErrors"\r
+                                       DisplayName="Treat Warnings As Errors"\r
+                                       Description="Returns an error code if warnings are generated.     (/WX)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/WX"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="MakeAllSymbolsPublic"\r
+                                       DisplayName="Make All Symbols Public"\r
+                                       PropertyPageName="Object File"\r
+                                       Description="Makes all symbols public.     (/Zf)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zf"\r
+                               />\r
+                               <BooleanProperty\r
+                                       Name="GenerateDebugInformation"\r
+                                       DisplayName="Generate Debug Information"\r
+                                       Description="Generates Debug Information.     (/Zi)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zi"\r
+                                       DefaultValue="true"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="PackAlignmentBoundary"\r
+                                       DisplayName="Pack Alignment Boundary"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16.     (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       DisplayName="Default"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/Zp1"\r
+                                                       DisplayName="One Byte Boundary (/Zp1)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/Zp2"\r
+                                                       DisplayName="Two Byte Boundary (/Zp2)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/Zp4"\r
+                                                       DisplayName="Four Byte Boundary (/Zp4)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="4"\r
+                                                       Switch="/Zp8"\r
+                                                       DisplayName="Eight Byte Boundary (/Zp8)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="5"\r
+                                                       Switch="/Zp16"\r
+                                                       DisplayName="Sixteen Byte Boundary (/Zp16)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <BooleanProperty\r
+                                       Name="PerformSyntaxCheckOnly"\r
+                                       DisplayName="Perform Syntax Check Only"\r
+                                       Description="Performs a syntax check only.     (/Zs)"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/Zs"\r
+                               />\r
+                               <EnumProperty\r
+                                       Name="ErrorReporting"\r
+                                       DisplayName="Error Reporting"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Reports internal assembler errors to Microsoft.     (/errorReport:[method])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="/errorReport:prompt"\r
+                                                       DisplayName="Prompt to send report immediately (/errorReport:prompt)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="/errorReport:queue"\r
+                                                       DisplayName="Prompt to send report at the next logon (/errorReport:queue)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="2"\r
+                                                       Switch="/errorReport:send"\r
+                                                       DisplayName="Automatically send report (/errorReport:send)"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="3"\r
+                                                       Switch="/errorReport:none"\r
+                                                       DisplayName="Do not send report (/errorReport:none)"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <StringProperty\r
+                                       Name="BrowseFile"\r
+                                       DisplayName="Generate Browse Information File"\r
+                                       PropertyPageName="Advanced"\r
+                                       Description="Specifies whether to generate browse information file and its optional name or location of the browse information file.     (/FR[name])"\r
+                                       HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"\r
+                                       Switch="/FR&quot;[value]&quot;"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+                       </Properties>\r
+               </CustomBuildRule>\r
+       </Rules>\r
+</VisualStudioToolFile>\r
diff --git a/PCbuild8/_ctypes_test.vcproj b/PCbuild8/_ctypes_test.vcproj
deleted file mode 100644 (file)
index f252901..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_ctypes_test"
-       ProjectGUID="{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}"
-       RootNamespace="_ctypes_test"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               MinimalRebuild="false"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\_ctypes_test_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               MinimalRebuild="false"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/_ctypes_test_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="0"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\_ctypes_test.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               OptimizeReferences="0"
-                               EnableCOMDATFolding="0"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="0"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\_ctypes_test.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="0"
-                               OptimizeReferences="0"
-                               EnableCOMDATFolding="0"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_ctypes\_ctypes_test.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_ctypes_test/_ctypes_test.vcproj b/PCbuild8/_ctypes_test/_ctypes_test.vcproj
new file mode 100644 (file)
index 0000000..27f8e53
--- /dev/null
@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_ctypes_test"\r
+       ProjectGUID="{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"\r
+       RootNamespace="_ctypes_test"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_TEST_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_elementtree.vcproj b/PCbuild8/_elementtree.vcproj
deleted file mode 100644 (file)
index d88c85f..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_elementtree"
-       ProjectGUID="{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}"
-       RootNamespace="_elementtree"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\_elementtree_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\_elementtree_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\_elementtree.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\_elementtree.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_elementtree.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmlparse.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmlrole.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmltok.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_elementtree/_elementtree.vcproj b/PCbuild8/_elementtree/_elementtree.vcproj
new file mode 100644 (file)
index 0000000..d0fe7fe
--- /dev/null
@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_elementtree"\r
+       ProjectGUID="{CB025148-F0A1-4B32-A669-19EE0534136D}"\r
+       RootNamespace="_elementtree"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_elementtree.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlparse.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlrole.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmltok.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\expat.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlrole.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmltok.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_msi.vcproj b/PCbuild8/_msi.vcproj
deleted file mode 100644 (file)
index ac9e079..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_msi"
-       ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}"
-       RootNamespace="_msi"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
-                               OutputFile="$(OutDir)\_msi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
-                               OutputFile="$(OutDir)\_msi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
-                               OutputFile="$(OutDir)\_msi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
-                               OutputFile="$(OutDir)\_msi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\_msi.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_msi/_msi.vcproj b/PCbuild8/_msi/_msi.vcproj
new file mode 100644 (file)
index 0000000..dc581d1
--- /dev/null
@@ -0,0 +1,644 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_msi"\r
+       ProjectGUID="{A25ADCC5-8DE1-4F88-B842-C287923280B1}"\r
+       RootNamespace="_msi"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_MSI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Rpcrt4.lib msi.lib fci.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\_msi.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_socket.vcproj b/PCbuild8/_socket.vcproj
deleted file mode 100644 (file)
index 95c3941..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="_socket"
-       ProjectGUID="{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}"
-       SccProjectName="_socket"
-       SccLocalPath=".."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\_socket"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               OutputFile="./_socket_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_socket_d.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e1D0000"
-                               ImportLibrary=".\./_socket_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\_socket"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
-                               OutputFile="./_socket.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_socket.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e1D0000"
-                               ImportLibrary=".\./_socket.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\_socket"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="ws2_32.lib"
-                               OutputFile="./_socket.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_socket.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e1D0000"
-                               ImportLibrary=".\./_socket.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\_socket"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="ws2_32.lib"
-                               OutputFile="./_socket.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_socket.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e1D0000"
-                               ImportLibrary=".\./_socket.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\socketmodule.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_socket/_socket.vcproj b/PCbuild8/_socket/_socket.vcproj
new file mode 100644 (file)
index 0000000..28e80d6
--- /dev/null
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_socket"\r
+       ProjectGUID="{AE31A248-5367-4EB2-A511-8722BC351CB4}"\r
+       RootNamespace="_socket"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\socketmodule.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\socketmodule.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_sqlite3.vcproj b/PCbuild8/_sqlite3.vcproj
deleted file mode 100644 (file)
index 3ede48f..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_sqlite3"
-       ProjectGUID="{2FF0A312-22F9-4C34-B070-842916DE27A9}"
-       RootNamespace="_sqlite3"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
-                               OutputFile="$(OutDir)\_sqlite3_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
-                               OutputFile="$(OutDir)\_sqlite3_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
-                               OutputFile="$(OutDir)\_sqlite3.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
-                               OutputFile="$(OutDir)\_sqlite3.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e180000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_sqlite\cache.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\connection.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\cursor.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\microprotocols.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\module.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\prepare_protocol.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\row.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\statement.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sqlite\util.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_sqlite3/_sqlite3.vcproj b/PCbuild8/_sqlite3/_sqlite3.vcproj
new file mode 100644 (file)
index 0000000..f81c5a1
--- /dev/null
@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_sqlite3"\r
+       ProjectGUID="{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"\r
+       RootNamespace="_sqlite3"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SQLITE3_EXPORTS;MODULE_NAME=\&quot;sqlite3\&quot;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\cache.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\connection.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\cursor.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\microprotocols.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\module.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\row.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\statement.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\util.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\cache.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\connection.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\cursor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\microprotocols.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\module.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\row.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\statement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sqlite\util.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_ssl.mak b/PCbuild8/_ssl.mak
deleted file mode 100644 (file)
index 9de425f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-\r
-!IFDEF DEBUG\r
-MODULE=_ssl_d.pyd\r
-TEMP_DIR=x86-temp-debug/_ssl\r
-CFLAGS=/Od /Zi /MDd /LDd /DDEBUG /D_DEBUG /DWIN32\r
-SSL_LIB_DIR=$(SSL_DIR)/out32.dbg\r
-!ELSE\r
-MODULE=_ssl.pyd\r
-TEMP_DIR=x86-temp-release/_ssl\r
-CFLAGS=/Ox /MD /LD /DWIN32\r
-SSL_LIB_DIR=$(SSL_DIR)/out32\r
-!ENDIF\r
-\r
-INCLUDES=-I ../Include -I ../PC -I $(SSL_DIR)/inc32\r
-LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib\r
-\r
-SOURCE=../Modules/_ssl.c $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32.lib\r
-\r
-$(MODULE): $(SOURCE) ../PC/*.h ../Include/*.h\r
-    @if not exist "$(TEMP_DIR)/." mkdir "$(TEMP_DIR)"\r
-    cl /nologo $(SOURCE) $(CFLAGS) /Fo$(TEMP_DIR)\$*.obj $(INCLUDES) /link /out:$(MODULE) $(LIBS)\r
diff --git a/PCbuild8/_ssl.vcproj b/PCbuild8/_ssl.vcproj
deleted file mode 100644 (file)
index bd1299d..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_ssl"
-       ProjectGUID="{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}"
-       RootNamespace="_ssl"
-       Keyword="MakeFileProj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\_ssl"
-                       ConfigurationType="0"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="python build_ssl.py"
-                               ReBuildCommandLine="python build_ssl.py -a"
-                               CleanCommandLine="echo Nothing to do"
-                               Output="_ssl.pyd"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\_ssl"
-                       ConfigurationType="0"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="python_d -u build_ssl.py -d"
-                               ReBuildCommandLine="python_d -u build_ssl.py -d -a"
-                               CleanCommandLine="echo Nothing to do"
-                               Output="_ssl_d.pyd"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\_ssl"
-                       ConfigurationType="0"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="python build_ssl.py"
-                               ReBuildCommandLine="python build_ssl.py -a"
-                               CleanCommandLine=""
-                               Output="_ssl.pyd"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\_ssl"
-                       ConfigurationType="0"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCNMakeTool"
-                               BuildCommandLine="python build_ssl.py"
-                               ReBuildCommandLine="python build_ssl.py -a"
-                               CleanCommandLine=""
-                               Output="_ssl.pyd"
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_ssl.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_testcapi.vcproj b/PCbuild8/_testcapi.vcproj
deleted file mode 100644 (file)
index 4b4524a..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="_testcapi"
-       ProjectGUID="{59CBF474-9E06-4C50-9142-C44A118BB447}"
-       SccProjectName="_testcapi"
-       SccLocalPath=".."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\_testcapi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="./_testcapi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               ProgramDatabaseFile=".\./_testcapi.pdb"
-                               BaseAddress="0x1e1F0000"
-                               ImportLibrary=".\./_testcapi.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\_testcapi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="./_testcapi_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_testcapi_d.pdb"
-                               BaseAddress="0x1e1F0000"
-                               ImportLibrary=".\./_testcapi_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\_testcapi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               OutputFile="./_testcapi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               ProgramDatabaseFile=".\./_testcapi.pdb"
-                               BaseAddress="0x1e1F0000"
-                               ImportLibrary=".\./_testcapi.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\_testcapi"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               OutputFile="./_testcapi.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               ProgramDatabaseFile=".\./_testcapi.pdb"
-                               BaseAddress="0x1e1F0000"
-                               ImportLibrary=".\./_testcapi.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_testcapimodule.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_testcapi/_testcapi.vcproj b/PCbuild8/_testcapi/_testcapi.vcproj
new file mode 100644 (file)
index 0000000..61d94ab
--- /dev/null
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_testcapi"\r
+       ProjectGUID="{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"\r
+       RootNamespace="_testcapi"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TESTCAPI_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_testcapimodule.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/_tkinter.vcproj b/PCbuild8/_tkinter.vcproj
deleted file mode 100644 (file)
index 7233375..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="_tkinter"
-       ProjectGUID="{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}"
-       SccProjectName="_tkinter"
-       SccLocalPath="..\.."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\_tkinter"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
-                               OutputFile="./_tkinter.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_tkinter.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e190000"
-                               ImportLibrary=".\./_tkinter.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\_tkinter"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
-                               OutputFile="./_tkinter_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_tkinter_d.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e190000"
-                               ImportLibrary=".\./_tkinter_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\_tkinter"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
-                               OutputFile="./_tkinter.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_tkinter.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e190000"
-                               ImportLibrary=".\./_tkinter.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\_tkinter"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
-                               OutputFile="./_tkinter.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./_tkinter.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1e190000"
-                               ImportLibrary=".\./_tkinter.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\_tkinter.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\tkappinit.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/_tkinter/_tkinter.vcproj b/PCbuild8/_tkinter/_tkinter.vcproj
new file mode 100644 (file)
index 0000000..ba0887b
--- /dev/null
@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_tkinter"\r
+       ProjectGUID="{3A1515AF-3694-4222-91F2-9837BDF60F9A}"\r
+       RootNamespace="_tkinter"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_tkinter.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\tkappinit.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/build.bat b/PCbuild8/build.bat
new file mode 100644 (file)
index 0000000..8c61a70
--- /dev/null
@@ -0,0 +1,17 @@
+@echo off\r
+rem A batch program to build or rebuild a particular configuration.\r
+rem just for convenience.\r
+\r
+setlocal\r
+set platf=Win32\r
+set conf=Release\r
+set build=/build\r
+\r
+:CheckOpts\r
+if "%1"=="-c" (set conf=%2)     & shift & shift & goto CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-r" (set build=/rebuild)    & shift & goto CheckOpts\r
+\r
+set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"\r
+echo %cmd%\r
+%cmd%
\ No newline at end of file
diff --git a/PCbuild8/build_pgo.bat b/PCbuild8/build_pgo.bat
new file mode 100644 (file)
index 0000000..ec85323
--- /dev/null
@@ -0,0 +1,39 @@
+@echo off\r
+rem A batch program to build PGO (Profile guided optimization) by first\r
+rem building instrumented binaries, then running the testsuite, and\r
+rem finally building the optimized code.\r
+rem Note, after the first instrumented run, one can just keep on\r
+rem building the PGUpdate configuration while developing.\r
+\r
+setlocal\r
+set platf=Win32\r
+\r
+rem use the performance testsuite.  This is quick and simple\r
+set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc\r
+set path1=..\tools\pybench\r
+\r
+rem or the whole testsuite for more thorough testing\r
+set job2=..\lib\test\regrtest.py\r
+set path2=..\lib\r
+\r
+set job=%job1%\r
+set clrpath=%path1%\r
+\r
+:CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts\r
+\r
+set folder=%platf%PGO\r
+\r
+\r
+@echo on\r
+rem build the instrumented version\r
+call build -r -p %platf% -c PGInstrument\r
+\r
+rem remove .pyc files, .pgc files and execute the job\r
+%folder%\python.exe rmpyc.py %clrpath%\r
+del %folder%\*.pgc\r
+%folder%\python.exe %job%\r
+\r
+rem finally build the optimized version\r
+call build -r -p %platf% -c PGUpdate\r
diff --git a/PCbuild8/build_ssl.py b/PCbuild8/build_ssl.py
deleted file mode 100644 (file)
index 8f485a2..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-# Script for building the _ssl module for Windows.
-# Uses Perl to setup the OpenSSL environment correctly
-# and build OpenSSL, then invokes a simple nmake session
-# for _ssl.pyd itself.
-
-# 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 Python extension
-# without intervention.
-
-import os, sys, re
-
-# 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"
-    print "The Python SSL module was not built"
-    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:
-            s = os.path.abspath(s)
-            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,)
-    return best_name
-
-def main():
-    debug = "-d" in sys.argv
-    build_all = "-a" in 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:
-        sys.exit(1)
-
-    print "Found a working perl at '%s'" % (perl,)
-    # 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)
-        # If the ssl makefiles do not exist, we invoke Perl to generate them.
-        if not os.path.isfile(os.path.join(ssl_dir, "32.mak")) or \
-           not os.path.isfile(os.path.join(ssl_dir, "d32.mak")):
-            print "Creating the makefiles..."
-            # Put our working Perl at the front of our path
-            os.environ["PATH"] = os.path.split(perl)[0] + \
-                                          os.pathsep + \
-                                          os.environ["PATH"]
-            # ms\32all.bat will reconfigure OpenSSL and then try to build
-            # all outputs (debug/nondebug/dll/lib).  So we filter the file
-            # to exclude any "nmake" commands and then execute.
-            tempname = "ms\\32all_py.bat"
-
-            in_bat  = open("ms\\32all.bat")
-            temp_bat = open(tempname,"w")
-            while 1:
-                cmd = in_bat.readline()
-                print 'cmd', repr(cmd)
-                if not cmd: break
-                if cmd.strip()[:5].lower() == "nmake":
-                    continue
-                temp_bat.write(cmd)
-            in_bat.close()
-            temp_bat.close()
-            os.system(tempname)
-            try:
-                os.remove(tempname)
-            except:
-                pass
-
-        # Now run make.
-        print "Executing nmake over the ssl makefiles..."
-        if debug:
-            rc = os.system("nmake /nologo -f d32.mak")
-            if rc:
-                print "Executing d32.mak failed"
-                print rc
-                sys.exit(rc)
-        else:
-            rc = os.system("nmake /nologo -f 32.mak")
-            if rc:
-                print "Executing 32.mak failed"
-                print rc
-                sys.exit(rc)
-    finally:
-        os.chdir(old_cd)
-    # And finally, we can build the _ssl module itself for Python.
-    defs = "SSL_DIR=%s" % (ssl_dir,)
-    if debug:
-        defs = defs + " " + "DEBUG=1"
-    rc = os.system('nmake /nologo -f _ssl.mak ' + defs + " " + make_flags)
-    sys.exit(rc)
-
-if __name__=='__main__':
-    main()
diff --git a/PCbuild8/bz2.vcproj b/PCbuild8/bz2.vcproj
deleted file mode 100644 (file)
index 48805db..0000000
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="bz2"
-       ProjectGUID="{AC557788-6354-43F7-BE05-C9C8C59A344A}"
-       RootNamespace="bz2"
-       SccProjectName="bz2"
-       SccLocalPath=".."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\bz2"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.3&#x0D;&#x0A;nmake /nologo /f makefile.msc&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
-                               OutputFile="./bz2_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="msvcrt,libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./bz2_d.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D170000"
-                               ImportLibrary=".\./bz2_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\bz2"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.3&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
-                               OutputFile="./bz2.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./bz2.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D170000"
-                               ImportLibrary=".\./bz2.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\bz2"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.3&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
-                               OutputFile="./bz2.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./bz2.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D170000"
-                               ImportLibrary=".\./bz2.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\bz2"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON /GS-"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.3&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
-                               OutputFile="./bz2.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./bz2.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D170000"
-                               ImportLibrary=".\./bz2.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\bz2module.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/bz2/bz2.vcproj b/PCbuild8/bz2/bz2.vcproj
new file mode 100644 (file)
index 0000000..68935de
--- /dev/null
@@ -0,0 +1,652 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bz2"\r
+       ProjectGUID="{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}"\r
+       RootNamespace="bz2"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(bz2Dir)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\bz2module.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/db.build b/PCbuild8/db.build
deleted file mode 100644 (file)
index 85caec3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>\r
-<project>\r
- <target name="all" description="Build all targets.">\r
-   <solution configuration="release">\r
-     <projects>\r
-       <include name="db_static.vcproj" />\r
-     </projects>\r
-   </solution>\r
- </target>\r
-</project>\r
diff --git a/PCbuild8/field3.py b/PCbuild8/field3.py
deleted file mode 100644 (file)
index 47f24ca..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# An absurd workaround for the lack of arithmetic in MS's resource compiler.
-# After building Python, run this, then paste the output into the appropriate
-# part of PC\python_nt.rc.
-# Example output:
-#
-# * For 2.3a0,
-# * PY_MICRO_VERSION = 0
-# * PY_RELEASE_LEVEL = 'alpha' = 0xA
-# * PY_RELEASE_SERIAL = 1
-# *
-# * and 0*1000 + 10*10 + 1 = 101.
-# */
-# #define FIELD3 101
-
-import sys
-
-major, minor, micro, level, serial = sys.version_info
-levelnum = {'alpha': 0xA,
-            'beta': 0xB,
-            'candidate': 0xC,
-            'final': 0xF,
-           }[level]
-string = sys.version.split()[0] # like '2.3a0'
-
-print " * For %s," % string
-print " * PY_MICRO_VERSION = %d" % micro
-print " * PY_RELEASE_LEVEL = %r = %s" % (level, hex(levelnum))
-print " * PY_RELEASE_SERIAL = %d" % serial
-print " *"
-
-field3 = micro * 1000 + levelnum * 10 + serial
-
-print " * and %d*1000 + %d*10 + %d = %d" % (micro, levelnum, serial, field3)
-print " */"
-print "#define FIELD3", field3
similarity index 65%
rename from PCbuild8/make_buildinfo.c
rename to PCbuild8/make_buildinfo/make_buildinfo.c
index 85416ed39d15243741098059882476e45046b9da..6f89716c3b1652db726e1774bf3240397bf5de40 100644 (file)
@@ -1,81 +1,66 @@
-#include <windows.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-
-/* This file creates the getbuildinfo2.c file, by
-   invoking subwcrev.exe (if found).
-   If this isn't a subversion checkout, or subwcrev isn't
-   found, it copies ..\\Modules\\getbuildinfo.c instead.
-
-   A file, getbuildinfo2.h is then updated to define
-   SUBWCREV if it was a subversion checkout.
-
-   getbuildinfo2.c is part of the pythoncore project with
-   getbuildinfo2.h as a forced include.  This helps
-   VisualStudio refrain from unnecessary compiles much of the
-   time.
-
-   Currently, subwcrev.exe is found from the registry entries
-   of TortoiseSVN.
-
-   make_buildinfo.exe is called as a pre-build step for pythoncore.
-
-*/
-
-int make_buildinfo2()
-{
-       struct _stat st;
-       HKEY hTortoise;
-       char command[500];
-       DWORD type, size;
-       if (_stat(".svn", &st) < 0)
-               return 0;
-       /* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */
-       if (_stat("no_subwcrev", &st) == 0)
-               return 0;
-       if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&
-           RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)
-               /* Tortoise not installed */
-               return 0;
-       command[0] = '"';  /* quote the path to the executable */
-       size = sizeof(command) - 1;
-       if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||
-           type != REG_SZ)
-               /* Registry corrupted */
-               return 0;
-       strcat_s(command, sizeof(command), "bin\\subwcrev.exe");
-       if (_stat(command+1, &st) < 0)
-               /* subwcrev.exe not part of the release */
-               return 0;
-       strcat_s(command, sizeof(command), "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
-       puts(command); fflush(stdout);
-       if (system(command) < 0)
-               return 0;
-       return 1;
-}
-
-int main(int argc, char*argv[])
-{
-       char command[500] = "";
-       int svn;
-       FILE *f;
-
-       if (fopen_s(&f, "getbuildinfo2.h", "w"))
-               return EXIT_FAILURE;
-       /* Get getbuildinfo.c from svn as getbuildinfo2.c */
-       svn = make_buildinfo2();
-       if (svn) {
-               puts("got getbuildinfo2.c from svn.  Updating getbuildinfo2.h");
-               /* yes.  make sure SUBWCREV is defined */
-               fprintf(f, "#define SUBWCREV\n");
-       } else {
-               puts("didn't get getbuildinfo2.c from svn.  Copying from Modules and clearing getbuildinfo2.h");
-               strcat_s(command, sizeof(command), "copy ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
-               puts(command); fflush(stdout);
-               if (system(command) < 0)
-                       return EXIT_FAILURE;
-       }
-       fclose(f);
-       return 0;
+#include <windows.h>\r
+#include <sys/types.h>\r
+#include <sys/stat.h>\r
+#include <stdio.h>\r
+\r
+/* This file creates the local getbuildinfo.c file, by\r
+   invoking subwcrev.exe (if found).  This replaces tokens\r
+   int the file with information about the build.\r
+   If this isn't a subversion checkout, or subwcrev isn't\r
+   found, it copies ..\\Modules\\getbuildinfo.c instead.\r
+\r
+   Currently, subwcrev.exe is found from the registry entries\r
+   of TortoiseSVN.\r
+\r
+   make_buildinfo.exe is called as a pre-build step for pythoncore.\r
+*/\r
+\r
+int make_buildinfo2()\r
+{\r
+       struct _stat st;\r
+       HKEY hTortoise;\r
+       char command[500];\r
+       DWORD type, size;\r
+       if (_stat("..\\.svn", &st) < 0)\r
+               return 0;\r
+       /* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */\r
+       if (_stat("no_subwcrev", &st) == 0)\r
+               return 0;\r
+       if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&\r
+           RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)\r
+               /* Tortoise not installed */\r
+               return 0;\r
+       command[0] = '"';  /* quote the path to the executable */\r
+       size = sizeof(command) - 1;\r
+       if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||\r
+           type != REG_SZ)\r
+               /* Registry corrupted */\r
+               return 0;\r
+       strcat_s(command, sizeof(command), "bin\\subwcrev.exe");\r
+       if (_stat(command+1, &st) < 0)\r
+               /* subwcrev.exe not part of the release */\r
+               return 0;\r
+       strcat_s(command, sizeof(command), "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo.c");\r
+       puts(command); fflush(stdout);\r
+       if (system(command) < 0)\r
+               return 0;\r
+       return 1;\r
+}\r
+\r
+int main(int argc, char*argv[])\r
+{\r
+       char command[500] = "";\r
+       int svn;\r
+       /* Get getbuildinfo.c from svn as getbuildinfo2.c */\r
+       svn = make_buildinfo2();\r
+       if (svn) {\r
+               puts("subcwrev succeeded, generated getbuildinfo.c");\r
+       } else {\r
+               puts("Couldn't run subwcrev.exe on getbuildinfo.c.  Copying it");\r
+               strcat_s(command, sizeof(command), "copy /Y ..\\Modules\\getbuildinfo.c getbuildinfo.c");\r
+               puts(command); fflush(stdout);\r
+               if (system(command) < 0)\r
+                       return EXIT_FAILURE;\r
+       }\r
+       return 0;\r
 }
\ No newline at end of file
similarity index 65%
rename from PCbuild8/make_buildinfo.vcproj
rename to PCbuild8/make_buildinfo/make_buildinfo.vcproj
index 58ed000fe5e49f8a43b0a3123d5fc05d11382dfd..c3f3491f8a4035a863012481d9c9d38f1f517b7f 100644 (file)
-<?xml version="1.0" encoding="windows-1250"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="make_buildinfo"
-       ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
-       RootNamespace="make_buildinfo"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory=".\x86-temp-release\make_buildinfo"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/make_buildinfo.exe"
-                               LinkIncremental="2"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/make_buildinfo.pdb"
-                               SubSystem="1"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Making getbuildinfo2.c"
-                               CommandLine="$(TargetPath)"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath=".\make_buildinfo.c"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="make_buildinfo"\r
+       ProjectGUID="{87AB87DB-B665-4621-A67B-878C15B93FF0}"\r
+       RootNamespace="make_buildinfo"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ProjectDir)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath=".\make_buildinfo.c"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/make_versioninfo.vcproj b/PCbuild8/make_versioninfo.vcproj
deleted file mode 100644 (file)
index e9efd53..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="make_versioninfo"
-       ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
-       RootNamespace="make_versioninfo"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\make_versioninfo"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                               CommandLine=".\make_versioninfo.exe &gt;..\PC\pythonnt_rc.h&#x0D;&#x0A;"
-                               Outputs="..\PC\pythonnt_rc.h"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile=".\./make_versioninfo.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./make_versioninfo.pdb"
-                               SubSystem="1"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(TargetFileName) &gt; ..\PC\python_nt.h"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\make_versioninfo"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                               CommandLine=".\make_versioninfo_d.exe &gt;..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-                               Outputs="..\PC\pythonnt_rc_d.h"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="./make_versioninfo_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./make_versioninfo_d.pdb"
-                               SubSystem="1"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(TargetFileName) &gt; ..\PC\python_nt_d.h"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\make_versioninfo.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/make_versioninfo/make_versioninfo.vcproj b/PCbuild8/make_versioninfo/make_versioninfo.vcproj
new file mode 100644 (file)
index 0000000..6e51944
--- /dev/null
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="make_versioninfo"\r
+       ProjectGUID="{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"\r
+       RootNamespace="make_versioninfo"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               Description="Generating python_rc.h"\r
+                               CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath="..\..\PC\make_versioninfo.c"\r
+                       >\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 35d65a066459ae02d5ff0bb573c6499efdf36724..e866638785dc72360e912d54087189427b9a4d05 100644 (file)
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
        ProjectSection(ProjectDependencies) = postProject
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
+               {87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo\make_buildinfo.vcproj", "{87AB87DB-B665-4621-A67B-878C15B93FF0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes.vcproj", "{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{97239A56-DBC0-41D2-BC14-C87D9B97D63B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi\_msi.vcproj", "{A25ADCC5-8DE1-4F88-B842-C287923280B1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+       EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{51F35FAE-FB92-4B2C-9187-1542C065AD77}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3\_sqlite3.vcproj", "{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python\python.vcproj", "{AE617428-B823-4B87-BC6D-DC7C12C746D3}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw\pythonw.vcproj", "{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+       EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select\select.vcproj", "{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{F22F40F4-D318-40DC-96B3-88DC81CE0894}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata\unicodedata.vcproj", "{D04B2089-7DA9-4D92-B23F-07453BC46652}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound\winsound.vcproj", "{1015E3B4-FD3B-4402-AA6E-7806514156D6}"
        ProjectSection(ProjectDependencies) = postProject
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket\_socket.vcproj", "{AE31A248-5367-4EB2-A511-8722BC351CB4}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B172265-1F31-4880-A29C-11A4B7A80172}"
-       ProjectSection(SolutionItems) = preProject
-               ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c
-               readme.txt = readme.txt
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb\_bsddb.vcproj", "{E644B843-F7CA-4888-AA6D-653C77592856}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi\_testcapi.vcproj", "{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"
        ProjectSection(ProjectDependencies) = postProject
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter\_tkinter.vcproj", "{3A1515AF-3694-4222-91F2-9837BDF60F9A}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2\bz2.vcproj", "{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat\pyexpat.vcproj", "{80EBF51A-6018-4589-9A53-5AAF2872E230}"
+       ProjectSection(ProjectDependencies) = postProject
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+       EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{310B6D98-CFE1-4215-97C1-E52989488A50}"
+       ProjectSection(SolutionItems) = preProject
+               readme.txt = readme.txt
+       EndProjectSection
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
-               PGIRelease|Win32 = PGIRelease|Win32
-               PGIRelease|x64 = PGIRelease|x64
-               PGORelease|Win32 = PGORelease|Win32
-               PGORelease|x64 = PGORelease|x64
+               PGInstrument|Win32 = PGInstrument|Win32
+               PGInstrument|x64 = PGInstrument|x64
+               PGUpdate|Win32 = PGUpdate|Win32
+               PGUpdate|x64 = PGUpdate|x64
                Release|Win32 = Release|Win32
                Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|Win32.ActiveCfg = PGIRelease|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|Win32.Build.0 = PGIRelease|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|x64.ActiveCfg = PGIRelease|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGIRelease|x64.Build.0 = PGIRelease|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|Win32.ActiveCfg = PGORelease|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|Win32.Build.0 = PGORelease|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|x64.ActiveCfg = PGORelease|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGORelease|x64.Build.0 = PGORelease|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64
-               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|Win32.Build.0 = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|x64.ActiveCfg = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGIRelease|x64.Build.0 = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|Win32.Build.0 = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|x64.ActiveCfg = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGORelease|x64.Build.0 = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64
-               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|Win32.ActiveCfg = Debug|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|Win32.Build.0 = Debug|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|x64.ActiveCfg = Debug|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug|x64.Build.0 = Debug|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|Win32.Build.0 = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|x64.ActiveCfg = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGIRelease|x64.Build.0 = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|Win32.Build.0 = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|x64.ActiveCfg = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.PGORelease|x64.Build.0 = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|Win32.ActiveCfg = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|Win32.Build.0 = Release|Win32
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|x64.ActiveCfg = Release|x64
-               {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release|x64.Build.0 = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|Win32.ActiveCfg = Debug|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|Win32.Build.0 = Debug|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|x64.ActiveCfg = Debug|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug|x64.Build.0 = Debug|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|Win32.Build.0 = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|x64.ActiveCfg = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGIRelease|x64.Build.0 = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|Win32.Build.0 = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|x64.ActiveCfg = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.PGORelease|x64.Build.0 = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|Win32.ActiveCfg = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|Win32.Build.0 = Release|Win32
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|x64.ActiveCfg = Release|x64
-               {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release|x64.Build.0 = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|Win32.Build.0 = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|x64.ActiveCfg = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGIRelease|x64.Build.0 = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|Win32.Build.0 = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|x64.ActiveCfg = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGORelease|x64.Build.0 = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64
-               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|Win32.ActiveCfg = Debug|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|Win32.Build.0 = Debug|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|x64.ActiveCfg = Debug|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Debug|x64.Build.0 = Debug|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|Win32.Build.0 = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|x64.ActiveCfg = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGIRelease|x64.Build.0 = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|Win32.Build.0 = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|x64.ActiveCfg = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.PGORelease|x64.Build.0 = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|Win32.ActiveCfg = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|Win32.Build.0 = Release|Win32
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|x64.ActiveCfg = Release|x64
-               {51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release|x64.Build.0 = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|Win32.Build.0 = Debug|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|x64.ActiveCfg = Debug|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug|x64.Build.0 = Debug|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|Win32.Build.0 = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|x64.ActiveCfg = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGIRelease|x64.Build.0 = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|Win32.Build.0 = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|x64.ActiveCfg = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.PGORelease|x64.Build.0 = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|Win32.ActiveCfg = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|Win32.Build.0 = Release|Win32
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|x64.ActiveCfg = Release|x64
-               {1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release|x64.Build.0 = Release|x64
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|Win32.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|Win32.Build.0 = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGIRelease|x64.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|Win32.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|Win32.Build.0 = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGORelease|x64.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Debug|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Debug|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|Win32.Build.0 = Debug|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|x64.ActiveCfg = Debug|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Debug|x64.Build.0 = Debug|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|Win32.Build.0 = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|x64.ActiveCfg = Release|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGIRelease|x64.Build.0 = Release|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|Win32.Build.0 = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|x64.ActiveCfg = Release|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.PGORelease|x64.Build.0 = Release|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|Win32.ActiveCfg = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|Win32.Build.0 = Release|Win32
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|x64.ActiveCfg = Release|x64
-               {2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}.Release|x64.Build.0 = Release|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|Win32.Build.0 = Debug|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|x64.ActiveCfg = Debug|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Debug|x64.Build.0 = Debug|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|Win32.Build.0 = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|x64.ActiveCfg = Release|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGIRelease|x64.Build.0 = Release|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|Win32.Build.0 = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|x64.ActiveCfg = Release|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.PGORelease|x64.Build.0 = Release|x64
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|Win32.ActiveCfg = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|Win32.Build.0 = Release|Win32
-               {F22F40F4-D318-40DC-96B3-88DC81CE0894}.Release|x64.ActiveCfg = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|Win32.ActiveCfg = Debug|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|Win32.Build.0 = Debug|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|x64.ActiveCfg = Debug|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Debug|x64.Build.0 = Debug|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|Win32.Build.0 = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|x64.ActiveCfg = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGIRelease|x64.Build.0 = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|Win32.Build.0 = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|x64.ActiveCfg = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.PGORelease|x64.Build.0 = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|Win32.ActiveCfg = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|Win32.Build.0 = Release|Win32
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|x64.ActiveCfg = Release|x64
-               {8CF334D9-4F82-42EB-97AF-83592C5AFD2F}.Release|x64.Build.0 = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|Win32.Build.0 = Debug|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|x64.ActiveCfg = Debug|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Debug|x64.Build.0 = Debug|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|Win32.Build.0 = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|x64.ActiveCfg = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGIRelease|x64.Build.0 = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|Win32.Build.0 = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|x64.ActiveCfg = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.PGORelease|x64.Build.0 = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|Win32.ActiveCfg = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|Win32.Build.0 = Release|Win32
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|x64.ActiveCfg = Release|x64
-               {2FF0A312-22F9-4C34-B070-842916DE27A9}.Release|x64.Build.0 = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|Win32.Build.0 = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|x64.ActiveCfg = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGIRelease|x64.Build.0 = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|Win32.Build.0 = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|x64.ActiveCfg = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGORelease|x64.Build.0 = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|Win32.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGIRelease|x64.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|Win32.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGORelease|x64.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|Win32.ActiveCfg = Debug|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|Win32.Build.0 = Debug|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|x64.ActiveCfg = Debug|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|x64.Build.0 = Debug|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|Win32.ActiveCfg = Release|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|Win32.Build.0 = Release|Win32
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.ActiveCfg = Release|x64
+               {987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.Build.0 = Release|x64
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.Build.0 = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|x64.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|x64.Build.0 = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|Win32.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|Win32.Build.0 = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGInstrument|x64.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|Win32.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|Win32.Build.0 = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.PGUpdate|x64.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.ActiveCfg = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.Build.0 = Debug|Win32
+               {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|x64.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.Build.0 = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|x64.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|x64.Build.0 = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|Win32.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|Win32.Build.0 = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGInstrument|x64.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|Win32.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|Win32.Build.0 = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.PGUpdate|x64.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.ActiveCfg = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.Build.0 = Debug|Win32
+               {87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|x64.ActiveCfg = Debug|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.Build.0 = Debug|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|x64.ActiveCfg = Debug|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|x64.Build.0 = Debug|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|Win32.ActiveCfg = Release|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|Win32.Build.0 = Release|Win32
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.ActiveCfg = Release|x64
+               {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.Build.0 = Release|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.Build.0 = Debug|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|x64.ActiveCfg = Debug|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|x64.Build.0 = Debug|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|Win32.ActiveCfg = Release|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|Win32.Build.0 = Release|Win32
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.ActiveCfg = Release|x64
+               {F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.Build.0 = Release|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.Build.0 = Debug|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|x64.ActiveCfg = Debug|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|x64.Build.0 = Debug|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Release|Win32.ActiveCfg = Release|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Release|Win32.Build.0 = Release|Win32
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.ActiveCfg = Release|x64
+               {CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.Build.0 = Release|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.Build.0 = Debug|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|x64.ActiveCfg = Debug|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|x64.Build.0 = Debug|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|Win32.ActiveCfg = Release|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|Win32.Build.0 = Release|Win32
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.ActiveCfg = Release|x64
+               {A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.Build.0 = Release|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.Build.0 = Debug|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|x64.ActiveCfg = Debug|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|x64.Build.0 = Debug|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|Win32.ActiveCfg = Release|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|Win32.Build.0 = Release|Win32
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.ActiveCfg = Release|x64
+               {D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.Build.0 = Release|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.Build.0 = Debug|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|x64.ActiveCfg = Debug|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|x64.Build.0 = Debug|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|Win32.ActiveCfg = Release|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|Win32.Build.0 = Release|Win32
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.ActiveCfg = Release|x64
+               {AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.Build.0 = Release|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.ActiveCfg = Debug|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.Build.0 = Debug|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|x64.ActiveCfg = Debug|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|x64.Build.0 = Debug|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|Win32.ActiveCfg = Release|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|Win32.Build.0 = Release|Win32
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.ActiveCfg = Release|x64
+               {98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.Build.0 = Release|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.Build.0 = Debug|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|x64.ActiveCfg = Debug|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|x64.Build.0 = Debug|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|Win32.ActiveCfg = Release|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|Win32.Build.0 = Release|Win32
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.ActiveCfg = Release|x64
+               {0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.Build.0 = Release|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.ActiveCfg = Debug|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.Build.0 = Debug|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|x64.ActiveCfg = Debug|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|x64.Build.0 = Debug|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|Win32.ActiveCfg = Release|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|Win32.Build.0 = Release|Win32
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.ActiveCfg = Release|x64
+               {D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.Build.0 = Release|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.ActiveCfg = Debug|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.Build.0 = Debug|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|x64.ActiveCfg = Debug|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|x64.Build.0 = Debug|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|Win32.ActiveCfg = Release|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|Win32.Build.0 = Release|Win32
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.ActiveCfg = Release|x64
+               {1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.Build.0 = Release|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.ActiveCfg = Debug|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.Build.0 = Debug|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|x64.ActiveCfg = Debug|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|x64.Build.0 = Debug|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|Win32.ActiveCfg = Release|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|Win32.Build.0 = Release|Win32
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.ActiveCfg = Release|x64
+               {AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.Build.0 = Release|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.Build.0 = Debug|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Debug|x64.ActiveCfg = Debug|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Debug|x64.Build.0 = Debug|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.ActiveCfg = PGInstrument|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = PGInstrument|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.ActiveCfg = Release|x64
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.Build.0 = Release|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.ActiveCfg = Debug|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.Build.0 = Debug|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|x64.ActiveCfg = Debug|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|x64.Build.0 = Debug|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|Win32.ActiveCfg = Release|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|Win32.Build.0 = Release|Win32
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.ActiveCfg = Release|x64
+               {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.Build.0 = Release|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.Build.0 = Debug|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|x64.ActiveCfg = Debug|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|x64.Build.0 = Debug|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|Win32.ActiveCfg = Release|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|Win32.Build.0 = Release|Win32
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.ActiveCfg = Release|x64
+               {3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.Build.0 = Release|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.Build.0 = Debug|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|x64.ActiveCfg = Debug|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|x64.Build.0 = Debug|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|Win32.ActiveCfg = Release|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|Win32.Build.0 = Release|Win32
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.ActiveCfg = Release|x64
+               {18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.Build.0 = Release|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.ActiveCfg = Debug|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.Build.0 = Debug|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|x64.ActiveCfg = Debug|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|x64.Build.0 = Debug|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|Win32.ActiveCfg = Release|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|Win32.Build.0 = Release|Win32
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.ActiveCfg = Release|x64
+               {80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/PCbuild8/pyd.vsprops b/PCbuild8/pyd.vsprops
new file mode 100644 (file)
index 0000000..afbfb50
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyd"\r
+       InheritedPropertySheets=".\pyproject.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               OutputFile="$(OutDir)\$(ProjectName).pyd"\r
+               ImportLibrary="$(IntDir)\$(TargetName).lib"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/pyd_d.vsprops b/PCbuild8/pyd_d.vsprops
new file mode 100644 (file)
index 0000000..4bb3a40
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyd_d"\r
+       InheritedPropertySheets=".\pyproject.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               OutputFile="$(OutDir)\$(ProjectName)_d.pyd"\r
+               LinkIncremental="1"\r
+               ImportLibrary="$(IntDir)\$(TargetName).lib"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/pyexpat.vcproj b/PCbuild8/pyexpat.vcproj
deleted file mode 100644 (file)
index bc449cd..0000000
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="pyexpat"
-       ProjectGUID="{7E551393-3C43-47F8-9F3F-5BC368A6C487}"
-       SccProjectName="pyexpat"
-       SccLocalPath=".."
-       SccProvider="MSSCCI:Perforce SCM"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-debug\pyexpat"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="./pyexpat_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./pyexpat_d.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=".\./pyexpat_d.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\."
-                       IntermediateDirectory=".\x86-temp-release\pyexpat"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="./pyexpat.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./pyexpat.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=".\./pyexpat.lib"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseItanium|Win32"
-                       OutputDirectory="./."
-                       IntermediateDirectory=".\ia64-temp-release\pyexpat"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_ITANIUM"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="./pyexpat.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./pyexpat.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=".\./pyexpat.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="ReleaseAMD64|Win32"
-                       OutputDirectory="."
-                       IntermediateDirectory="amd64-temp-release\pyexpat"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions=" /USECL:MS_OPTERON"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
-                               StringPooling="true"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="./pyexpat.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\./pyexpat.pdb"
-                               SubSystem="2"
-                               BaseAddress="0x1D100000"
-                               ImportLibrary=".\./pyexpat.lib"
-                               TargetMachine="0"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\pyexpat.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmlparse.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmlrole.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\expat\xmltok.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/pyexpat/pyexpat.vcproj b/PCbuild8/pyexpat/pyexpat.vcproj
new file mode 100644 (file)
index 0000000..f45a0f7
--- /dev/null
@@ -0,0 +1,664 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyexpat"\r
+       ProjectGUID="{80EBF51A-6018-4589-9A53-5AAF2872E230}"\r
+       RootNamespace="pyexpat"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\Modules\expat"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\pyexpat.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlparse.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlrole.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmltok.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmlrole.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\xmltok.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/pyproject.vsprops b/PCbuild8/pyproject.vsprops
new file mode 100644 (file)
index 0000000..e4c5f73
--- /dev/null
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyproject"\r
+       OutputDirectory="$(SolutionDir)$(PlatformName)$(ConfigurationName)"\r
+       IntermediateDirectory="$(PlatformName)$(ConfigurationName)"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\Include; ..\..\PC"\r
+               PreprocessorDefinitions="_WIN32;_CRT_SECURE_NO_DEPRECATE"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalLibraryDirectories="$(OutDir)"\r
+       />\r
+       <Tool\r
+               Name="VCResourceCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\PC;..\..\Include"\r
+       />\r
+       <UserMacro\r
+               Name="PyDllName"\r
+               Value="python26"\r
+       />\r
+       <UserMacro\r
+               Name="bsddbDir"\r
+               Value="..\..\..\db-4.4.20\build_win32"\r
+       />\r
+       <UserMacro\r
+               Name="sqlite3Dir"\r
+               Value="..\..\..\sqlite-source-3.3.4"\r
+       />\r
+       <UserMacro\r
+               Name="bz2Dir"\r
+               Value="..\..\..\bzip2-1.0.3"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/python.build b/PCbuild8/python.build
deleted file mode 100644 (file)
index 4e1fcc0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>\r
-<project>\r
- <target name="all" description="Build all targets.">\r
-   <solution configuration="release">\r
-     <projects>\r
-       <include name="make_versioninfo.vcproj" />\r
-     </projects>\r
-   </solution>\r
-   <exec program="make_versioninfo" output="pythonnt_rc.h" />\r
-\r
-   <solution configuration="release" solutionfile="pcbuild.sln">\r
-     <excludeprojects>\r
-       <include name="_tkinter.vcproj" />\r
-       <include name="bz2.vcproj" />\r
-       <include name="_bsddb.vcproj" />\r
-       <include name="_sqlite3.vcproj" />\r
-       <include name="_ssl.vcproj" />\r
-     </excludeprojects>\r
-   </solution>\r
- </target>\r
-</project>\r
diff --git a/PCbuild8/python.iss b/PCbuild8/python.iss
deleted file mode 100644 (file)
index b1ed65d..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.\r
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
-\r
-; This is the whole ball of wax for an Inno installer for Python.\r
-; To use, download Inno Setup from http://www.jrsoftware.org/isdl.htm/,\r
-; install it, and double-click on this file.  That launches the Inno\r
-; script compiler.  The GUI is extemely simple, and has only one button\r
-; you may not recognize instantly:  click it.  You're done.  It builds\r
-; the installer into PCBuild/Python-2.2a1.exe.  Size and speed of the\r
-; installer are competitive with the Wise installer; Inno uninstall\r
-; seems much quicker than Wise (but also feebler, and the uninstall\r
-; log is in some un(human)readable binary format).\r
-;\r
-; What's Done\r
-; -----------\r
-; All the usual Windows Python files are installed by this now.\r
-; All the usual Windows Python Start menu entries are created and\r
-; work fine.\r
-; .py, .pyw, .pyc and .pyo extensions are registered.\r
-;     PROBLEM:  Inno uninstall does not restore their previous registry\r
-;               associations (if any).  Wise did.  This will make life\r
-;               difficult for alpha (etc) testers.\r
-; The Python install is fully functional for "typical" uses.\r
-;\r
-; What's Not Done\r
-; ---------------\r
-; None of "Mark Hammond's" registry entries are written.\r
-; No installation of files is done into the system dir:\r
-;     The MS DLLs aren't handled at all by this yet.\r
-;     Python22.dll is unpacked into the main Python dir.\r
-;\r
-; Inno can't do different things on NT/2000 depending on whether the user\r
-; has Admin privileges, so I don't know how to "solve" either of those,\r
-; short of building two installers (one *requiring* Admin privs, the\r
-; other not doing anything that needs Admin privs).\r
-;\r
-; Inno has no concept of variables, so lots of lines in this file need\r
-; to be fiddled by hand across releases.  Simplest way out:  stick this\r
-; file in a giant triple-quoted r-string (note that backslashes are\r
-; required all over the place here -- forward slashes DON'T WORK in\r
-; Inno), and use %(yadda)s string interpolation to do substitutions; i.e.,\r
-; write a very simple Python program to *produce* this script.\r
-\r
-[Setup]\r
-AppName=Python and combined Win32 Extensions\r
-AppVerName=Python 2.2.2 and combined Win32 Extensions 150\r
-AppId=Python 2.2.2.150\r
-AppVersion=2.2.2.150\r
-AppCopyright=Python is Copyright Â© 2001 Python Software Foundation. Win32 Extensions are Copyright Â© 1996-2001 Greg Stein and Mark Hammond.\r
-\r
-; Default install dir; value of {app} later (unless user overrides).\r
-; {sd} = system root drive, probably "C:".\r
-DefaultDirName={sd}\Python22\r
-;DefaultDirName={pf}\Python\r
-\r
-; Start menu folder name; value of {group} later (unless user overrides).\r
-DefaultGroupName=Python 2.2\r
-\r
-; Point SourceDir to one above PCBuild = src.\r
-; means this script can run unchanged from anyone's CVS tree, no matter\r
-; what they called the top-level directories.\r
-SourceDir=.\r
-OutputDir=..\r
-OutputBaseFilename=Python-2.2.2-Win32-150-Setup\r
-\r
-AppPublisher=PythonLabs at Digital Creations\r
-AppPublisherURL=http://www.python.org\r
-AppSupportURL=http://www.python.org\r
-AppUpdatesURL=http://www.python.org\r
-\r
-AlwaysCreateUninstallIcon=true\r
-ChangesAssociations=true\r
-UninstallLogMode=new\r
-AllowNoIcons=true\r
-AdminPrivilegesRequired=true\r
-UninstallDisplayIcon={app}\pyc.ico\r
-WizardDebug=false\r
-\r
-; The fewer screens the better; leave these commented.\r
-\r
-Compression=bzip\r
-InfoBeforeFile=LICENSE.txt\r
-;InfoBeforeFile=Misc\NEWS\r
-\r
-; uncomment the following line if you want your installation to run on NT 3.51 too.\r
-; MinVersion=4,3.51\r
-\r
-[Types]\r
-Name: normal; Description: Select desired components; Flags: iscustom\r
-\r
-[Components]\r
-Name: main; Description: Python and Win32 Extensions; Types: normal\r
-Name: docs; Description: Python documentation (HTML); Types: normal\r
-Name: tk; Description: TCL/TK, tkinter, and Idle; Types: normal\r
-Name: tools; Description: Python utility scripts (Tools\); Types: normal\r
-Name: test; Description: Python test suite (Lib\test\); Types: normal\r
-\r
-[Tasks]\r
-Name: extensions; Description: Register file associations (.py, .pyw, .pyc, .pyo); Components: main; Check: IsAdminLoggedOn\r
-\r
-[Files]\r
-; Caution:  Using forward slashes instead screws up in amazing ways.\r
-; Unknown:  By the time Components (and other attrs) are added to these lines, they're\r
-; going to get awfully long.  But don't see a way to continue logical lines across\r
-; physical lines.\r
-\r
-Source: LICENSE.txt; DestDir: {app}; CopyMode: alwaysoverwrite\r
-Source: README.txt; DestDir: {app}; CopyMode: alwaysoverwrite\r
-Source: News.txt; DestDir: {app}; CopyMode: alwaysoverwrite\r
-Source: *.ico; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: python.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main\r
-Source: pythonw.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main\r
-Source: w9xpopen.exe; DestDir: {app}; CopyMode: alwaysoverwrite; Components: main\r
-\r
-\r
-Source: DLLs\tcl83.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk\r
-Source: DLLs\tk83.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk\r
-Source: tcl\*.*; DestDir: {app}\tcl; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs\r
-\r
-Source: sysdir\python22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: sharedfile restartreplace\r
-Source: sysdir\PyWinTypes22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: restartreplace sharedfile\r
-Source: sysdir\pythoncom22.dll; DestDir: {sys}; CopyMode: alwaysskipifsameorolder; Components: main; Flags: restartreplace sharedfile\r
-\r
-Source: DLLs\_socket.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\_socket.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\_sre.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\_sre.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\_symtable.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\_symtable.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\_testcapi.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\_testcapi.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\_tkinter.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk\r
-Source: libs\_tkinter.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: tk\r
-\r
-Source: DLLs\bsddb.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\bsddb.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\mmap.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\mmap.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\parser.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\parser.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\pyexpat.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\pyexpat.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\select.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\select.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\unicodedata.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\unicodedata.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\_winreg.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\_winreg.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\winsound.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\winsound.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\zlib.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-Source: libs\zlib.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: libs\python22.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: DLLs\expat.dll; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main\r
-\r
-\r
-\r
-Source: Lib\*.py; DestDir: {app}\Lib; CopyMode: alwaysoverwrite; Components: main\r
-Source: Lib\compiler\*.*; DestDir: {app}\Lib\compiler; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\distutils\*.*; DestDir: {app}\Lib\distutils; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\email\*.*; DestDir: {app}\Lib\email; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\encodings\*.*; DestDir: {app}\Lib\encodings; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\lib-old\*.*; DestDir: {app}\Lib\lib-old; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\xml\*.*; DestDir: {app}\Lib\xml; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\hotshot\*.*; DestDir: {app}\Lib\hotshot; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\test\*.*; DestDir: {app}\Lib\test; CopyMode: alwaysoverwrite; Components: test; Flags: recursesubdirs\r
-\r
-Source: Lib\site-packages\README.txt; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: Lib\site-packages\PyWin32.chm; DestDir: {app}\Lib\site-packages; CopyMode: alwaysoverwrite; Components: docs\r
-Source: Lib\site-packages\win32\*.*; DestDir: {app}\Lib\site-packages\win32; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\site-packages\win32com\*.*; DestDir: {app}\Lib\site-packages\win32com; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-Source: Lib\site-packages\win32comext\*.*; DestDir: {app}\Lib\site-packages\win32comext; CopyMode: alwaysoverwrite; Components: main; Flags: recursesubdirs\r
-\r
-Source: Lib\lib-tk\*.py; DestDir: {app}\Lib\lib-tk; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs\r
-\r
-Source: include\*.h; DestDir: {app}\include; CopyMode: alwaysoverwrite; Components: main\r
-\r
-Source: Tools\idle\*.*; DestDir: {app}\Tools\idle; CopyMode: alwaysoverwrite; Components: tk; Flags: recursesubdirs\r
-\r
-Source: Tools\pynche\*.*; DestDir: {app}\Tools\pynche; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs\r
-Source: Tools\scripts\*.*; DestDir: {app}\Tools\Scripts; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs\r
-Source: Tools\webchecker\*.*; DestDir: {app}\Tools\webchecker; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs\r
-Source: Tools\versioncheck\*.*; DestDir: {app}\Tools\versioncheck; CopyMode: alwaysoverwrite; Components: tools; Flags: recursesubdirs\r
-\r
-Source: Doc\*.*; DestDir: {app}\Doc; CopyMode: alwaysoverwrite; Flags: recursesubdirs; Components: docs\r
-\r
-\r
-[Icons]\r
-Name: {group}\Python (command line); Filename: {app}\python.exe; WorkingDir: {app}; Components: main\r
-Name: {group}\Python Manuals; Filename: {app}\Doc\index.html; WorkingDir: {app}; Components: docs\r
-Name: {group}\Win32 Extensions Help; Filename: {app}\Lib\site-packages\PyWin32.chm; WorkingDir: {app}\Lib\site-packages; Components: docs\r
-Name: {group}\Module Docs; Filename: {app}\pythonw.exe; WorkingDir: {app}; Parameters: """{app}\Tools\Scripts\pydoc.pyw"""; Components: tools\r
-Name: {group}\IDLE (Python GUI); Filename: {app}\pythonw.exe; WorkingDir: {app}; Parameters: """{app}\Tools\idle\idle.pyw"""; Components: tools\r
-\r
-[Registry]\r
-; Register .py\r
-Tasks: extensions; Root: HKCR; Subkey: .py; ValueType: string; ValueName: ; ValueData: Python File; Flags: uninsdeletevalue\r
-Tasks: extensions; Root: HKCR; Subkey: .py; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: uninsdeletevalue\r
-Tasks: extensions; Root: HKCR; Subkey: Python File; ValueType: string; ValueName: ; ValueData: Python File; Flags: uninsdeletekey\r
-Tasks: extensions; Root: HKCR; Subkey: Python File\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\Py.ico\r
-Tasks: extensions; Root: HKCR; Subkey: Python File\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\python.exe"" ""%1"" %*"\r
-\r
-; Register .pyc\r
-Tasks: extensions; Root: HKCR; Subkey: .pyc; ValueType: string; ValueName: ; ValueData: Python CompiledFile; Flags: uninsdeletevalue\r
-Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile; ValueType: string; ValueName: ; ValueData: Compiled Python File; Flags: uninsdeletekey\r
-Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\pyc.ico\r
-Tasks: extensions; Root: HKCR; Subkey: Python CompiledFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\python.exe"" ""%1"" %*"\r
-\r
-; Register .pyo\r
-Tasks: extensions; Root: HKCR; Subkey: .pyo; ValueType: string; ValueName: ; ValueData: Python CompiledFile; Flags: uninsdeletevalue\r
-\r
-; Register .pyw\r
-Tasks: extensions; Root: HKCR; Subkey: .pyw; ValueType: string; ValueName: ; ValueData: Python NoConFile; Flags: uninsdeletevalue\r
-Tasks: extensions; Root: HKCR; Subkey: .pyw; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: uninsdeletevalue\r
-Tasks: extensions; Root: HKCR; Subkey: Python NoConFile; ValueType: string; ValueName: ; ValueData: Python File (no console); Flags: uninsdeletekey\r
-Tasks: extensions; Root: HKCR; Subkey: Python NoConFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\Py.ico\r
-Tasks: extensions; Root: HKCR; Subkey: Python NoConFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\pythonw.exe"" ""%1"" %*"\r
-\r
-\r
-; Python Registry Keys\r
-Root: HKLM; Subkey: SOFTWARE\Python; Flags: uninsdeletekeyifempty; Check: IsAdminLoggedOn\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath; ValueData: "{app}\Lib;{app}\DLLs"; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\tk; ValueData: {app}\Lib\lib-tk; Flags: uninsdeletekey; Components: tk\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32; ValueData: "{app}\lib\site-packages\win32;{app}\lib\site-packages\win32\lib"; Flags: uninsdeletekey\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\PythonPath\win32com; ValueData: C:\Python\lib\site-packages; Flags: uninsdeletekey\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules\pythoncom; ValueData: {sys}\pythoncom22.dll; Flags: uninsdeletekey\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Modules\pywintypes; ValueData: {sys}\PyWinTypes22.dll; Flags: uninsdeletekey\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\InstallPath; ValueData: {app}; Flags: uninsdeletekeyifempty; ValueType: string\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\InstallPath\InstallGroup; ValueData: {group}; Flags: uninsdeletekey\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help\Main Python Documentation; ValueType: string; ValueData: {app}\Doc\index.html; Flags: uninsdeletekey; Components: docs\r
-Root: HKLM; Subkey: SOFTWARE\Python\PythonCore\2.2\Help\Python Win32 Documentation; ValueType: string; ValueData: {app}\lib\site-packages\PyWin32.chm; Flags: uninsdeletekey; Components: docs\r
-\r
-[_ISTool]\r
-EnableISX=true\r
-\r
-\r
-[Code]\r
-Program Setup;\r
-\r
-Function IsAdminNotLoggedOn(): Boolean;\r
-begin\r
-  Result := Not IsAdminLoggedOn();\r
-end;\r
-\r
-begin\r
-end.\r
-\r
-\r
-\r
-\r
-[UninstallDelete]\r
-Name: {app}\Lib\compiler\*.pyc; Type: files\r
-Name: {app}\Lib\compiler\*.pyo; Type: files\r
-Name: {app}\Lib\compiler; Type: dirifempty\r
-Name: {app}\Lib\distutils\command\*.pyc; Type: files\r
-Name: {app}\Lib\distutils\command\*.pyo; Type: files\r
-Name: {app}\Lib\distutils\command; Type: dirifempty\r
-Name: {app}\Lib\distutils\*.pyc; Type: files\r
-Name: {app}\Lib\distutils\*.pyo; Type: files\r
-Name: {app}\Lib\distutils; Type: dirifempty\r
-Name: {app}\Lib\email\test\*.pyc; Type: files\r
-Name: {app}\Lib\email\test\*.pyo; Type: files\r
-Name: {app}\Lib\email\test; Type: dirifempty\r
-Name: {app}\Lib\email\*.pyc; Type: files\r
-Name: {app}\Lib\email\*.pyo; Type: files\r
-Name: {app}\Lib\email; Type: dirifempty\r
-Name: {app}\Lib\encodings\*.pyc; Type: files\r
-Name: {app}\Lib\encodings\*.pyo; Type: files\r
-Name: {app}\Lib\encodings; Type: dirifempty\r
-Name: {app}\Lib\hotshot\*.pyc; Type: files\r
-Name: {app}\Lib\hotshot\*.pyo; Type: files\r
-Name: {app}\Lib\hotshot; Type: dirifempty\r
-Name: {app}\Lib\lib-old\*.pyc; Type: files\r
-Name: {app}\Lib\lib-old\*.pyo; Type: files\r
-Name: {app}\Lib\lib-old; Type: dirifempty\r
-Name: {app}\Lib\lib-tk\*.pyc; Type: files\r
-Name: {app}\Lib\lib-tk\*.pyo; Type: files\r
-Name: {app}\Lib\lib-tk; Type: dirifempty\r
-Name: {app}\Lib\test\*.pyc; Type: files\r
-Name: {app}\Lib\test\*.pyo; Type: files\r
-Name: {app}\Lib\test; Type: dirifempty\r
-Name: {app}\Lib\xml\dom\*.pyc; Type: files\r
-Name: {app}\Lib\xml\dom\*.pyo; Type: files\r
-Name: {app}\Lib\xml\dom; Type: dirifempty\r
-Name: {app}\Lib\xml\parsers\*.pyc; Type: files\r
-Name: {app}\Lib\xml\parsers\*.pyo; Type: files\r
-Name: {app}\Lib\xml\parsers; Type: dirifempty\r
-Name: {app}\Lib\xml\sax\*.pyc; Type: files\r
-Name: {app}\Lib\xml\sax\*.pyo; Type: files\r
-Name: {app}\Lib\xml\sax; Type: dirifempty\r
-Name: {app}\Lib\xml\*.pyc; Type: files\r
-Name: {app}\Lib\xml\*.pyo; Type: files\r
-Name: {app}\Lib\xml; Type: dirifempty\r
-\r
-Name: {app}\Lib\site-packages\win32; Type: filesandordirs\r
-Name: {app}\Lib\site-packages\win32com; Type: filesandordirs\r
-Name: {app}\Lib\site-packages\win32comext; Type: filesandordirs\r
-Name: {app}\Lib\site-packages\pythoncom.py*; Type: files\r
-Name: {app}\Lib\site-packages; Type: dirifempty\r
-\r
-Name: {app}\Lib\*.pyc; Type: files\r
-Name: {app}\Lib; Type: dirifempty\r
-\r
-Name: {app}\Tools\pynche\*.pyc; Type: files\r
-Name: {app}\Tools\pynche\*.pyo; Type: files\r
-Name: {app}\Tools\pynche; Type: dirifempty\r
-\r
-Name: {app}\Tools\idle\*.pyc; Type: files\r
-Name: {app}\Tools\idle\*.pyo; Type: files\r
-Name: {app}\Tools\idle; Type: dirifempty\r
-\r
-Name: {app}\Tools\scripts\*.pyc; Type: files\r
-Name: {app}\Tools\scripts\*.pyo; Type: files\r
-Name: {app}\Tools\scripts; Type: dirifempty\r
-\r
-Name: {app}\Tools\versioncheck\*.pyc; Type: files\r
-Name: {app}\Tools\versioncheck\*.pyo; Type: files\r
-Name: {app}\Tools\versioncheck; Type: dirifempty\r
-\r
-Name: {app}\Tools\webchecker\*.pyc; Type: files\r
-Name: {app}\Tools\webchecker\*.pyo; Type: files\r
-Name: {app}\Tools\webchecker; Type: dirifempty\r
-\r
-Name: {app}\Tools; Type: dirifempty\r
-\r
diff --git a/PCbuild8/python.vcproj b/PCbuild8/python.vcproj
deleted file mode 100644 (file)
index 7fa8d04..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="python"
-       ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
-       RootNamespace="python"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\python.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="1"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\python.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="1"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
-                               OutputFile="$(OutDir)\python_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="1"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib python26_d.lib"
-                               OutputFile="$(OutDir)\python_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="1"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\pycon.ico"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\python.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\python_exe.rc"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/python/python.vcproj b/PCbuild8/python/python.vcproj
new file mode 100644 (file)
index 0000000..2ec1b8a
--- /dev/null
@@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="python"\r
+       ProjectGUID="{AE617428-B823-4B87-BC6D-DC7C12C746D3}"\r
+       RootNamespace="python"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName)_d.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName)_d.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="3000000"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\python.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\pycon.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\python_exe.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/python20.wse b/PCbuild8/python20.wse
deleted file mode 100644 (file)
index a8d9785..0000000
+++ /dev/null
@@ -1,3135 +0,0 @@
-Document Type: WSE\r
-item: Global\r
-  Version=9.0\r
-  Title=Python 2.4a1\r
-  Flags=00010100\r
-  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
-  Japanese Font Name=MS Gothic\r
-  Japanese Font Size=10\r
-  Start Gradient=0 255 0\r
-  End Gradient=0 128 0\r
-  Windows Flags=00000100000011010010010100001010\r
-  Log Pathname=%MAINDIR%\INSTALL.LOG\r
-  Message Font=MS Sans Serif\r
-  Font Size=8\r
-  Pages Modified=00010000011101000000000100000111\r
-  Extra Pages=00000000000000000000000010110010\r
-  Disk Filename=SETUP\r
-  Patch Flags=0000000000001001\r
-  Patch Threshold=85\r
-  Patch Memory=4000\r
-  MIF PDF Version=1.0\r
-  MIF SMS Version=2.0\r
-  EXE Filename=Python-2.4a1.exe\r
-  Dialogs Version=8\r
-  Version File=2.4a1\r
-  Version Description=Python Programming Language\r
-  Version Copyright=©2001-2007 Python Software Foundation\r
-  Version Company=Python Software Foundation\r
-  Crystal Format=10111100101100000010001001001001\r
-  Step View=&All\r
-  Variable Name1=_WISE_\r
-  Variable Description1=WISE root directory\r
-  Variable Default1=C:\Programme\Wise Installation System\r
-  Variable Flags1=00001000\r
-  Variable Name2=_TCLDIR_\r
-  Variable Description2=The directory in which the Tcl/Tk installation\r
-  Variable Description2=lives.  This must be a sibling of the Python\r
-  Variable Description2=directory.\r
-  Variable Default2=tcl84\r
-  Variable Flags2=00001000\r
-  Variable Name3=_DOC_\r
-  Variable Description3=The unpacked HTML doc directory.\r
-  Variable Default3=..\html\r
-  Variable Flags3=00001001\r
-  Variable Name4=_SYS_\r
-  Variable Description4=System directory (where to find MSVCRT.DLL)\r
-  Variable Default4=C:\Windows\System\r
-  Variable Values4=C:\Windows\System\r
-  Variable Values4=C:\WINNT\System32\r
-  Variable Values4=C:\Code\MSDLLs\r
-  Variable Values4=C:\Windows\System32\r
-  Variable Flags4=00000010\r
-  Variable Name5=_PYMAJOR_\r
-  Variable Description5=Python major version number; the 2 in 2.3.\r
-  Variable Default5=2\r
-  Variable Flags5=00001000\r
-  Variable Name6=_PYMINOR_\r
-  Variable Description6=Python minor version number; the 3 in 2.3\r
-  Variable Default6=3\r
-  Variable Flags6=00001000\r
-  Variable Name7=_DOADMIN_\r
-  Variable Description7=The initial value for %DOADMIN%.\r
-  Variable Description7=When 0, we never try to write under HKLM,\r
-  Variable Description7=and install the Python + MS runtime DLLs in\r
-  Variable Description7=the Python directory instead of the system dir.\r
-  Variable Default7=1\r
-  Variable Values7=1\r
-  Variable Values7=0\r
-  Variable Flags7=00001010\r
-  Variable Name8=_ALIASNAME_\r
-  Variable Flags8=00001000\r
-  Variable Name9=_ALIASPATH_\r
-  Variable Flags9=00001000\r
-  Variable Name10=_ALIASTYPE_\r
-  Variable Flags10=00001000\r
-end\r
-item: Set Variable\r
-  Variable=PYVER_STRING\r
-  Value=2.3\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=When the version number changes, set the compiler\r
-end\r
-item: Remark\r
-  Text=vrbls _PYMAJOR_ and  _PYMINOR_.\r
-end\r
-item: Remark\r
-  Text=Nothing in the script below should need fiddling then.\r
-end\r
-item: Remark\r
-  Text=Other things that need fiddling:\r
-end\r
-item: Remark\r
-  Text=    PYVER_STRING above.\r
-end\r
-item: Remark\r
-  Text=    The "Title:" in the upper left corner of the GUI.\r
-end\r
-item: Remark\r
-  Text=    Build Settings and Version Resource on step 6 (Finish) of the Installation Expert\r
-end\r
-item: Remark\r
-  Text=        Be sure to select Steps->All or you may not see these!\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=When the version of Tcl/Tk changes, the compiler vrbl\r
-end\r
-item: Remark\r
-  Text=_TCLDIR_ may also need to be changed.\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=APPTITLE\r
-  Value=Python %PYVER_STRING%\r
-end\r
-item: Remark\r
-  Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc\r
-end\r
-item: Set Variable\r
-  Variable=PY_VERSION\r
-  Value=%_PYMAJOR_%.%_PYMINOR_%\r
-end\r
-item: Remark\r
-  Text=GROUP is the Start menu group name; user can override.\r
-end\r
-item: Set Variable\r
-  Variable=GROUP\r
-  Value=Python %PY_VERSION%\r
-  Flags=10000000\r
-end\r
-item: Remark\r
-  Text=MAINDIR is the app directory; user can override.\r
-end\r
-item: Set Variable\r
-  Variable=MAINDIR\r
-  Value=Python%_PYMAJOR_%%_PYMINOR_%\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=DOADMIN\r
-  Value=%_DOADMIN_%\r
-end\r
-item: Remark\r
-  Text=Give non-admin users a chance to abort.\r
-end\r
-item: Check Configuration\r
-  Flags=10011111\r
-end\r
-item: Set Variable\r
-  Variable=DOADMIN\r
-  Value=0\r
-end\r
-item: Display Message\r
-  Title=Doing non-admin install\r
-  Text=The current login does not have Administrator Privileges on this machine.  Python will install its registry information into the per-user area only for the current login, instead of into the per-machine area for every account on this machine.  Some advanced uses of Python may not work as a result (for example, running a Python script as a service).\r
-  Text=\r
-  Text=If this is not what you want, please click Cancel to abort this installation, log on as an Administrator, and start the installation again.\r
-  Flags=00001000\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=BEGIN WIZARD STUFF -----------------------------------------------------------------------------------------------------------------------------\r
-end\r
-item: Remark\r
-  Text=Note from Tim: the "stop" on the next line is actually "pause".\r
-end\r
-item: Open/Close INSTALL.LOG\r
-  Flags=00000001\r
-end\r
-item: Remark\r
-  Text=If the destination system does not have a writable Windows\System directory, system files will be written to the Windows\ directory\r
-end\r
-item: Check if File/Dir Exists\r
-  Pathname=%SYS%\r
-  Flags=10000100\r
-end\r
-item: Set Variable\r
-  Variable=SYS\r
-  Value=%WIN%\r
-end\r
-item: End Block\r
-end\r
-item: Check Configuration\r
-  Flags=10111011\r
-end\r
-item: Get Registry Key Value\r
-  Variable=COMMON\r
-  Key=SOFTWARE\Microsoft\Windows\CurrentVersion\r
-  Default=C:\Program Files\Common Files\r
-  Value Name=CommonFilesDir\r
-  Flags=00000100\r
-end\r
-item: Get Registry Key Value\r
-  Variable=PROGRAM_FILES\r
-  Key=SOFTWARE\Microsoft\Windows\CurrentVersion\r
-  Default=C:\Program Files\r
-  Value Name=ProgramFilesDir\r
-  Flags=00000100\r
-end\r
-item: Set Variable\r
-  Variable=EXPLORER\r
-  Value=1\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-  Text=Note from Tim:  The Wizard hardcod "C:" at the start of the replacement text for MAINDIR.\r
-end\r
-item: Remark\r
-  Text=That's not appropriate if the system drive doesn't happen to be C:.\r
-end\r
-item: Remark\r
-  Text=I removed the "C:", and that did the right thing for two people who tested it on non-C: machines,\r
-end\r
-item: Remark\r
-  Text=but it's unclear whether it will always do the right thing.\r
-end\r
-item: Set Variable\r
-  Variable=MAINDIR\r
-  Value=\%MAINDIR%\r
-  Flags=00001100\r
-end\r
-item: Remark\r
-  Text=BACKUP is the variable that holds the path that all backup files will be copied to when overwritten\r
-end\r
-item: Set Variable\r
-  Variable=BACKUP\r
-  Value=%MAINDIR%\BACKUP\r
-  Flags=10000000\r
-end\r
-item: Remark\r
-  Text=DOBACKUP determines if a backup will be performed.  The possible values are A (do backup) or B (do not do backup)\r
-end\r
-item: Set Variable\r
-  Variable=DOBACKUP\r
-  Value=A\r
-end\r
-item: Remark\r
-  Text=BRANDING determines if the installation will be branded with a name and company.  By default, this is written to the INST directory (installation media).\r
-end\r
-item: Set Variable\r
-  Variable=BRANDING\r
-  Value=0\r
-end\r
-item: If/While Statement\r
-  Variable=BRANDING\r
-  Value=1\r
-end\r
-item: Read INI Value\r
-  Variable=NAME\r
-  Pathname=%INST%\CUSTDATA.INI\r
-  Section=Registration\r
-  Item=Name\r
-end\r
-item: Read INI Value\r
-  Variable=COMPANY\r
-  Pathname=%INST%\CUSTDATA.INI\r
-  Section=Registration\r
-  Item=Company\r
-end\r
-item: If/While Statement\r
-  Variable=NAME\r
-end\r
-item: Set Variable\r
-  Variable=DOBRAND\r
-  Value=1\r
-end\r
-item: Get System Information\r
-  Variable=NAME\r
-  Flags=00000110\r
-end\r
-item: Get System Information\r
-  Variable=COMPANY\r
-  Flags=00000111\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-  Text=END WIZARD STUFF -----------------------------------------------------------------------------------------------------------------------------\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Set vrbls for the "Advanced Options" subdialog of Components.\r
-end\r
-item: Set Variable\r
-  Variable=SELECT_ADMIN\r
-  Value=A\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=0\r
-end\r
-item: Set Variable\r
-  Variable=SELECT_ADMIN\r
-  Value=B\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=TASKS values:\r
-end\r
-item: Remark\r
-  Text=A: Register file extensions\r
-end\r
-item: Remark\r
-  Text=B: Create Start Menu shortcuts\r
-end\r
-item: Set Variable\r
-  Variable=TASKS\r
-  Value=AB\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=COMPONENTS values:\r
-end\r
-item: Remark\r
-  Text=A: interpreter and libraries\r
-end\r
-item: Remark\r
-  Text=B: Tcl/Tk\r
-end\r
-item: Remark\r
-  Text=C: docs\r
-end\r
-item: Remark\r
-  Text=D: tools\r
-end\r
-item: Remark\r
-  Text=E: test suite\r
-end\r
-item: Set Variable\r
-  Variable=COMPONENTS\r
-  Value=ABCDE\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=March thru the user GUI.\r
-end\r
-item: Wizard Block\r
-  Direction Variable=DIRECTION\r
-  Display Variable=DISPLAY\r
-  Bitmap Pathname=.\installer.bmp\r
-  X Position=9\r
-  Y Position=10\r
-  Filler Color=11173759\r
-  Dialog=Select Destination Directory\r
-  Dialog=Backup Replaced Files\r
-  Dialog=Select Components\r
-  Dialog=Select Program Manager Group\r
-  Variable=\r
-  Variable=\r
-  Variable=\r
-  Variable=TASKS\r
-  Value=\r
-  Value=\r
-  Value=\r
-  Value=B\r
-  Compare=0\r
-  Compare=0\r
-  Compare=0\r
-  Compare=3\r
-  Flags=00000011\r
-end\r
-item: If/While Statement\r
-  Variable=DISPLAY\r
-  Value=Start Installation\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=Install directory:  %MAINDIR%%CRLF%\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=SELECT_ADMIN\r
-  Value=A\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Doing admin install.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Doing non-admin install.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=DOBACKUP\r
-  Value=A\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Make backups, into %BACKUP%%CRLF%\r
-  Flags=00000001\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Don't make backups.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Components:%CRLF%\r
-  Flags=00000001\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=    Python interpreter and libraries%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=    Tcl/Tk (Tkinter, IDLE, pydoc)%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=C\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=    Python documentation%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=D\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=    Tool and utility scripts%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=E\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=    Python test suite%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=TASKS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Register file extensions.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Don't register file extensions.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=TASKS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%Start Menu group:  %GROUP%%CRLF%\r
-  Flags=00000001\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=SUMMARY\r
-  Value=%CRLF%No Start Menu shortcuts.%CRLF%\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Custom Dialog Set\r
-  Name=Select Destination Directory\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Installation de %APPTITLE%\r
-    Title German=Installation von %APPTITLE%\r
-    Title Spanish=Instalación de %APPTITLE%\r
-    Title Italian=Installazione di %APPTITLE%\r
-    Width=339\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 253\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Next >\r
-      Text French=&Suite >\r
-      Text German=&Weiter >\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-    end\r
-    item: Push Button\r
-      Rectangle=264 234 320 253\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=&Cancel\r
-      Text French=&Annuler\r
-      Text German=&Abbrechen\r
-      Text Spanish=&Cancelar\r
-      Text Italian=&Annulla\r
-    end\r
-    item: Static\r
-      Rectangle=10 225 320 226\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=108 11 323 33\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Select Destination Directory\r
-      Text French=Sélectionner le répertoire de destination\r
-      Text German=Zielverzeichnis wählen\r
-      Text Spanish=Seleccione el directorio de destino\r
-      Text Italian=Selezionare Directory di destinazione\r
-    end\r
-    item: Listbox\r
-      Rectangle=108 58 321 219\r
-      Variable=MAINDIR\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000100000010000000101000001\r
-      Flags=0000110000001010\r
-      Text=%MAINDIR%\r
-      Text=\r
-    end\r
-    item: Static\r
-      Rectangle=108 40 313 58\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Please select a directory for the %APPTITLE% files.\r
-    end\r
-  end\r
-  item: Dialog\r
-    Title=Select Destination Directory\r
-    Title French=Sélectionner le répertoire de destination\r
-    Title German=Zielverzeichnis wählen\r
-    Title Spanish=Seleccione el directorio de destino\r
-    Title Italian=Selezionare Directory di destinazione\r
-    Width=276\r
-    Height=216\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Listbox\r
-      Rectangle=6 6 204 186\r
-      Variable=MAINDIR\r
-      Create Flags=01010000100000010000000101000000\r
-      Flags=0000110000100010\r
-      Text=%MAINDIR%\r
-      Text French=%MAINDIR%\r
-      Text German=%MAINDIR%\r
-      Text Spanish=%MAINDIR%\r
-      Text Italian=%MAINDIR%\r
-    end\r
-    item: Push Button\r
-      Rectangle=209 8 265 26\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=OK\r
-      Text French=OK\r
-      Text German=OK\r
-      Text Spanish=Aceptar\r
-      Text Italian=OK\r
-    end\r
-    item: Push Button\r
-      Rectangle=209 31 265 50\r
-      Variable=MAINDIR\r
-      Value=%MAINDIR_SAVE%\r
-      Create Flags=01010000000000010000000000000000\r
-      Flags=0000000000000001\r
-      Text=Cancel\r
-      Text French=Annuler\r
-      Text German=Abbrechen\r
-      Text Spanish=Cancelar\r
-      Text Italian=Annulla\r
-    end\r
-  end\r
-end\r
-item: Custom Dialog Set\r
-  Name=Backup Replaced Files\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Fichiers de Sauvegarde Remplacés\r
-    Title German=Sicherungskopie von ersetzten Dateien erstellen\r
-    Title Portuguese=Ficheiros substituídos de segurança\r
-    Title Spanish=Copias de seguridad de los archivos reemplazados\r
-    Title Italian=Backup file sostituiti\r
-    Title Danish=Sikkerhedskopiering af erstattede filer\r
-    Title Dutch=Vervangen bestanden kopiëren\r
-    Title Norwegian=Sikkerhetskopiere erstattede filer\r
-    Title Swedish=Säkerhetskopiera utbytta filer\r
-    Width=350\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 251\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Next >\r
-      Text French=&Suivant>\r
-      Text German=&Weiter>\r
-      Text Portuguese=&Próximo>\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-      Text Danish=&Næste>\r
-      Text Dutch=&Volgende>\r
-      Text Norwegian=&Neste>\r
-      Text Swedish=&Nästa >\r
-    end\r
-    item: Push Button\r
-      Rectangle=131 234 188 251\r
-      Variable=DIRECTION\r
-      Value=B\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=< &Back\r
-      Text French=<&Retour\r
-      Text German=<&Zurück\r
-      Text Portuguese=<&Retornar\r
-      Text Spanish=<&Retroceder\r
-      Text Italian=< &Indietro\r
-      Text Danish=<&Tilbage\r
-      Text Dutch=<&Terug\r
-      Text Norwegian=<&Tilbake\r
-      Text Swedish=< &Tillbaka\r
-    end\r
-    item: Push Button\r
-      Rectangle=278 234 330 251\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=Cancel\r
-      Text French=Annuler\r
-      Text German=Abbrechen\r
-      Text Portuguese=Cancelar\r
-      Text Spanish=Cancelar\r
-      Text Italian=Annulla\r
-      Text Danish=Annuller\r
-      Text Dutch=Annuleren\r
-      Text Norwegian=Avbryt\r
-      Text Swedish=Avbryt\r
-    end\r
-    item: Static\r
-      Rectangle=11 221 329 223\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=108 46 320 98\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=This installation program can create backup copies of all files replaced during the installation. These files will be used when the software is uninstalled and a rollback is requested.  If backup copies are not created, you will only be able to uninstall the software and not roll the system back to a previous state.\r
-      Text=\r
-      Text=Do you want to create backups of replaced files?\r
-      Text French=Le programme d'installation peut créer des copies de sauvegarde de tous les fichiers remplacés pendant l'installation. Ces fichiers sont utilisés au cas où le logiciel est désinstallé et que l'on procède Ã  la reprise du système. Si les copies de sauvegarde ne sont pas créées, on ne pourra que désinstaller le logiciel sans reprendre le système Ã  un Ã©tat précédent. Voulez-vous créer une sauvegarde des fichiers remplacés ?\r
-      Text German=Dieses Installationsprogramm kann Sicherungskopien von allen während der Installation ersetzten Dateien erstellen. Diese Dateien werden zur Rückgängigmachung der Installation und bei Anforderung eines Rollbacks verwendet. Ohne Sicherungskopien ist nur eine Rückgängigmachung der Installation möglich, nicht aber ein Rollback des Systems. Sicherungskopien der ersetzten Dateien erstellen?\r
-      Text Portuguese=Este programa de instalação pode criar cópias de segurança de todos os ficheiros substituídos durante a instalação. Estes ficheiros serão utilizados quando o programa for desinstalado  e for requisitada uma retomada. Se as cópias de segurança não forem criadas, só poderá desinstalar o programa e não pode retomar  um estado anterior do sistema. Deseja criar cópias de segurança dos ficheiros substituídos?\r
-      Text Spanish=Este programa de instalación puede crear copias de seguridad de todos los archivos reemplazados durante la instalación. Estos archivos se utilizarán cuando se desinstale el software y se solicite volver al estado anterior. Si no se crean copias de seguridad, Ãºnicamente podrá desinstalar el software y no podrá devolver el sistema al estado anterior. Â¿Desea crear archivos de seguridad de los archivos reemplazados?\r
-      Text Italian=Questo programma di installazione può creare copie di backup di tutti i file sostituiti durante l\92installazione. Questi file saranno usati quando il software sarà disinstallato e sarà richiesto un ritorno allo stato precedente. Se non crei le copie di backup, potrai solo disinstallare il software, ma non potrai riportare il sistema allo stato precedente. Vuoi creare i file di backup dei file sostituiti?\r
-      Text Danish=Dette installationsprogram kan oprette sikkerhedskopier af alle filer, som erstattes under installationen. Disse filer benyttes, nÃ¥r softwaren fjernes, og den tidligere systemkonfiguration genetableres. Hvis der ikke oprettes sikkerhedskopier, kan du kun fjerne den installerede software og ikke genetablere den tidligere systemkonfiguration. Vil du oprette sikkerhedskopier af filer, som erstattes?\r
-      Text Dutch=Dit installatieprogramma kan kopieën maken van alle bestanden die tijdens de installatie worden vervangen. Deze worden dan gebruikt als de software-installatie ongedaan wordt gemaakt en u het systeem wilt laten terugkeren naar de oorspronkelijke staat. Als er geen back-up kopieën worden gemaakt, kunt u de software enkel verwijderen maar het systeem niet in de oorspronkelijke staat terugbrengen. Wilt u een back-up maken van de vervangen bestanden?\r
-      Text Norwegian=Dette installasjonsprogrammet kan lage sikkerhetskopier av alle filer som blir erstattet under installasjonen. Disse filene vil tas i bruk nÃ¥r programvaren er avinstallert og det er behov for tilbakestilling. Hvis det ikke er laget sikkerhetskopier, kan du kun avinstallere programvaren og ikke stille systemet tilbake til tidligere status. Ã˜nsker du Ã¥ lage sikkerhetskopier av de filene som blir erstattet nÃ¥?\r
-      Text Swedish=Installationsprogrammet kan skapa säkerhetskopior av alla filer som byts ut under installationen. Dessa filer kan sedan användas när programvaran avinstalleras och du begär rollback. Om du dÃ¥ inte har nÃ¥gra säkerhetskopior kan du bara avinstallera programvaran, inte Ã¥terskapa systemet i dess tidigare skick. Vill du göra säkerhetskopior av de ersatta filerna?\r
-    end\r
-    item: Radio Button\r
-      Rectangle=141 106 265 136\r
-      Variable=DOBACKUP\r
-      Create Flags=01010000000000010000000000001001\r
-      Text=&Yes, make backups\r
-      Text=N&o, do not make backups\r
-      Text=\r
-      Text French=&Oui\r
-      Text French=N&on\r
-      Text French=\r
-      Text German=&Ja\r
-      Text German=N&ein\r
-      Text German=\r
-      Text Portuguese=&Sim\r
-      Text Portuguese=Nã&o\r
-      Text Portuguese=\r
-      Text Spanish=&Sí\r
-      Text Spanish=N&o\r
-      Text Spanish=\r
-      Text Italian=&Sì\r
-      Text Italian=N&o\r
-      Text Italian=\r
-      Text Danish=&Ja\r
-      Text Danish=&Nej\r
-      Text Danish=\r
-      Text Dutch=&Ja\r
-      Text Dutch=N&ee\r
-      Text Dutch=\r
-      Text Norwegian=&Ja\r
-      Text Norwegian=&Nei\r
-      Text Norwegian=\r
-      Text Swedish=&Ja\r
-      Text Swedish=N&ej\r
-      Text Swedish=\r
-    end\r
-    item: Static\r
-      Control Name=BACK2\r
-      Rectangle=108 173 320 208\r
-      Action=1\r
-      Create Flags=01010000000000000000000000000111\r
-      Text=Backup File Destination Directory\r
-      Text French=Répertoire de destination des fichiers de sauvegarde\r
-      Text German=Zielverzeichnis für die Sicherungsdatei\r
-      Text Portuguese=Directório de destino de ficheiro de segurança\r
-      Text Spanish=Directorio de Destino de los Archivos de Seguridad\r
-      Text Italian=Directory di destinazione dei file di backup\r
-      Text Danish=Destinationsbibliotek til sikkerhedskopier\r
-      Text Dutch=Doeldirectory backup-bestand\r
-      Text Norwegian=MÃ¥lkatalog for sikkerhetskopier\r
-      Text Swedish=Katalog för säkerhetskopierade filer\r
-    end\r
-    item: Push Button\r
-      Control Name=BACK3\r
-      Rectangle=265 185 318 203\r
-      Variable=BACKUP_SAVE\r
-      Value=%BACKUP%\r
-      Destination Dialog=1\r
-      Action=2\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=B&rowse...\r
-      Text French=P&arcourir\r
-      Text German=B&lättern...\r
-      Text Portuguese=P&rocurar\r
-      Text Spanish=V&isualizar...\r
-      Text Italian=Sfoglia...\r
-      Text Danish=&Gennemse...\r
-      Text Dutch=B&laderen...\r
-      Text Norwegian=Bla igjennom\r
-      Text Swedish=&Bläddra\r
-    end\r
-    item: Static\r
-      Control Name=BACK4\r
-      Rectangle=129 188 254 200\r
-      Destination Dialog=2\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=%BACKUP%\r
-      Text French=%BACKUP%\r
-      Text German=%BACKUP%\r
-      Text Portuguese=%BACKUP%\r
-      Text Spanish=%BACKUP%\r
-      Text Italian=%BACKUP%\r
-      Text Danish=%BACKUP%\r
-      Text Dutch=%BACKUP%\r
-      Text Norwegian=%BACKUP%\r
-      Text Swedish=%BACKUP%\r
-    end\r
-    item: Static\r
-      Rectangle=108 11 323 36\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Backup Replaced Files\r
-      Text French=Sélectionner les composants\r
-      Text German=Komponenten auswählen\r
-      Text Spanish=Seleccione componentes\r
-      Text Italian=Selezionare i componenti\r
-    end\r
-    item: If/While Statement\r
-      Variable=DOBACKUP\r
-      Value=B\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=BACK3\r
-      Operation=1\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=BACK4\r
-      Operation=1\r
-    end\r
-    item: Else Statement\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=BACK3\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=BACK4\r
-    end\r
-    item: End Block\r
-    end\r
-  end\r
-  item: Dialog\r
-    Title=Select Destination Directory\r
-    Title French=Choisissez le répertoire de destination\r
-    Title German=Zielverzeichnis wählen\r
-    Title Portuguese=Seleccionar Directório de Destino\r
-    Title Spanish=Seleccione el Directorio de Destino\r
-    Title Italian=Seleziona Directory di destinazione\r
-    Title Danish=Vælg Destinationsbibliotek\r
-    Title Dutch=Kies Doeldirectory\r
-    Title Norwegian=Velg mÃ¥lkatalog\r
-    Title Swedish=Välj destinationskalatog\r
-    Width=276\r
-    Height=216\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Listbox\r
-      Rectangle=6 3 200 186\r
-      Variable=BACKUP\r
-      Create Flags=01010000100000010000000101000000\r
-      Flags=0000110000100010\r
-      Text=%BACKUP%\r
-      Text=\r
-      Text French=%BACKUP%\r
-      Text French=\r
-      Text German=%BACKUP%\r
-      Text German=\r
-      Text Portuguese=%BACKUP%\r
-      Text Portuguese=\r
-      Text Spanish=%BACKUP%\r
-      Text Spanish=\r
-      Text Italian=%BACKUP%\r
-      Text Italian=\r
-      Text Danish=%BACKUP%\r
-      Text Danish=\r
-      Text Dutch=%BACKUP%\r
-      Text Dutch=\r
-      Text Norwegian=%BACKUP%\r
-      Text Norwegian=\r
-      Text Swedish=%BACKUP%\r
-      Text Swedish=\r
-    end\r
-    item: Push Button\r
-      Rectangle=209 8 265 26\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=OK\r
-      Text French=OK\r
-      Text German=OK\r
-      Text Portuguese=OK\r
-      Text Spanish=ACEPTAR\r
-      Text Italian=OK\r
-      Text Danish=OK\r
-      Text Dutch=OK\r
-      Text Norwegian=OK\r
-      Text Swedish=OK\r
-    end\r
-    item: Push Button\r
-      Rectangle=209 31 265 50\r
-      Variable=BACKUP\r
-      Value=%BACKUP_SAVE%\r
-      Create Flags=01010000000000010000000000000000\r
-      Flags=0000000000000001\r
-      Text=Cancel\r
-      Text French=Annuler\r
-      Text German=Abbrechen\r
-      Text Portuguese=Cancelar\r
-      Text Spanish=Cancelar\r
-      Text Italian=Annulla\r
-      Text Danish=Slet\r
-      Text Dutch=Annuleren\r
-      Text Norwegian=Avbryt\r
-      Text Swedish=Avbryt\r
-    end\r
-  end\r
-end\r
-item: Custom Dialog Set\r
-  Name=Select Components\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Installation de %APPTITLE%\r
-    Title German=Installation von %APPTITLE%\r
-    Title Spanish=Instalación de %APPTITLE%\r
-    Title Italian=Installazione di %APPTITLE%\r
-    Width=339\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 253\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Next >\r
-      Text French=&Suite >\r
-      Text German=&Weiter >\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-    end\r
-    item: Push Button\r
-      Rectangle=131 234 188 253\r
-      Variable=DIRECTION\r
-      Value=B\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=< &Back\r
-      Text French=< &Retour\r
-      Text German=< &Zurück\r
-      Text Spanish=< &Atrás\r
-      Text Italian=< &Indietro\r
-    end\r
-    item: Push Button\r
-      Rectangle=264 234 320 253\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=&Cancel\r
-      Text French=&Annuler\r
-      Text German=&Abbrechen\r
-      Text Spanish=&Cancelar\r
-      Text Italian=&Annulla\r
-    end\r
-    item: Checkbox\r
-      Rectangle=108 66 313 156\r
-      Variable=COMPONENTS\r
-      Create Flags=01010000000000010000000000000011\r
-      Flags=0000000000000110\r
-      Text=Python interpreter and libraries\r
-      Text=Tcl/Tk (Tkinter, IDLE, pydoc)\r
-      Text=Python HTML docs\r
-      Text=Python utility scripts (Tools/)\r
-      Text=Python test suite (Lib/test/)\r
-      Text=\r
-      Text French=Python interpreter, library and IDLE\r
-      Text French=Python HTML docs\r
-      Text French=Python utility scripts (Tools/)\r
-      Text French=Python test suite (Lib/test/)\r
-      Text French=\r
-      Text German=Python interpreter, library and IDLE\r
-      Text German=Python HTML docs\r
-      Text German=Python utility scripts (Tools/)\r
-      Text German=Python test suite (Lib/test/)\r
-      Text German=\r
-      Text Spanish=Python interpreter, library and IDLE\r
-      Text Spanish=Python HTML docs\r
-      Text Spanish=Python utility scripts (Tools/)\r
-      Text Spanish=Python test suite (Lib/test/)\r
-      Text Spanish=\r
-      Text Italian=Python interpreter, library and IDLE\r
-      Text Italian=Python HTML docs\r
-      Text Italian=Python utility scripts (Tools/)\r
-      Text Italian=Python test suite (Lib/test/)\r
-      Text Italian=\r
-    end\r
-    item: Static\r
-      Rectangle=108 45 320 63\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Choose which components to install by checking the boxes below.\r
-      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.\r
-      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.\r
-      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.\r
-      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.\r
-    end\r
-    item: Push Button\r
-      Rectangle=188 203 269 220\r
-      Destination Dialog=1\r
-      Action=2\r
-      Enabled Color=00000000000000000000000011111111\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=Advanced Options ...\r
-    end\r
-    item: Static\r
-      Rectangle=10 225 320 226\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=108 10 323 43\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Select Components\r
-      Text French=Sélectionner les composants\r
-      Text German=Komponenten auswählen\r
-      Text Spanish=Seleccione componentes\r
-      Text Italian=Selezionare i componenti\r
-    end\r
-    item: Static\r
-      Rectangle=251 180 311 193\r
-      Variable=COMPONENTS\r
-      Value=MAINDIR\r
-      Create Flags=01010000000000000000000000000010\r
-    end\r
-    item: Static\r
-      Rectangle=251 168 311 179\r
-      Variable=COMPONENTS\r
-      Create Flags=01010000000000000000000000000010\r
-    end\r
-    item: Static\r
-      Rectangle=123 168 234 181\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Disk Space Required:\r
-      Text French=Espace disque requis :\r
-      Text German=Notwendiger Speicherplatz:\r
-      Text Spanish=Espacio requerido en el disco:\r
-      Text Italian=Spazio su disco necessario:\r
-    end\r
-    item: Static\r
-      Rectangle=123 180 234 193\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Disk Space Remaining:\r
-      Text French=Espace disque disponible :\r
-      Text German=Verbleibender Speicherplatz:\r
-      Text Spanish=Espacio en disco disponible:\r
-      Text Italian=Spazio su disco disponibile:\r
-    end\r
-    item: Static\r
-      Rectangle=108 158 320 196\r
-      Action=1\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: If/While Statement\r
-      Variable=DLG_EVENT_TYPE\r
-      Value=VERIFY\r
-    end\r
-    item: Remark\r
-      Text=If they're installing Tcl/Tk, Tools, or the test suite, doesn't make much sense unless they're installing Python too.\r
-    end\r
-    item: If/While Statement\r
-      Variable=COMPONENTS\r
-      Value=BDE\r
-      Flags=00001010\r
-    end\r
-    item: If/While Statement\r
-      Variable=COMPONENTS\r
-      Value=A\r
-      Flags=00000011\r
-    end\r
-    item: Display Message\r
-      Title=Are you sure?\r
-      Text=Installing Tcl/Tk, Tools or the test suite doesn't make much sense unless you install the Python interpreter and libraries too.\r
-      Text=\r
-      Text=Click Yes if that's really what you want.\r
-      Flags=00101101\r
-    end\r
-    item: Remark\r
-      Text=Nothing -- just proceed to the next dialog.\r
-    end\r
-    item: Else Statement\r
-    end\r
-    item: Remark\r
-      Text=Return to the dialog.\r
-    end\r
-    item: Set Variable\r
-      Variable=DLG_EVENT_TYPE\r
-    end\r
-    item: End Block\r
-    end\r
-    item: End Block\r
-    end\r
-    item: End Block\r
-    end\r
-    item: End Block\r
-    end\r
-  end\r
-  item: Dialog\r
-    Title=Advanced Options\r
-    Width=339\r
-    Height=213\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Radio Button\r
-      Control Name=ADMIN2\r
-      Rectangle=11 46 90 76\r
-      Variable=SELECT_ADMIN\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000010000000000001001\r
-      Text=Admin install\r
-      Text=Non-Admin installl\r
-      Text=\r
-    end\r
-    item: Push Button\r
-      Rectangle=188 170 244 189\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=OK\r
-      Text French=&Suite >\r
-      Text German=&Weiter >\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-    end\r
-    item: Static\r
-      Rectangle=5 3 326 83\r
-      Action=1\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Control Name=ADMIN1\r
-      Rectangle=11 11 321 45\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=By default, the install records settings in the per-machine area of the registry (HKLM), and installs the Python and C runtime DLLs to %SYS32%.  Choose "Non-Admin install" if you would prefer settings made in the per-user registry (HKCU), and DLLs installed in %MAINDIR%.\r
-    end\r
-    item: Static\r
-      Rectangle=5 90 326 157\r
-      Action=1\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Checkbox\r
-      Rectangle=11 121 243 151\r
-      Variable=TASKS\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000010000000000000011\r
-      Text=Register file extensions (.py, .pyw, .pyc, .pyo)\r
-      Text=Create Start Menu shortcuts\r
-      Text=\r
-    end\r
-    item: Static\r
-      Rectangle=11 103 320 121\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Choose tasks to perform by checking the boxes below.\r
-    end\r
-    item: If/While Statement\r
-      Variable=DLG_EVENT_TYPE\r
-      Value=INIT\r
-    end\r
-    item: If/While Statement\r
-      Variable=DOADMIN\r
-      Value=1\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=ADMIN2\r
-    end\r
-    item: Else Statement\r
-    end\r
-    item: Set Control Text\r
-      Control Name=ADMIN1\r
-      Control Text=This section is available only if logged in to an account with Administrator privileges.\r
-    end\r
-    item: Set Control Attribute\r
-      Control Name=ADMIN2\r
-      Operation=1\r
-    end\r
-    item: End Block\r
-    end\r
-    item: End Block\r
-    end\r
-  end\r
-end\r
-item: Custom Dialog Set\r
-  Name=Select Program Manager Group\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Installation de %APPTITLE%\r
-    Title German=Installation von %APPTITLE%\r
-    Title Spanish=Instalación de %APPTITLE%\r
-    Title Italian=Installazione di %APPTITLE%\r
-    Width=339\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 253\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Next >\r
-      Text French=&Suite >\r
-      Text German=&Weiter >\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-    end\r
-    item: Push Button\r
-      Rectangle=131 234 188 253\r
-      Variable=DIRECTION\r
-      Value=B\r
-      Create Flags=01010000000000010000000000000000\r
-      Flags=0000000000000001\r
-      Text=< &Back\r
-      Text French=< &Retour\r
-      Text German=< &Zurück\r
-      Text Spanish=< &Atrás\r
-      Text Italian=< &Indietro\r
-    end\r
-    item: Push Button\r
-      Rectangle=264 234 320 253\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=&Cancel\r
-      Text French=&Annuler\r
-      Text German=&Abbrechen\r
-      Text Spanish=&Cancelar\r
-      Text Italian=&Annulla\r
-    end\r
-    item: Static\r
-      Rectangle=10 225 320 226\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=108 10 323 53\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Select Start Menu Group\r
-      Text French=Sélectionner le groupe du Gestionnaire de programme\r
-      Text German=Bestimmung der Programm-Managergruppe\r
-      Text Spanish=Seleccione grupo del Administrador de programas\r
-      Text Italian=Selezionare il gruppo ProgMan\r
-    end\r
-    item: Static\r
-      Rectangle=108 35 320 65\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Enter the name of the Start Menu program group to which to add the %APPTITLE% icons:\r
-      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :\r
-      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:\r
-      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:\r
-      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:\r
-    end\r
-    item: Combobox\r
-      Rectangle=108 56 320 219\r
-      Variable=GROUP\r
-      Create Flags=01010000001000010000001100000001\r
-      Flags=0000000000000001\r
-      Text=%GROUP%\r
-      Text=\r
-      Text French=%GROUP%\r
-      Text German=%GROUP%\r
-      Text Spanish=%GROUP%\r
-      Text Italian=%GROUP%\r
-    end\r
-  end\r
-end\r
-item: Custom Dialog Set\r
-  Name=Start Installation\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Installation de %APPTITLE%\r
-    Title German=Installation von %APPTITLE%\r
-    Title Spanish=Instalación de %APPTITLE%\r
-    Title Italian=Installazione di %APPTITLE%\r
-    Width=339\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 253\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Next >\r
-      Text French=&Suite >\r
-      Text German=&Weiter >\r
-      Text Spanish=&Siguiente >\r
-      Text Italian=&Avanti >\r
-    end\r
-    item: Push Button\r
-      Rectangle=131 234 188 253\r
-      Variable=DIRECTION\r
-      Value=B\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=< &Back\r
-      Text French=< &Retour\r
-      Text German=< &Zurück\r
-      Text Spanish=< &Atrás\r
-      Text Italian=< &Indietro\r
-    end\r
-    item: Push Button\r
-      Rectangle=264 234 320 253\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=&Cancel\r
-      Text French=&Annuler\r
-      Text German=&Abbrechen\r
-      Text Spanish=&Cancelar\r
-      Text Italian=&Annulla\r
-    end\r
-    item: Static\r
-      Rectangle=10 225 320 226\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=108 10 323 53\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Ready to Install!\r
-      Text French=Prêt Ã  installer !\r
-      Text German=Installationsbereit!\r
-      Text Spanish=¡Preparado para la instalación!\r
-      Text Italian=Pronto per l'installazione!\r
-    end\r
-    item: Static\r
-      Rectangle=108 40 320 62\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Click the Next button to install %APPTITLE%, or the Back button to change choices:\r
-      Text French=Vous Ãªtes maintenant prêt Ã  installer les fichiers %APPTITLE%.\r
-      Text French=\r
-      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation Ã  nouveau.\r
-      Text German=Sie können %APPTITLE% nun installieren.\r
-      Text German=\r
-      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben.\r
-      Text Spanish=Ya está listo para instalar %APPTITLE%.\r
-      Text Spanish=\r
-      Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación.\r
-      Text Italian=Ora Ã¨ possibile installare %APPTITLE%.\r
-      Text Italian=\r
-      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.\r
-    end\r
-    item: Editbox\r
-      Rectangle=108 66 324 219\r
-      Help Context=16711681\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000100000000001100011000100\r
-      Text=%SUMMARY%\r
-    end\r
-  end\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=DISPLAY\r
-  Value=Select Destination Directory\r
-end\r
-item: Remark\r
-  Text=User may have changed MAINDIR, so reset BACKUP to match.\r
-end\r
-item: Set Variable\r
-  Variable=BACKUP\r
-  Value=%MAINDIR%\BACKUP\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=BEGIN WIZARD STUFF -----------------------------------------------------------------------------------------------------------------------------\r
-end\r
-item: Remark\r
-  Text=When the BACKUP feature is enabled, the BACKUPDIR is initialized\r
-end\r
-item: If/While Statement\r
-  Variable=DOBACKUP\r
-  Value=A\r
-end\r
-item: Set Variable\r
-  Variable=BACKUPDIR\r
-  Value=%BACKUP%\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-  Text=The BRANDING information is written to the INI file on the installation media.\r
-end\r
-item: If/While Statement\r
-  Variable=BRANDING\r
-  Value=1\r
-end\r
-item: If/While Statement\r
-  Variable=DOBRAND\r
-  Value=1\r
-end\r
-item: Edit INI File\r
-  Pathname=%INST%\CUSTDATA.INI\r
-  Settings=[Registration]\r
-  Settings=NAME=%NAME%\r
-  Settings=COMPANY=%COMPANY%\r
-  Settings=\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-  Text=Begin writing to the INSTALL.LOG\r
-end\r
-item: Open/Close INSTALL.LOG\r
-end\r
-item: Remark\r
-  Text=Check free disk space calculates free disk space as well as component sizes.\r
-end\r
-item: Remark\r
-  Text=It should be located before all Install File actions.\r
-end\r
-item: Check Disk Space\r
-  Component=COMPONENTS\r
-end\r
-item: Remark\r
-  Text=This include script allows uninstall support\r
-end\r
-item: Remark\r
-  Text=Note from Tim:  this is our own Uninstal.wse, a copy of Wise's except\r
-end\r
-item: Remark\r
-  Text=it writes to HKCU (instead of HKLM) if the user doesn't have admin privs.\r
-end\r
-item: Include Script\r
-  Pathname=.\Uninstal.wse\r
-end\r
-item: Remark\r
-  Text=Note from Tim: these seeming no-ops actually convert to short filenames.\r
-end\r
-item: Set Variable\r
-  Variable=COMMON\r
-  Value=%COMMON%\r
-  Flags=00010100\r
-end\r
-item: Set Variable\r
-  Variable=MAINDIR\r
-  Value=%MAINDIR%\r
-  Flags=00010100\r
-end\r
-item: Remark\r
-  Text=This IF/THEN/ELSE reads the correct registry entries for shortcut/icon placement\r
-end\r
-item: Check Configuration\r
-  Flags=10111011\r
-end\r
-item: Get Registry Key Value\r
-  Variable=STARTUPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%WIN%\Start Menu\Programs\StartUp\r
-  Value Name=StartUp\r
-  Flags=00000010\r
-end\r
-item: Get Registry Key Value\r
-  Variable=DESKTOPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%WIN%\Desktop\r
-  Value Name=Desktop\r
-  Flags=00000010\r
-end\r
-item: Get Registry Key Value\r
-  Variable=STARTMENUDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%WIN%\Start Menu\r
-  Value Name=Start Menu\r
-  Flags=00000010\r
-end\r
-item: Get Registry Key Value\r
-  Variable=GROUPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%WIN%\Start Menu\Programs\r
-  Value Name=Programs\r
-  Flags=00000010\r
-end\r
-item: Get Registry Key Value\r
-  Variable=CSTARTUPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%STARTUPDIR%\r
-  Value Name=Common Startup\r
-  Flags=00000100\r
-end\r
-item: Get Registry Key Value\r
-  Variable=CDESKTOPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%DESKTOPDIR%\r
-  Value Name=Common Desktop\r
-  Flags=00000100\r
-end\r
-item: Get Registry Key Value\r
-  Variable=CSTARTMENUDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%STARTMENUDIR%\r
-  Value Name=Common Start Menu\r
-  Flags=00000100\r
-end\r
-item: Get Registry Key Value\r
-  Variable=CGROUPDIR\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
-  Default=%GROUPDIR%\r
-  Value Name=Common Programs\r
-  Flags=00000100\r
-end\r
-item: Else Statement\r
-end\r
-item: Remark\r
-  Text=Note from Tim:  the Wizard left this block empty!\r
-end\r
-item: Remark\r
-  Text=Perhaps it's only relevant on Windows 3.1.\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-  Text=END WIZARD STUFF -----------------------------------------------------------------------------------------------------------------------------\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=SELECT_ADMIN\r
-  Value=B\r
-end\r
-item: Remark\r
-  Text=The user chose a non-admin install in "Advanced Options".\r
-end\r
-item: Remark\r
-  Text=This should come after the include of Uninstal.wse above, because\r
-end\r
-item: Remark\r
-  Text=writing uninstall info to HKCU is ineffective except under Win2K.\r
-end\r
-item: Set Variable\r
-  Variable=DOADMIN\r
-  Value=0\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Set Variable\r
-  Variable=CGROUP_SAVE\r
-  Value=%GROUP%\r
-end\r
-item: If/While Statement\r
-  Variable=TASKS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Set Variable\r
-  Variable=GROUP\r
-  Value=%CGROUPDIR%\%GROUP%\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=GROUP\r
-  Value=%GROUPDIR%\%GROUP%\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Long section to install files.\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Set Variable\r
-  Variable=DLLDEST\r
-  Value=%SYS32%\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=DLLDEST\r
-  Value=%MAINDIR%\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Install the license even if they deselect everything <wink>.\r
-end\r
-item: Install File\r
-  Source=..\license\r
-  Destination=%MAINDIR%\LICENSE.txt\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\readme\r
-  Destination=%MAINDIR%\README.txt\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\misc\news\r
-  Destination=%MAINDIR%\NEWS.txt\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-  Text=Icons -- always install so that the uninstaller can use them for its own display.\r
-end\r
-item: Install File\r
-  Source=..\pc\pycon.ico\r
-  Destination=%MAINDIR%\pycon.ico\r
-  Flags=0000000010000010\r
-end\r
-item: Install File\r
-  Source=..\pc\pyc.ico\r
-  Destination=%MAINDIR%\pyc.ico\r
-  Flags=0000000010000010\r
-end\r
-item: Install File\r
-  Source=..\pc\py.ico\r
-  Destination=%MAINDIR%\py.ico\r
-  Flags=0000000010000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=These arrange to (recursively!) delete all .pyc and .pyo files at uninstall time.\r
-end\r
-item: Remark\r
-  Text=This "does the right thing":  any directories left empty at the end are removed.\r
-end\r
-item: Add Text to INSTALL.LOG\r
-  Text=File Tree: %MAINDIR%\*.pyc\r
-end\r
-item: Add Text to INSTALL.LOG\r
-  Text=File Tree: %MAINDIR%\*.pyo\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=A: interpreter and libraries\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: Remark\r
-  Text=Executables\r
-end\r
-item: Install File\r
-  Source=.\python.exe\r
-  Destination=%MAINDIR%\python.exe\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\pythonw.exe\r
-  Destination=%MAINDIR%\pythonw.exe\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\w9xpopen.exe\r
-  Destination=%MAINDIR%\w9xpopen.exe\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Extension module DLLs (.pyd); keep in synch with libs directory next\r
-end\r
-item: Install File\r
-  Source=.\_winreg.pyd\r
-  Destination=%MAINDIR%\DLLs\_winreg.pyd\r
-  Description=Extension modules\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_csv.pyd\r
-  Destination=%MAINDIR%\DLLs\_csv.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_sre.pyd\r
-  Destination=%MAINDIR%\DLLs\_sre.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_ssl.pyd\r
-  Destination=%MAINDIR%\DLLs\_ssl.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_symtable.pyd\r
-  Destination=%MAINDIR%\DLLs\_symtable.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_testcapi.pyd\r
-  Destination=%MAINDIR%\DLLs\_testcapi.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_tkinter.pyd\r
-  Destination=%MAINDIR%\DLLs\_tkinter.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_socket.pyd\r
-  Destination=%MAINDIR%\DLLs\_socket.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_bsddb.pyd\r
-  Destination=%MAINDIR%\DLLs\_bsddb.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\bz2.pyd\r
-  Destination=%MAINDIR%\DLLs\bz2.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\datetime.pyd\r
-  Destination=%MAINDIR%\DLLs\datetime.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\mmap.pyd\r
-  Destination=%MAINDIR%\DLLs\mmap.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\parser.pyd\r
-  Destination=%MAINDIR%\DLLs\parser.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\pyexpat.pyd\r
-  Destination=%MAINDIR%\DLLs\pyexpat.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\select.pyd\r
-  Destination=%MAINDIR%\DLLs\select.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\unicodedata.pyd\r
-  Destination=%MAINDIR%\DLLs\unicodedata.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\winsound.pyd\r
-  Destination=%MAINDIR%\DLLs\winsound.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\zlib.pyd\r
-  Destination=%MAINDIR%\DLLs\zlib.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Link libraries (.lib); keep in synch with DLLs above, except that the Python lib lives here.\r
-end\r
-item: Install File\r
-  Source=.\_winreg.lib\r
-  Destination=%MAINDIR%\libs\_winreg.lib\r
-  Description=Link library files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_csv.lib\r
-  Destination=%MAINDIR%\libs\_csv.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_sre.lib\r
-  Destination=%MAINDIR%\libs\_sre.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_ssl.lib\r
-  Destination=%MAINDIR%\libs\_ssl.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_symtable.lib\r
-  Destination=%MAINDIR%\libs\_symtable.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_testcapi.lib\r
-  Destination=%MAINDIR%\libs\_testcapi.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_tkinter.lib\r
-  Destination=%MAINDIR%\libs\_tkinter.lib\r
-  Description=Extension modules\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_socket.lib\r
-  Destination=%MAINDIR%\libs\_socket.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\_bsddb.lib\r
-  Destination=%MAINDIR%\libs\_bsddb.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\bz2.lib\r
-  Destination=%MAINDIR%\libs\bz2.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\datetime.lib\r
-  Destination=%MAINDIR%\libs\datetime.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\mmap.lib\r
-  Destination=%MAINDIR%\libs\mmap.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\parser.lib\r
-  Destination=%MAINDIR%\libs\parser.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\pyexpat.lib\r
-  Destination=%MAINDIR%\libs\pyexpat.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\select.lib\r
-  Destination=%MAINDIR%\libs\select.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\unicodedata.lib\r
-  Destination=%MAINDIR%\libs\unicodedata.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\winsound.lib\r
-  Destination=%MAINDIR%\libs\winsound.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=.\zlib.lib\r
-  Destination=%MAINDIR%\libs\zlib.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=.\python%_pymajor_%%_pyminor_%.lib\r
-  Destination=%MAINDIR%\libs\python%_PYMAJOR_%%_PYMINOR_%.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Main Python DLL\r
-end\r
-item: Remark\r
-  Text=Tell Wise it's OK to delete the Python DLL at uninstall time,\r
-end\r
-item: Remark\r
-  Text=despite that we (may) write it into a system directory.\r
-end\r
-item: Add Text to INSTALL.LOG\r
-  Text=Non-System File:\r
-end\r
-item: Install File\r
-  Source=.\python%_pymajor_%%_pyminor_%.dll\r
-  Destination=%DLLDEST%\python%_PYMAJOR_%%_PYMINOR_%.dll\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Libraries (Lib/)\r
-end\r
-item: Install File\r
-  Source=..\lib\*.py\r
-  Destination=%MAINDIR%\Lib\r
-  Description=Library Modules\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\bsddb\*.py\r
-  Destination=%MAINDIR%\Lib\bsddb\r
-  Description=Berkeley database package\r
-  Flags=0000000100000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\compiler\*.py\r
-  Destination=%MAINDIR%\Lib\compiler\r
-  Description=Python compiler written in Python\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\distutils\*.py\r
-  Destination=%MAINDIR%\Lib\distutils\r
-  Description=Distribution utility modules\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\distutils\readme\r
-  Destination=%MAINDIR%\Lib\distutils\README.txt\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\distutils\command\*.py\r
-  Destination=%MAINDIR%\Lib\distutils\command\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\distutils\command\wininst.exe\r
-  Destination=%MAINDIR%\Lib\distutils\command\wininst.exe\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\distutils\command\command_template\r
-  Destination=%MAINDIR%\Lib\distutils\command\command_template\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\email\*.py\r
-  Destination=%MAINDIR%\Lib\email\r
-  Description=Library email package\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\email\test\*.py\r
-  Destination=%MAINDIR%\Lib\email\test\r
-  Description=email tests\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\email\test\data\*.txt\r
-  Destination=%MAINDIR%\Lib\email\test\data\r
-  Description=email test data\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\email\test\data\*.gif\r
-  Destination=%MAINDIR%\Lib\email\test\data\r
-  Description=email test data\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\email\test\data\*.au\r
-  Destination=%MAINDIR%\Lib\email\test\data\r
-  Description=email test data\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\encodings\*.py\r
-  Destination=%MAINDIR%\Lib\encodings\r
-  Description=Unicode encoding tables\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\hotshot\*.py\r
-  Destination=%MAINDIR%\Lib\hotshot\r
-  Description=Fast Python profiler\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\lib-old\*.py\r
-  Destination=%MAINDIR%\Lib\lib-old\r
-  Description=Obsolete modules\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\lib-tk\*.py\r
-  Destination=%MAINDIR%\Lib\lib-tk\r
-  Description=Tkinter related library modules\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\logging\*.py\r
-  Destination=%MAINDIR%\Lib\logging\r
-  Description=Logging package\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\site-packages\readme\r
-  Destination=%MAINDIR%\Lib\site-packages\README.txt\r
-  Description=Site packages\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\xml\*.py\r
-  Destination=%MAINDIR%\Lib\xml\r
-  Description=XML support packages\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\xml\dom\*.py\r
-  Destination=%MAINDIR%\Lib\xml\dom\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\xml\parsers\*.py\r
-  Destination=%MAINDIR%\Lib\xml\parsers\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\xml\sax\*.py\r
-  Destination=%MAINDIR%\Lib\xml\sax\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=C Include files\r
-end\r
-item: Install File\r
-  Source=..\include\*.h\r
-  Destination=%MAINDIR%\include\r
-  Description=Header files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\pc\pyconfig.h\r
-  Destination=%MAINDIR%\include\pyconfig.h\r
-  Description=Header files (pyconfig.h)\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Microsoft C runtime libraries\r
-end\r
-item: Install File\r
-  Source=%_SYS_%\MSVCIRT.DLL\r
-  Destination=%DLLDEST%\MSVCIRT.DLL\r
-  Description=Visual C++ Runtime DLLs\r
-  Flags=0000011000010011\r
-end\r
-item: Install File\r
-  Source=%_SYS_%\MSVCRT.DLL\r
-  Destination=%DLLDEST%\MSVCRT.DLL\r
-  Description=Visual C++ Runtime DLLs\r
-  Flags=0000011000010011\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=B: Tcl/Tk (Tkinter, IDLE, pydoc)\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: Remark\r
-  Text=Tcl/Tk\r
-end\r
-item: Install File\r
-  Source=..\..\%_tcldir_%\bin\*.dll\r
-  Destination=%MAINDIR%\DLLs\r
-  Description=Tcl/Tk binaries and libraries\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\..\%_tcldir_%\lib\*.*\r
-  Destination=%MAINDIR%\tcl\r
-  Description=Tcl/Tk binaries and libraries\r
-  Flags=0000000100000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=IDLE\r
-end\r
-item: Install File\r
-  Source=..\Lib\idlelib\*.py\r
-  Destination=%MAINDIR%\Lib\idlelib\r
-  Description=Integrated DeveLopment Environment for Python\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\Lib\idlelib\*.txt\r
-  Destination=%MAINDIR%\Lib\idlelib\r
-  Description=Integrated DeveLopment Environment for Python\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\Lib\idlelib\*.def\r
-  Destination=%MAINDIR%\Lib\idlelib\r
-  Description=Integrated DeveLopment Environment for Python\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\Lib\idlelib\Icons\*\r
-  Destination=%MAINDIR%\Lib\idlelib\Icons\r
-  Description=Integrated DeveLopment Environment for Python\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\Tools\scripts\idle\r
-  Destination=%MAINDIR%\Lib\idlelib\idle.pyw\r
-  Description=IDLE bootstrap script\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Windows pydoc driver\r
-end\r
-item: Install File\r
-  Source=..\tools\scripts\*.pyw\r
-  Destination=%MAINDIR%\Tools\Scripts\r
-  Description=Windows pydoc driver\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=C: docs\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=C\r
-  Flags=00000010\r
-end\r
-item: Install File\r
-  Source=%_DOC_%\*.*\r
-  Destination=%MAINDIR%\Doc\r
-  Description=Python Documentation (HTML)\r
-  Flags=0000000100000010\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=D: tools\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=D\r
-  Flags=00000010\r
-end\r
-item: Install File\r
-  Source=..\tools\scripts\*.py\r
-  Destination=%MAINDIR%\Tools\Scripts\r
-  Description=Utility Scripts\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\scripts\*.doc\r
-  Destination=%MAINDIR%\Tools\Scripts\r
-  Description=Utility Scripts\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\scripts\readme\r
-  Destination=%MAINDIR%\Tools\Scripts\README.txt\r
-  Description=Utility Scripts\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\tools\webchecker\*.py\r
-  Destination=%MAINDIR%\Tools\webchecker\r
-  Description=Web checker tool\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\webchecker\readme\r
-  Destination=%MAINDIR%\Tools\webchecker\README.txt\r
-  Description=Web checker tool\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\tools\versioncheck\*.py\r
-  Destination=%MAINDIR%\Tools\versioncheck\r
-  Description=Version checker tool\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\versioncheck\readme\r
-  Destination=%MAINDIR%\Tools\versioncheck\README.txt\r
-  Description=Version checker tool\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\*.py\r
-  Destination=%MAINDIR%\Tools\pynche\r
-  Description=pynche color editor\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\*.txt\r
-  Destination=%MAINDIR%\Tools\pynche\r
-  Description=pynche color editor\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\x\*.txt\r
-  Destination=%MAINDIR%\Tools\pynche\X\r
-  Description=pynche color editor - X files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\readme\r
-  Destination=%MAINDIR%\Tools\pynche\README.txt\r
-  Description=pynche color editor - README\r
-  Flags=0000000100000010\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\pynche\r
-  Destination=%MAINDIR%\Tools\pynche\pynche.py\r
-  Description=pynche color editor - main\r
-  Flags=0000000100000010\r
-end\r
-item: Install File\r
-  Source=..\tools\pynche\pynche.pyw\r
-  Destination=%MAINDIR%\Tools\pynche\pynche.pyw\r
-  Description=pynche color editor - noconsole main\r
-  Flags=0000000100000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\tools\i18n\*.py\r
-  Destination=%MAINDIR%\Tools\i18n\r
-  Description=Internationalization helpers\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=E: test suite\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=E\r
-  Flags=00000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\audiotest.au\r
-  Destination=%MAINDIR%\Lib\test\audiotest.au\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.uue\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.py\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.xml\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.out\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.bz2\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.tar\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.gz\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=..\lib\test\*.txt\r
-  Destination=%MAINDIR%\Lib\test\r
-  Description=Python Test files\r
-  Flags=0000000000000010\r
-end\r
-item: Remark\r
-end\r
-item: Install File\r
-  Source=..\lib\test\output\*.*\r
-  Destination=%MAINDIR%\Lib\test\output\r
-  Description=Python Test output files\r
-  Flags=0000000000000010\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=DONE with file copying.\r
-end\r
-item: Remark\r
-  Text=The rest is registry and Start Menu fiddling.\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: If/While Statement\r
-  Variable=TASKS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: Remark\r
-  Text=Register file extensions.  As usual, Admin privs get in the way, but with a twist:\r
-end\r
-item: Remark\r
-  Text=You don't need admin privs to write to HKEY_CLASSES_ROOT *except* under Win2K.\r
-end\r
-item: Remark\r
-  Text=On Win2K, a user without Admin privs has to register extensions under HKCU\Software\CLASSES instead.\r
-end\r
-item: Remark\r
-  Text=But while you can *do* that under other flavors of Windows too, it has no useful effect except in Win2K.\r
-end\r
-item: Set Variable\r
-  Variable=USE_HKCR\r
-  Value=1\r
-end\r
-item: Check Configuration\r
-  Flags=11110010\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=0\r
-end\r
-item: Set Variable\r
-  Variable=USE_HKCR\r
-  Value=0\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=USE_HKCR\r
-  Value=1\r
-end\r
-item: Remark\r
-  Text=File types.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.File\r
-  New Value=Python File\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.File\shell\open\command\r
-  New Value=%MAINDIR%\python.exe "%%1" %%*\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.File\DefaultIcon\r
-  New Value=%MAINDIR%\Py.ico\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.NoConFile\r
-  New Value=Python File (no console)\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.NoConFile\shell\open\command\r
-  New Value=%MAINDIR%\pythonw.exe "%%1" %%*\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.NoConFile\DefaultIcon\r
-  New Value=%MAINDIR%\Py.ico\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.CompiledFile\r
-  New Value=Compiled Python File\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.CompiledFile\shell\open\command\r
-  New Value=%MAINDIR%\python.exe "%%1" %%*\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.CompiledFile\DefaultIcon\r
-  New Value=%MAINDIR%\pyc.ico\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=File extensions.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.py\r
-  New Value=Python.File\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.py\r
-  New Value=text/plain\r
-  Value Name=Content Type\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.pyw\r
-  New Value=Python.NoConFile\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.pyw\r
-  New Value=text/plain\r
-  Value Name=Content Type\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.pyc\r
-  New Value=Python.CompiledFile\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=.pyo\r
-  New Value=Python.CompiledFile\r
-end\r
-item: Else Statement\r
-end\r
-item: Remark\r
-  Text=File types.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.File\r
-  New Value=Python File\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.File\shell\open\command\r
-  New Value=%MAINDIR%\python.exe "%%1" %%*\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.File\DefaultIcon\r
-  New Value=%MAINDIR%\Py.ico\r
-  Root=1\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.NoConFile\r
-  New Value=Python File (no console)\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.NoConFile\shell\open\command\r
-  New Value=%MAINDIR%\pythonw.exe "%%1" %%*\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.NoConFile\DefaultIcon\r
-  New Value=%MAINDIR%\Py.ico\r
-  Root=1\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.CompiledFile\r
-  New Value=Compiled Python File\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.CompiledFile\shell\open\command\r
-  New Value=%MAINDIR%\python.exe "%%1" %%*\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.CompiledFile\DefaultIcon\r
-  New Value=%MAINDIR%\pyc.ico\r
-  Root=1\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=File extensions.\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.py\r
-  New Value=Python.File\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.py\r
-  New Value=text/plain\r
-  Value Name=Content Type\r
-  Root=1\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.pyw\r
-  New Value=Python.NoConFile\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.pyw\r
-  New Value=text/plain\r
-  Value Name=Content Type\r
-  Root=1\r
-end\r
-item: Remark\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.pyc\r
-  New Value=Python.CompiledFile\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\.pyo\r
-  New Value=Python.CompiledFile\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=If we're installing IDLE, also set an Edit context menu action to use IDLE, for .py and .pyw files.\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: If/While Statement\r
-  Variable=USE_HKCR\r
-  Value=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.NoConFile\shell\Edit with IDLE\command\r
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Python.File\shell\Edit with IDLE\command\r
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"\r
-end\r
-item: Else Statement\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.NoConFile\shell\Edit with IDLE\command\r
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\CLASSES\Python.File\shell\Edit with IDLE\command\r
-  New Value=%MAINDIR%\pythonw.exe %MAINDIR%\Lib\idlelib\idle.pyw -n -e "%%1"\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Register Python paths.\r
-end\r
-item: Remark\r
-  Text=Write to HKLM for admin, else HKCU.  Keep these blocks otherwise identical!\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\CurrentVersion\r
-  Root=130\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\r
-  New Value=%MAINDIR%\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup\r
-  New Value=%CGROUP_SAVE%\r
-  New Value=\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath\r
-  New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk\r
-  New Value=\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\Modules\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe\r
-  New Value=%MAINDIR%\Python.exe\r
-  Root=2\r
-end\r
-item: Else Statement\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\CurrentVersion\r
-  Root=129\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\r
-  New Value=%MAINDIR%\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup\r
-  New Value=%CGROUP_SAVE%\r
-  New Value=\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath\r
-  New Value=%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk\r
-  New Value=\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\Modules\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe\r
-  New Value=%MAINDIR%\Python.exe\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Registry fiddling for docs.\r
-end\r
-item: Remark\r
-  Text=Write to HKLM for admin, else HKCU.  Keep these blocks otherwise identical!\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=C\r
-  Flags=00000010\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation\r
-  New Value=%MAINDIR%\Doc\index.html\r
-  Root=2\r
-end\r
-item: Else Statement\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation\r
-  New Value=%MAINDIR%\Doc\index.html\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Set the app publisher and URL entries for Win2K add/remove.\r
-end\r
-item: Remark\r
-  Text=It doesn't hurt on other systems.\r
-end\r
-item: Remark\r
-  Text=As usual, write to HKLM or HKCU depending on Admin privs.\r
-end\r
-item: Remark\r
-  Text=CAUTION:  If you set this info on the "Windows 2000" page (step 6) of the\r
-end\r
-item: Remark\r
-  Text=Installation Expert, it only shows up in the "If" block below.  Keep in synch!\r
-end\r
-item: If/While Statement\r
-  Variable=DOADMIN\r
-  Value=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=http://www.python.org/\r
-  Value Name=HelpLink\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=PythonLabs at Zope Corporation\r
-  Value Name=Publisher\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=http://www.python.org/\r
-  Value Name=URLInfoAbout\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%PYVER_STRING%\r
-  Value Name=DisplayVersion\r
-  Root=2\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%MAINDIR%\py.ico,-0\r
-  Value Name=DisplayIcon\r
-  Root=2\r
-end\r
-item: Else Statement\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=http://www.python.org/\r
-  Value Name=HelpLink\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=PythonLabs at Zope Corporation\r
-  Value Name=Publisher\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=http://www.python.org/\r
-  Value Name=URLInfoAbout\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%PYVER_STRING%\r
-  Value Name=DisplayVersion\r
-  Root=1\r
-end\r
-item: Edit Registry\r
-  Total Keys=1\r
-  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%\r
-  New Value=%MAINDIR%\py.ico,-0\r
-  Value Name=DisplayIcon\r
-  Root=1\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=Populate Start Menu group\r
-end\r
-item: If/While Statement\r
-  Variable=TASKS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: Remark\r
-  Text=Shortcut to installer no matter what.\r
-end\r
-item: Create Shortcut\r
-  Source=%MAINDIR%\unwise.exe\r
-  Destination=%GROUP%\Uninstall Python.lnk\r
-  Working Directory=%MAINDIR%\r
-  Key Type=1536\r
-  Flags=00000001\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=A\r
-  Flags=00000010\r
-end\r
-item: Create Shortcut\r
-  Source=%MAINDIR%\python.exe\r
-  Destination=%GROUP%\Python (command line).lnk\r
-  Working Directory=%MAINDIR%\r
-  Icon Pathname=%MAINDIR%\pycon.ico\r
-  Key Type=1536\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=B\r
-  Flags=00000010\r
-end\r
-item: Create Shortcut\r
-  Source=%MAINDIR%\pythonw.exe\r
-  Destination=%GROUP%\IDLE (Python GUI).lnk\r
-  Command Options="%MAINDIR%\Lib\idlelib\idle.pyw"\r
-  Working Directory=%MAINDIR%\r
-  Key Type=1536\r
-  Flags=00000001\r
-end\r
-item: Create Shortcut\r
-  Source=%MAINDIR%\pythonw.exe\r
-  Destination=%GROUP%\Module Docs.lnk\r
-  Command Options="%MAINDIR%\Tools\Scripts\pydocgui.pyw"\r
-  Working Directory=%MAINDIR%\r
-  Key Type=1536\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=C\r
-  Flags=00000010\r
-end\r
-item: Create Shortcut\r
-  Source=%MAINDIR%\Doc\index.html\r
-  Destination=%GROUP%\Python Manuals.lnk\r
-  Working Directory=%MAINDIR%\r
-  Key Type=1536\r
-  Flags=00000001\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: Remark\r
-end\r
-item: Remark\r
-  Text=I don't think we need this, but have always done it.\r
-end\r
-item: Self-Register OCXs/DLLs\r
-  Description=Updating System Configuration, Please Wait...\r
-end\r
-item: Remark\r
-end\r
-remarked item: Remark\r
-  Text=Don't enable "Delete in-use files".  Here's what happens:\r
-end\r
-remarked item: Remark\r
-  Text=Install Python; uninstall Python; install Python again.  Reboot the machine.\r
-end\r
-remarked item: Remark\r
-  Text=Now UNWISE.EXE is missing.  I think this is a Wise bug, but so it goes.\r
-end\r
-remarked item: Add Text to INSTALL.LOG\r
-  Text=Delete in-use files: On\r
-end\r
-item: Remark\r
-end\r
-item: Wizard Block\r
-  Direction Variable=DIRECTION\r
-  Display Variable=DISPLAY\r
-  Bitmap Pathname=.\installer.bmp\r
-  X Position=9\r
-  Y Position=10\r
-  Filler Color=11173759\r
-  Flags=00000011\r
-end\r
-item: Custom Dialog Set\r
-  Name=Finished\r
-  Display Variable=DISPLAY\r
-  item: Dialog\r
-    Title=%APPTITLE% Installation\r
-    Title French=Installation de %APPTITLE%\r
-    Title German=Installation von %APPTITLE%\r
-    Title Spanish=Instalación de %APPTITLE%\r
-    Title Italian=Installazione di %APPTITLE%\r
-    Width=339\r
-    Height=280\r
-    Font Name=Helv\r
-    Font Size=8\r
-    item: Push Button\r
-      Rectangle=188 234 244 253\r
-      Variable=DIRECTION\r
-      Value=N\r
-      Create Flags=01010000000000010000000000000001\r
-      Text=&Finish\r
-      Text French=&Fin\r
-      Text German=&Weiter\r
-      Text Spanish=&Terminar\r
-      Text Italian=&Fine\r
-    end\r
-    item: Push Button\r
-      Rectangle=264 234 320 253\r
-      Variable=DISABLED\r
-      Value=!\r
-      Action=3\r
-      Create Flags=01010000000000010000000000000000\r
-      Text=&Cancel\r
-      Text French=&Annuler\r
-      Text German=&Abbrechen\r
-      Text Spanish=&Cancelar\r
-      Text Italian=&Annulla\r
-    end\r
-    item: Static\r
-      Rectangle=108 10 323 48\r
-      Create Flags=01010000000000000000000000000000\r
-      Flags=0000000000000001\r
-      Name=Times New Roman\r
-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
-      Text=Installation Completed!\r
-      Text French=Installation terminée !\r
-      Text German=Die Installation ist abgeschlossen!\r
-      Text Spanish=¡Instalación terminada!\r
-      Text Italian=Installazione completata!\r
-    end\r
-    item: Static\r
-      Rectangle=108 44 320 82\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=%APPTITLE% has been successfully installed.\r
-      Text=\r
-      Text=Press the Finish button to exit this installation.\r
-      Text French=%APPTITLE% est maintenant installé.\r
-      Text French=\r
-      Text French=Cliquez sur le bouton Fin pour quitter l'installation.\r
-      Text German=%APPTITLE% wurde erfolgreich installiert.\r
-      Text German=\r
-      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.\r
-      Text Spanish=%APPTITLE% se ha instalado con Ã©xito.\r
-      Text Spanish=\r
-      Text Spanish=Presione el botón Terminar para salir de esta instalación.\r
-      Text Italian=L'installazione %APPTITLE% Ã¨ stata portata a termine con successo.\r
-      Text Italian=\r
-      Text Italian=Premere il pulsante Fine per uscire dall'installazione.\r
-    end\r
-    item: Static\r
-      Rectangle=10 225 320 226\r
-      Action=3\r
-      Create Flags=01010000000000000000000000000111\r
-    end\r
-    item: Static\r
-      Rectangle=106 105 312 210\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000000000\r
-      Text=Special Windows thanks to:\r
-      Text=\r
-      Text=Wise Solutions, for the use of InstallMaster 8.1.\r
-      Text=    http://www.wisesolutions.com/\r
-      Text=\r
-      Text=\r
-      Text=LettError, Erik van Blokland, for the Python for Windows graphic.\r
-      Text=    http://www.letterror.com/\r
-      Text=\r
-      Text=\r
-      Text=Mark Hammond, without whose years of freely shared Windows expertise, Python for Windows would still be Python for DOS.\r
-    end\r
-    item: Static\r
-      Rectangle=106 95 312 96\r
-      Action=3\r
-      Enabled Color=00000000000000001111111111111111\r
-      Create Flags=01010000000000000000000000001001\r
-    end\r
-  end\r
-end\r
-item: End Block\r
-end\r
-item: New Event\r
-  Name=Cancel\r
-end\r
-item: Remark\r
-  Text=This include script supports a rollback to preinstallation state if the user chooses to cancel before the installation is complete.\r
-end\r
-item: Include Script\r
-  Pathname=%_WISE_%\INCLUDE\rollback.wse\r
-end\r
diff --git a/PCbuild8/pythoncore.vcproj b/PCbuild8/pythoncore.vcproj
deleted file mode 100644 (file)
index 16a250e..0000000
+++ /dev/null
@@ -1,1946 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="pythoncore"
-       ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
-       RootNamespace="pythoncore"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="0"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="0"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               Description="generate buildinfo"
-                               CommandLine="make_buildinfo.exe $(ConfigurationName)"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26_d.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26_d.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="PGIRelease|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               Description="Get getbuildinfo2.c"
-                               CommandLine="make_buildinfo.exe"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="2"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="PGIRelease|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               Description="Get getbuildinfo2.c"
-                               CommandLine="make_buildinfo.exe"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="2"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine=""
-                       />
-               </Configuration>
-               <Configuration
-                       Name="PGORelease|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\PGIRelease\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       BuildLogFile="$(OutDir)\BuildLog.htm"
-                       ExcludeBuckets="7"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="copy $(PlatformName)\python.exe $(IntDir)&#x0D;&#x0A;$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="3"
-                               ProfileGuidedDatabase="$(IntDir)\$(TargetName).pgd"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="PGORelease|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythoncore"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       BuildLogFile="$(OutDir)\BuildLog.htm"
-                       ExcludeBuckets="7"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalOptions="/Zm200 "
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                               AdditionalIncludeDirectories="..\Include"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="copy $(PlatformName)\python.exe $(IntDir)&#x0D;&#x0A;$(IntDir)\python.exe ../Tools/pybench/pybench.py -n 1&#x0D;&#x0A;"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\python26.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               LinkTimeCodeGeneration="3"
-                               ProfileGuidedDatabase="$(IntDir)\$(TargetName).pgd"
-                               BaseAddress="0x1e000000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="zlib"
-                       >
-                       <File
-                               RelativePath="..\Modules\zlib\adler32.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\compress.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\crc32.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\deflate.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\gzio.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\infback.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\inffast.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\inflate.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\inftrees.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\trees.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\uncompr.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlibmodule.c"
-                               >
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="PGIRelease|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="PGIRelease|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="PGORelease|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="PGORelease|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories="..\Modules\zlib"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\Modules\zlib\zutil.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="include files"
-                       >
-                       <File
-                               RelativePath="..\Include\abstract.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\asdl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\ast.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\bitset.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\boolobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\bufferobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\cellobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\ceval.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\classobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\cobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\code.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\codecs.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\compile.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\complexobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\cStringIO.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\datetime.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\descrobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\dictobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\enumobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\errcode.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\eval.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\fileobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\floatobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\frameobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\funcobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\genobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\graminit.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\grammar.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\import.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\intobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\intrcheck.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\iterobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\listobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\longintrepr.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\longobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\marshal.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\metagrammar.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\methodobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\modsupport.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\moduleobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\node.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\object.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\objimpl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\opcode.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\osdefs.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\parsetok.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\patchlevel.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pgen.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pgenheaders.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\py_curses.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pyarena.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\PC\pyconfig.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pydebug.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pyerrors.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pyexpat.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pyfpe.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pygetopt.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pymactoolbox.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pymem.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pyport.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pystate.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pystrtod.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\Python-ast.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\Python.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pythonrun.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\pythread.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\rangeobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\setobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\sliceobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\stringobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\structmember.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\structseq.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\symtable.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\sysmodule.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\timefuncs.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\token.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\traceback.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\tupleobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\ucnhash.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\unicodeobject.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\Include\weakrefobject.h"
-                               >
-                       </File>
-               </Filter>
-               <File
-                       RelativePath="..\Modules\_bisectmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_cn.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_hk.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_jp.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_kr.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\_codecs_tw.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_codecsmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_csv.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_functoolsmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_heapqmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_hotshot.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_localemodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_lsprof.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_randommodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_sre.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_struct.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Pc\_subprocess.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_typesmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_weakref.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Pc\_winreg.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\abstract.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\acceler.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\arraymodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\asdl.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\ast.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\audioop.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\binascii.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\bitset.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\bltinmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\boolobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\bufferobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\cellobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\ceval.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\classobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cmathmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\cobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\codecs.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\codeobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\_collectionsmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\compile.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\complexobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\config.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cPickle.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cStringIO.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\datetimemodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\descrobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\dictobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\dl_nt.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\dynload_win.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\enumobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\errnomodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\errors.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\exceptions.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\fileobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\firstsets.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\floatobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\frameobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\frozen.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\funcobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\future.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\gcmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\genobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getargs.c"
-                       >
-               </File>
-               <File
-                       RelativePath=".\getbuildinfo2.c"
-                       >
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Release|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGIRelease|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGIRelease|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGORelease|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGORelease|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       ForcedIncludeFiles="getbuildinfo2.h"
-                               />
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="..\Python\getcompiler.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getcopyright.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getmtime.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getopt.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\getpathp.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getplatform.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\getversion.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\graminit.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\grammar.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\grammar1.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\imageop.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\import.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\import_nt.c"
-                       >
-                       <FileConfiguration
-                               Name="Release|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Release|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGIRelease|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGIRelease|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGORelease|Win32"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="PGORelease|x64"
-                               >
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       AdditionalIncludeDirectories="..\Python"
-                               />
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="..\Python\importdl.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\intobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\iterobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\itertoolsmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\listnode.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\listobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\longobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\main.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\marshal.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\mathmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\md5.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\md5module.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\metagrammar.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\methodobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\mmapmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\modsupport.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\moduleobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\msvcrtmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\cjkcodecs\multibytecodec.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\myreadline.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\mysnprintf.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\mystrtoul.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\node.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\object.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\obmalloc.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\operator.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\parser.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\parsermodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\parsetok.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\peephole.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\posixmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\pyarena.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\pyfpe.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\pystate.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\pystrtod.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\Python-ast.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\python_nt.rc"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\pythonrun.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\rangeobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\rgbimgmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\rotatingtree.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\setobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\sha256module.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\sha512module.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\sha512module.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\shamodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\signalmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\signalmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\sliceobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\stringobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\stropmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\structmember.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\structseq.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\symtable.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\symtablemodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\sysmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\thread.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\threadmodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\timemodule.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Parser\tokenizer.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Python\traceback.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\tupleobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\typeobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\unicodectype.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\unicodeobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Objects\weakrefobject.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\xxsubtype.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\yuvconvert.c"
-                       >
-               </File>
-               <File
-                       RelativePath="..\Modules\zipimport.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/pythoncore/getbuildinfo.vsprops b/PCbuild8/pythoncore/getbuildinfo.vsprops
new file mode 100644 (file)
index 0000000..2aff8d3
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="getbuildinfo"\r
+       >\r
+       <Tool\r
+               Name="VCPreBuildEventTool"\r
+               Description="Running make_buildinfo.exe"\r
+               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_buildinfo\make_buildinfo.exe"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
new file mode 100644 (file)
index 0000000..150277a
--- /dev/null
@@ -0,0 +1,1880 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pythoncore"\r
+       ProjectGUID="{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"\r
+       RootNamespace="PCBuild9"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               RuntimeLibrary="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Python"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Python\asdl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\ast.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\atof.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\bltinmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\ceval.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\codecs.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\compile.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\dynload_win.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\errors.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\frozen.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\future.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getargs.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getcompiler.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getcopyright.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getmtime.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getopt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getplatform.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\getversion.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\graminit.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\import.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\importdl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\importdl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\marshal.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\modsupport.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\mysnprintf.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\mystrtoul.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\peephole.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\pyarena.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\pyfpe.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\pystate.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\pystrtod.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\Python-ast.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\pythonrun.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\structmember.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\symtable.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\sysmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\thread.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\thread_nt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Python\traceback.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Objects"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Objects\abstract.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\boolobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\bufferobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\cellobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\classobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\cobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\codeobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\complexobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\stringlib\count.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\descrobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\dictobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\enumobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\exceptions.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\stringlib\fastsearch.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\fileobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\stringlib\find.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\floatobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\frameobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\funcobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\genobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\intobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\iterobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\listobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\longobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\methodobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\moduleobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\object.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\obmalloc.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\stringlib\partition.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\rangeobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\setobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\sliceobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\stringobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\structseq.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\tupleobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\typeobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\unicodectype.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\unicodeobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\unicodetype_db.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\weakrefobject.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\python_nt.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Include"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Include\abstract.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\asdl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\ast.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\bitset.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\boolobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\bufferobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\cellobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\ceval.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\classobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\cobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\code.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\codecs.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\compile.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\complexobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\cStringIO.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\datetime.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\descrobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\dictobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\enumobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\errcode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\eval.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\fileobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\floatobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\frameobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\funcobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\genobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\graminit.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\grammar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\import.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\intobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\intrcheck.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\iterobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\listobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\longintrepr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\longobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\marshal.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\metagrammar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\methodobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\modsupport.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\moduleobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\node.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\object.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\objimpl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\opcode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\osdefs.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\parsetok.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\patchlevel.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pgen.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pgenheaders.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\py_curses.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pyarena.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pydebug.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pyerrors.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pyexpat.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pyfpe.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pygetopt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pymactoolbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pymem.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pyport.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pystate.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pystrtod.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\Python-ast.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\Python.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pythonrun.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pythread.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\rangeobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\setobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\sliceobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\stringobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\structmember.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\structseq.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\symtable.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\sysmodule.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\timefuncs.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\token.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\traceback.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\tupleobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\ucnhash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\unicodeobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\weakrefobject.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="PC"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\_subprocess.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\_winreg.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\config.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\dl_nt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\errmap.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\getbuildinfo.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\getpathp.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\import_nt.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Python"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\msvcrtmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\pyconfig.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Modules"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_bisectmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_codecsmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_collectionsmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_csv.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_functoolsmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_heapqmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_hotshot.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_localemodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_lsprof.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_randommodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_sre.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_struct.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_typesmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_weakref.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\arraymodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\audioop.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\binascii.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\cmathmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\cPickle.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\cStringIO.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\datetimemodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\errnomodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\gcmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\imageop.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\itertoolsmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\main.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\mathmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\md5.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\md5.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\md5module.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\mmapmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\operator.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\parsermodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\posixmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\rgbimgmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\rotatingtree.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\rotatingtree.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\sha256module.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\sha512module.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\shamodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\signalmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\stropmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\symtablemodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\threadmodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\timemodule.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\xxsubtype.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\yuv.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\yuvconvert.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\zipimport.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\zlibmodule.c"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               AdditionalIncludeDirectories="..\..\Modules\zlib"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <Filter\r
+                               Name="zlib"\r
+                               >\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\adler32.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\compress.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\crc32.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\crc32.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\deflate.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\deflate.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\gzio.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\infback.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inffast.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inffast.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inffixed.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inflate.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inflate.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inftrees.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inftrees.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\trees.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\trees.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\uncompr.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zconf.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zconf.in.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zlib.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zutil.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zutil.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="cjkcodecs"\r
+                               >\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_cn.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_hk.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_iso2022.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_jp.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_kr.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\alg_jisx0201.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\cjkcodecs.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\emu_jisx0213_2000.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_cn.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_hk.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_jisx0213_pair.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_jp.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_kr.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\mappings_tw.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\multibytecodec.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\cjkcodecs\multibytecodec.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Parser"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Parser\acceler.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\bitset.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\firstsets.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\grammar.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\grammar1.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\listnode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\metagrammar.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\myreadline.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\node.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\parser.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\parser.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\parsetok.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\tokenizer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Parser\tokenizer.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/pythonw.vcproj b/PCbuild8/pythonw.vcproj
deleted file mode 100644 (file)
index f692363..0000000
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="pythonw"
-       ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
-       RootNamespace="pythonw"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\pythonw_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\pythonw_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\pythonw.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\pythonw.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               StackReserveSize="2000000"
-                               BaseAddress="0x1d000000"
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\python_exe.rc"
-                       >
-               </File>
-               <File
-                       RelativePath="..\PC\WinMain.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/pythonw/pythonw.vcproj b/PCbuild8/pythonw/pythonw.vcproj
new file mode 100644 (file)
index 0000000..9e2dc7b
--- /dev/null
@@ -0,0 +1,660 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pythonw"\r
+       ProjectGUID="{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}"\r
+       RootNamespace="pythonw"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName)_d.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="$(OutDir)\$(ProjectName)_d.exe"\r
+                               LinkIncremental="2"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="3000000"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               StackReserveSize="3000000"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\WinMain.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\pycon.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\python_exe.rc"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index fa4fcb54cac38c3900681599292e3f4882c97c87..eb8cd311b15a5414de63e6945da9c1bb170c2129 100644 (file)
@@ -2,44 +2,66 @@ Building Python using VC++ 8.0
 -------------------------------------
 This directory is used to build Python for Win32 platforms, e.g. Windows
 95, 98 and NT.  It requires Microsoft Visual C++ 8.0
-(a.k.a. Visual Studio 2005).
+(a.k.a. Visual Studio 2005).  There are two Platforms defined, Win32
+and x64.
 (For other Windows platforms and compilers, see ../PC/readme.txt.)
 
 All you need to do is open the workspace "pcbuild.sln" in MSVC++, select
 the Debug or Release setting (using "Solution Configuration" from
-the "Standard" toolbar"), and build the projects.
+the "Standard" toolbar"), and build the solution.
 
-The proper order to build subprojects:
+A .bat file, build.bat, is provided to simplify command line builds.
 
-1) pythoncore (this builds the main Python DLL and library files,
-               python26.{dll, lib} in Release mode)
-              NOTE:  in previous releases, this subproject was
-              named after the release number, e.g. python20.
+Some of the subprojects rely on external libraries and won't build
+unless you have them installed.
 
-2) python (this builds the main Python executable,
-           python.exe in Release mode)
-
-3) the other subprojects, as desired or needed (note:  you probably don't
-   want to build most of the other subprojects, unless you're building an
-   entire Python distribution from scratch, or specifically making changes
-   to the subsystems they implement, or are running a Python core buildbot
-   test slave; see SUBPROJECTS below)
-
-Binary files go into PCBuild8\Win32 or \x64 directories and don't
-interfere with each other.
+Binary files go into PCBuild8\$(PlatformName)($ConfigurationName),
+which will be something like Win32Debug, Win32Release, x64Release, etc.
 
 When using the Debug setting, the output files have a _d added to
 their name:  python26_d.dll, python_d.exe, parser_d.pyd, and so on.
 
-There are two special configurations for the pythoncore project and
-the solution.  These are PGIRelease and PGORelease.  They are for
-createing profile-guided optimized versions of python.dll.
-The former creates the instrumented binaries, and the latter
-runs python.exe with the instrumented python.dll on the performance
-testsuite, and creates a new, optimized, python.dll in
-PCBuild8\Win32\PGORelease, or in the x64 folder.  Note that although
-we can cross-compile x64 binaries on a 32 bit machine, we cannot
-create the PGO binaries, since they require actually running the code.
+PROFILER GUIDED OPTIMIZATION
+----------------------------
+There are two special solution configurations for Profiler Guided
+Optimization.  Careful use of this has been shown to yield more than
+10% extra speed.
+1) Build the PGInstrument solution configuration.  This will yield
+binaries in the win32PGO or x64PGO folders.  (You may want do start
+by erasing any .pgc files there, present from earlier runs.)
+2) Instrument the binaries.  Do this by for example running the test
+suite:  win32PGO\python.exe ..\lib\test\regrtest.py.  This will excercise
+python thoroughly.
+3) Build the PGUpdate solution configuration (You may need to ask it
+to rebuild.)  This will incorporate the information gathered in step 2
+and produce new binaries in the same win32PGO or x64pPGO folders.
+4) (optional) You can continue to build the PGUpdate configuration as
+you work on python.  It will continue to use the data from step 2, even
+if you add or modify files as part of your work.  Thus, it makes sense to 
+run steps 1 and 2 maybe once a week, and then use step 3) for all regular
+work.
+
+A .bat file, build_pgo.bat is included to automate this process
+
+You can convince yourself of the benefits of the PGO by comparing the
+results of the python testsuite with the regular Release build.
+
+
+C RUNTIME
+---------
+Visual Studio 2005 uses version 8 of the C runtime.  The executables are
+linked to a CRT "side by side" assembly which must be present on the target
+machine.  This is avalible under the VC/Redist folder of your visual studio
+distribution.  Note that ServicePack1 of Visual Studio 2005 has a different
+version than the original.  On XP and later operating systems that support
+side-by-side assemblies it is not enough to have the msvcrt80.dll present,
+it has to be there as a whole assembly, that is, a folder with the .dll
+and a .manifest.  Also, a check is made for the correct version.
+Therefore, one should distribute this assembly with the dlls, and keep
+it in the same directory.  For compatibility with older systems, one should
+also set the PATH to this directory so that the dll can be found.
+For more info, see the Readme in the VC/Redist folder.
+
 
 SUBPROJECTS
 -----------
@@ -267,164 +289,22 @@ _ssl
     build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
     this by hand.
 
-Building for Itanium
---------------------
-
-The project files support a ReleaseItanium configuration which creates
-Win64/Itanium binaries. For this to work, you need to install the Platform
-SDK, in particular the 64-bit support. This includes an Itanium compiler
-(future releases of the SDK likely include an AMD64 compiler as well).
-In addition, you need the Visual Studio plugin for external C compilers,
-from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
-locate the proper target compiler, and convert compiler options
-accordingly. The project files require atleast version 0.8.
 
 Building for AMD64
 ------------------
 
-The build process for the ReleaseAMD64 configuration is very similar
-to the Itanium configuration; make sure you use the latest version of
-vsextcomp.
-
-Building Python Using the free MS Toolkit Compiler
---------------------------------------------------
-
-The build process for Visual C++ can be used almost unchanged with the free MS
-Toolkit Compiler. This provides a way of building Python using freely
-available software.
-
-Requirements
-
-    To build Python, the following tools are required:
-
-    * The Visual C++ Toolkit Compiler
-        from http://msdn.microsoft.com/visualc/vctoolkit2003/
-    * A recent Platform SDK
-        from http://www.microsoft.com/downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a
-    * The .NET 1.1 SDK
-        from http://www.microsoft.com/downloads/details.aspx?FamilyID=9b3a2ca6-3647-4070-9f41-a333c6b9181d
-
-    [Does anyone have better URLs for the last 2 of these?]
-
-    The toolkit compiler is needed as it is an optimising compiler (the
-    compiler supplied with the .NET SDK is a non-optimising version). The
-    platform SDK is needed to provide the Windows header files and libraries
-    (the Windows 2003 Server SP1 edition, typical install, is known to work -
-    other configurations or versions are probably fine as well). The .NET 1.1
-    SDK is needed because it contains a version of msvcrt.dll which links to
-    the msvcr71.dll CRT. Note that the .NET 2.0 SDK is NOT acceptable, as it
-    references msvcr80.dll.
-
-    All of the above items should be installed as normal.
-
-    If you intend to build the openssl (needed for the _ssl extension) you
-    will need the C runtime sources installed as part of the platform SDK.
-
-    In addition, you will need Nant, available from
-    http://nant.sourceforge.net. The 0.85 release candidate 3 version is known
-    to work. This is the latest released version at the time of writing. Later
-    "nightly build" versions are known NOT to work - it is not clear at
-    present whether future released versions will work.
-
-Setting up the environment
-
-    Start a platform SDK "build environment window" from the start menu. The
-    "Windows XP 32-bit retail" version is known to work.
-
-    Add the following directories to your PATH:
-        * The toolkit compiler directory
-        * The SDK "Win64" binaries directory
-       * The Nant directory
-    Add to your INCLUDE environment variable:
-        * The toolkit compiler INCLUDE directory
-    Add to your LIB environment variable:
-        * The toolkit compiler LIB directory
-       * The .NET SDK Visual Studio 2003 VC7\lib directory
-
-    The following commands should set things up as you need them:
-
-        rem Set these values according to where you installed the software
-        set TOOLKIT=C:\Program Files\Microsoft Visual C++ Toolkit 2003
-        set SDK=C:\Program Files\Microsoft Platform SDK
-        set NET=C:\Program Files\Microsoft Visual Studio .NET 2003
-        set NANT=C:\Utils\Nant
-
-        set PATH=%TOOLKIT%\bin;%PATH%;%SDK%\Bin\win64;%NANT%\bin
-        set INCLUDE=%TOOLKIT%\include;%INCLUDE%
-        set LIB=%TOOLKIT%\lib;%NET%\VC7\lib;%LIB%
-
-    The "win64" directory from the SDK is added to supply executables such as
-    "cvtres" and "lib", which are not available elsewhere. The versions in the
-    "win64" directory are 32-bit programs, so they are fine to use here.
-
-    That's it. To build Python (the core only, no binary extensions which
-    depend on external libraries) you just need to issue the command
-
-        nant -buildfile:python.build all
-
-    from within the PCBuild directory.
-
-Extension modules
-
-    To build those extension modules which require external libraries
-    (_tkinter, bz2, _bsddb, _sqlite3, _ssl) you can follow the instructions
-    for the Visual Studio build above, with a few minor modifications. These
-    instructions have only been tested using the sources in the Python
-    subversion repository - building from original sources should work, but
-    has not been tested.
-
-    For each extension module you wish to build, you should remove the
-    associated include line from the excludeprojects section of pc.build.
-
-    The changes required are:
-
-    _tkinter
-        The tix makefile (tix-8.4.0\win\makefile.vc) must be modified to
-       remove references to TOOLS32. The relevant lines should be changed to
-       read:
-            cc32 = cl.exe
-            link32 = link.exe
-            include32 = 
-       The remainder of the build instructions will work as given.
-
-    bz2
-        No changes are needed
-
-    _bsddb
-        The file db.build should be copied from the Python PCBuild directory
-       to the directory db-4.4.20\build_win32.
-
-       The file db_static.vcproj in db-4.4.20\build_win32 should be edited to
-       remove the string "$(SolutionDir)" - this occurs in 2 places, only
-       relevant for 64-bit builds. (The edit is required as otherwise, nant
-       wants to read the solution file, which is not in a suitable form).
-
-       The bsddb library can then be build with the command
-           nant -buildfile:db.build all
-       run from the db-4.4.20\build_win32 directory.
-
-    _sqlite3
-        No changes are needed. However, in order for the tests to succeed, a
-       copy of sqlite3.dll must be downloaded, and placed alongside
-       python.exe.
-
-    _ssl
-        The documented build process works as written. However, it needs a
-       copy of the file setargv.obj, which is not supplied in the platform
-       SDK. However, the sources are available (in the crt source code). To
-       build setargv.obj, proceed as follows:
+Select x64 as the destination platform.
 
-        Copy setargv.c, cruntime.h and internal.h from %SDK%\src\crt to a
-       temporary directory.
-       Compile using "cl /c /I. /MD /D_CRTBLD setargv.c"
-       Copy the resulting setargv.obj to somewhere on your LIB environment
-       (%SDK%\lib is a reasonable place).
-
-       With setargv.obj in place, the standard build process should work
-       fine.
 
 YOUR OWN EXTENSION DLLs
 -----------------------
 If you want to create your own extension module DLL, there's an example
 with easy-to-follow instructions in ../PC/example/; read the file
 readme.txt there first.
+Also, you can simply use Visual Studio to "Add new project to solution".
+Elect to create a win32 project, .dll, empty project.
+This will create a subdirectory with a .vcproj file in it.  Now, You can
+simply copy most of another .vcproj, like _test_capi/_test_capi.vcproj over
+(you can't just copy and rename it, since the target will have a unique GUID.)
+At some point we want to be able to provide a template for creating a
+project.
index 43c8576e798d9ee3901d93c8a0e8b22634898593..c3410f84b54742ec9f98024b37b8742a6c73c8e9 100644 (file)
@@ -1,4 +1,5 @@
 # Remove all the .pyc and .pyo files under ../Lib.
+import sys
 
 
 def deltree(root):
@@ -21,5 +22,9 @@ def deltree(root):
 
     return npyc, npyo
 
-npyc, npyo = deltree("../Lib")
+path = "../Lib"
+if len(sys.argv) > 1:
+    path = sys.argv[1]
+
+npyc, npyo = deltree(path)
 print npyc, ".pyc deleted,", npyo, ".pyo deleted"
index 2e0aba33f2dbafd047fb213c078d2ed14640d1a5..8927879d5ee7243fef51b7c64f3d51b0cb6e64d7 100644 (file)
@@ -2,6 +2,8 @@
 rem Run Tests.  Run the regression test suite.\r
 rem Usage:  rt [-d] [-O] [-q] regrtest_args\r
 rem -d   Run Debug build (python_d.exe).  Else release build.\r
+rem -pgo Run PGO build, e.g. for instrumentation\r
+rem -x64 Run the x64 version, otherwise win32\r
 rem -O   Run python.exe or python_d.exe (see -d) with -O.\r
 rem -q   "quick" -- normally the tests are run twice, the first time\r
 rem      after deleting all the .py[co] files reachable from Lib/.\r
@@ -24,16 +26,21 @@ rem     rt -u "network,largefile"
 \r
 setlocal\r
 \r
-set exe=python\r
+set platf=win32\r
+set exe=python.exe\r
 set qmode=\r
 set dashO=\r
+set conf=Release\r
 PATH %PATH%;..\..\tcltk\bin\r
 \r
 :CheckOpts\r
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts\r
 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts\r
-if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts\r
+if "%1"=="-d" (set exe=python_d.exe) & (set conf=Debug) & shift & goto CheckOpts\r
+if "%1"=="-x64" (set platf=x64) & shift & goto CheckOpts\r
+if "%1"=="-pgo" (set conf=PGO) & shift & goto CheckOpts\r
 \r
+set exe=%platf%%conf%\%exe%\r
 set cmd=%exe% %dashO% -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
 if defined qmode goto Qmode\r
 \r
diff --git a/PCbuild8/select.vcproj b/PCbuild8/select.vcproj
deleted file mode 100644 (file)
index 72888cb..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="select"
-       ProjectGUID="{97239A56-DBC0-41D2-BC14-C87D9B97D63B}"
-       RootNamespace="select"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile="$(OutDir)\select.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D110000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile="$(OutDir)\select.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames="libc"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D110000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile="$(OutDir)\select_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames="libc,msvcrt"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D110000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
-                               OutputFile="$(OutDir)\select_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               IgnoreDefaultLibraryNames="libc,msvcrt"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               SubSystem="2"
-                               BaseAddress="0x1D110000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\selectmodule.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/select/select.vcproj b/PCbuild8/select/select.vcproj
new file mode 100644 (file)
index 0000000..a20a18b
--- /dev/null
@@ -0,0 +1,644 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="select"\r
+       ProjectGUID="{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"\r
+       RootNamespace="select"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SELECT_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\selectmodule.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/unicodedata.vcproj b/PCbuild8/unicodedata.vcproj
deleted file mode 100644 (file)
index 75d7483..0000000
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="unicodedata"
-       ProjectGUID="{FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}"
-       RootNamespace="unicodedata"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\unicodedata.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D120000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\unicodedata.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D120000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\unicodedata_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D120000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\unicodedata_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D120000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\Modules\unicodedata.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/unicodedata/unicodedata.vcproj b/PCbuild8/unicodedata/unicodedata.vcproj
new file mode 100644 (file)
index 0000000..8e9bb5e
--- /dev/null
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="unicodedata"\r
+       ProjectGUID="{D04B2089-7DA9-4D92-B23F-07453BC46652}"\r
+       RootNamespace="unicodedata"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODEDATA_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\unicodedata.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PCbuild8/w9xpopen.vcproj b/PCbuild8/w9xpopen.vcproj
deleted file mode 100644 (file)
index c159750..0000000
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="w9xpopen"
-       ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
-       RootNamespace="w9xpopen"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\w9xpopen_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\w9xpopen_d.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\w9xpopen.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\w9xpopen"
-                       ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               OutputFile="$(OutDir)\w9xpopen.exe"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\w9xpopen.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/winsound.vcproj b/PCbuild8/winsound.vcproj
deleted file mode 100644 (file)
index 6ccb43b..0000000
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="winsound"
-       ProjectGUID="{51F35FAE-FB92-4B2C-9187-1542C065AD77}"
-       RootNamespace="winsound"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib"
-                               OutputFile="$(OutDir)\winsound_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib"
-                               OutputFile="$(OutDir)\winsound_d.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib"
-                               OutputFile="$(OutDir)\winsound.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\winsound"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="winmm.lib"
-                               OutputFile="$(OutDir)\winsound.pyd"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(OutDir)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=""
-                               BaseAddress="0x1D160000"
-                               ImportLibrary=""
-                               TargetMachine="17"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="..\PC\winsound.c"
-                       >
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/PCbuild8/winsound/winsound.vcproj b/PCbuild8/winsound/winsound.vcproj
new file mode 100644 (file)
index 0000000..c46ba2a
--- /dev/null
@@ -0,0 +1,644 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="winsound"\r
+       ProjectGUID="{1015E3B4-FD3B-4402-AA6E-7806514156D6}"\r
+       RootNamespace="winsound"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="winmm.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\winsound.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 6f62b6c99e0dade8ec8220551900ef535d9aff6d..82eaeff7a6812ecca4aa100ecaf5408f4de1b7f6 100644 (file)
@@ -248,6 +248,8 @@ PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename,
                     goto error;
                 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
                                             arena));
+                if (!asdl_seq_GET(stmts, 0))
+                    goto error;
                 return Interactive(stmts, arena);
             }
             else {
@@ -278,6 +280,8 @@ PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename,
                 return Interactive(stmts, arena);
             }
         default:
+            PyErr_Format(PyExc_SystemError,
+                         "invalid node %d for PyAST_FromNode", TYPE(n));
             goto error;
     }
  error:
index 3bb2178bd84d02d719ebed4115acc9fd91edee32..df3fa7996de0353edaf2329c6cc30dd2c562db89 100644 (file)
@@ -487,7 +487,6 @@ volatile int _Py_Ticker = 100;
 PyObject *
 PyEval_EvalCode(PyCodeObject *co, PyObject *globals, PyObject *locals)
 {
-       /* XXX raise SystemError if globals is NULL */
        return PyEval_EvalCodeEx(co,
                          globals, locals,
                          (PyObject **)NULL, 0,
index 27fca72cd88c7d0381cee76bb4dfd69f51a26898..944552992f4f442d8d445a5f953b9bb96ff3b6c9 100644 (file)
@@ -15,72 +15,16 @@ typedef struct NRMUTEX {
        HANDLE hevent ;
 } NRMUTEX, *PNRMUTEX ;
 
-typedef PVOID WINAPI interlocked_cmp_xchg_t(PVOID *dest, PVOID exc, PVOID comperand) ;
-
-/* Sorry mate, but we haven't got InterlockedCompareExchange in Win95! */
-static PVOID WINAPI
-interlocked_cmp_xchg(PVOID *dest, PVOID exc, PVOID comperand)
-{
-       static LONG spinlock = 0 ;
-       PVOID result ;
-       DWORD dwSleep = 0;
-
-       /* Acqire spinlock (yielding control to other threads if cant aquire for the moment) */
-       while(InterlockedExchange(&spinlock, 1))
-       {
-               // Using Sleep(0) can cause a priority inversion.
-               // Sleep(0) only yields the processor if there's
-               // another thread of the same priority that's
-               // ready to run.  If a high-priority thread is
-               // trying to acquire the lock, which is held by
-               // a low-priority thread, then the low-priority
-               // thread may never get scheduled and hence never
-               // free the lock.  NT attempts to avoid priority
-               // inversions by temporarily boosting the priority
-               // of low-priority runnable threads, but the problem
-               // can still occur if there's a medium-priority
-               // thread that's always runnable.  If Sleep(1) is used,
-               // then the thread unconditionally yields the CPU.  We
-               // only do this for the second and subsequent even
-               // iterations, since a millisecond is a long time to wait
-               // if the thread can be scheduled in again sooner
-               // (~100,000 instructions).
-               // Avoid priority inversion: 0, 1, 0, 1,...
-               Sleep(dwSleep);
-               dwSleep = !dwSleep;
-       }
-       result = *dest ;
-       if (result == comperand)
-               *dest = exc ;
-       /* Release spinlock */
-       spinlock = 0 ;
-       return result ;
-} ;
-
-static interlocked_cmp_xchg_t *ixchg;
 
 BOOL
 InitializeNonRecursiveMutex(PNRMUTEX mutex)
 {
-       if (!ixchg)
-       {
-               /* Sorely, Win95 has no InterlockedCompareExchange API (Win98 has), so we have to use emulation */
-               HANDLE kernel = GetModuleHandle("kernel32.dll") ;
-               if (!kernel || (ixchg = (interlocked_cmp_xchg_t *)GetProcAddress(kernel, "InterlockedCompareExchange")) == NULL)
-                       ixchg = interlocked_cmp_xchg ;
-       }
-
        mutex->owned = -1 ;  /* No threads have entered NonRecursiveMutex */
        mutex->thread_id = 0 ;
        mutex->hevent = CreateEvent(NULL, FALSE, FALSE, NULL) ;
        return mutex->hevent != NULL ;  /* TRUE if the mutex is created */
 }
 
-#ifdef InterlockedCompareExchange
-#undef InterlockedCompareExchange
-#endif
-#define InterlockedCompareExchange(dest,exchange,comperand) (ixchg((dest), (exchange), (comperand)))
-
 VOID
 DeleteNonRecursiveMutex(PNRMUTEX mutex)
 {
@@ -98,7 +42,7 @@ EnterNonRecursiveMutex(PNRMUTEX mutex, BOOL wait)
        /* InterlockedIncrement(&mutex->owned) == 0 means that no thread currently owns the mutex */
        if (!wait)
        {
-               if (InterlockedCompareExchange((PVOID *)&mutex->owned, (PVOID)0, (PVOID)-1) != (PVOID)-1)
+               if (InterlockedCompareExchange(&mutex->owned, 0, -1) != -1)
                        return WAIT_TIMEOUT ;
                ret = WAIT_OBJECT_0 ;
        }
@@ -196,7 +140,10 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
        if (obj.done == NULL)
                return -1;
 
-       rv = _beginthread(bootstrap, _pythread_stacksize, &obj);
+       rv = _beginthread(bootstrap,
+                         Py_SAFE_DOWNCAST(_pythread_stacksize,
+                                          Py_ssize_t, int),
+                         &obj);
        if (rv == (Py_uintptr_t)-1) {
                /* I've seen errno == EAGAIN here, which means "there are
                 * too many threads".
index d7b86ccb0dc3ed2d8e5e753f36a47265557803fd..548b640bc31a2aed14cd48d97d835e225a5d805b 100644 (file)
@@ -5,7 +5,7 @@ import win32com.client.gencache
 import win32com.client
 import pythoncom, pywintypes
 from win32com.client import constants
-import re, string, os, sets, glob, popen2, sys, _winreg, struct
+import re, string, os, sets, glob, subprocess, sys, _winreg, struct
 
 try:
     basestring
@@ -388,8 +388,10 @@ class CAB:
         else:
             print "WARNING: cabarc.exe not found in registry"
             cabarc = "cabarc.exe"
-        f = popen2.popen4(r'"%s" -m lzx:21 n %s.cab @%s.txt' % (cabarc, self.name, self.name))[0]
-        for line in f:
+        cmd = r'"%s" -m lzx:21 n %s.cab @%s.txt' % (cabarc, self.name, self.name)
+        p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)[0]
+        for line in (p.stdout, p.stdin):
             if line.startswith("  -- adding "):
                 sys.stdout.write(".")
             else: