]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged revisions 59642-59665 via svnmerge from
authorChristian Heimes <christian@cheimes.de>
Wed, 2 Jan 2008 18:30:52 +0000 (18:30 +0000)
committerChristian Heimes <christian@cheimes.de>
Wed, 2 Jan 2008 18:30:52 +0000 (18:30 +0000)
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59653 | martin.v.loewis | 2008-01-01 22:05:17 +0100 (Tue, 01 Jan 2008) | 3 lines

  Return results from Python callbacks to Tcl as Tcl objects.
  Fixes Tk issue #1851526
........
  r59654 | martin.v.loewis | 2008-01-01 22:08:18 +0100 (Tue, 01 Jan 2008) | 4 lines

  Always convert Text.index result to string.
  This improves compatibility with Tcl 8.5, which would
  otherwise return textindex objects.
........
  r59655 | martin.v.loewis | 2008-01-01 22:09:07 +0100 (Tue, 01 Jan 2008) | 2 lines

  News item for r59653.
........
  r59656 | martin.v.loewis | 2008-01-02 00:00:00 +0100 (Wed, 02 Jan 2008) | 1 line

  Don't link with Tix; Tix is loaded dynamically by Tcl.
........
  r59657 | martin.v.loewis | 2008-01-02 00:00:48 +0100 (Wed, 02 Jan 2008) | 1 line

  Use Visual Studio 2009 on the build slaves.
........
  r59658 | martin.v.loewis | 2008-01-02 00:36:24 +0100 (Wed, 02 Jan 2008) | 1 line

  Test in PCbuild directory.
........
  r59661 | kurt.kaiser | 2008-01-02 05:11:28 +0100 (Wed, 02 Jan 2008) | 6 lines

  Issue1177
  r58207 and r58247 patch logic is reversed.  I noticed this when I
  tried to use urllib to retrieve a file which required auth.

  Fix that and add a test for 401 error to verify.
........
  r59662 | kurt.kaiser | 2008-01-02 06:23:38 +0100 (Wed, 02 Jan 2008) | 2 lines

  Change docstrings to comments so test output will display normally.
........
  r59665 | christian.heimes | 2008-01-02 18:43:40 +0100 (Wed, 02 Jan 2008) | 5 lines

  Removed PCbuild8/ directory and added a new build directory for VS 2005
  based on the VS 2008 build directory to PC/VS8.0. The script
  PCbuild/vs8to9.py was added to sync changes from PCbuild to PC/VS8.0.

  Kristjan, the initial creator of the PCbuild8 directory is fine with the replacement. I've moved the new version of the VS 2005 build directory next to the other legacy build directories. The new sync script is based on the work of wreck and syncs changes in the project, property and solution files.
........

72 files changed:
Lib/lib-tk/Tkinter.py
Lib/test/test_urllib.py
Lib/urllib.py
Modules/_tkinter.c
PC/VS8.0/_bsddb.vcproj [moved from PCbuild8/_bsddb/_bsddb.vcproj with 63% similarity]
PC/VS8.0/_ctypes.vcproj [moved from PCbuild8/_ctypes/_ctypes.vcproj with 62% similarity]
PC/VS8.0/_ctypes_test.vcproj [moved from PCbuild8/_ctypes_test/_ctypes_test.vcproj with 63% similarity]
PC/VS8.0/_elementtree.vcproj [moved from PCbuild8/pyexpat/pyexpat.vcproj with 61% similarity]
PC/VS8.0/_msi.vcproj [moved from PCbuild8/_msi/_msi.vcproj with 60% similarity]
PC/VS8.0/_socket.vcproj [moved from PCbuild8/_socket/_socket.vcproj with 64% similarity]
PC/VS8.0/_sqlite3.vcproj [moved from PCbuild8/_sqlite3/_sqlite3.vcproj with 55% similarity]
PC/VS8.0/_ssl.vcproj [moved from PCbuild8/_ssl/_ssl.vcproj with 60% similarity]
PC/VS8.0/_testcapi.vcproj [moved from PCbuild8/_testcapi/_testcapi.vcproj with 62% similarity]
PC/VS8.0/_tkinter.vcproj [new file with mode: 0644]
PC/VS8.0/bdist_wininst.vcproj [new file with mode: 0644]
PC/VS8.0/build.bat [new file with mode: 0644]
PC/VS8.0/build_env.bat [new file with mode: 0644]
PC/VS8.0/build_pgo.bat [moved from PCbuild8/build_pgo.bat with 66% similarity]
PC/VS8.0/build_ssl.bat [new file with mode: 0644]
PC/VS8.0/build_ssl.py [moved from PCbuild8/build_ssl.py with 56% similarity]
PC/VS8.0/build_tkinter.py [new file with mode: 0644]
PC/VS8.0/bz2.vcproj [moved from PCbuild8/bz2/bz2.vcproj with 61% similarity]
PC/VS8.0/debug.vsprops [new file with mode: 0644]
PC/VS8.0/env.bat [new file with mode: 0644]
PC/VS8.0/field3.py [new file with mode: 0644]
PC/VS8.0/idle.bat [new file with mode: 0644]
PC/VS8.0/make_buildinfo.c [new file with mode: 0644]
PC/VS8.0/make_buildinfo.vcproj [new file with mode: 0644]
PC/VS8.0/make_versioninfo.vcproj [new file with mode: 0644]
PC/VS8.0/pcbuild.sln [new file with mode: 0644]
PC/VS8.0/pginstrument.vsprops [new file with mode: 0644]
PC/VS8.0/pgupdate.vsprops [new file with mode: 0644]
PC/VS8.0/pyd.vsprops [new file with mode: 0644]
PC/VS8.0/pyd_d.vsprops [new file with mode: 0644]
PC/VS8.0/pyexpat.vcproj [new file with mode: 0644]
PC/VS8.0/pyproject.vsprops [new file with mode: 0644]
PC/VS8.0/python.vcproj [moved from PCbuild8/python/python.vcproj with 60% similarity]
PC/VS8.0/pythoncore.vcproj [moved from PCbuild8/pythoncore/pythoncore.vcproj with 75% similarity]
PC/VS8.0/pythonw.vcproj [moved from PCbuild8/pythonw/pythonw.vcproj with 61% similarity]
PC/VS8.0/release.vsprops [moved from PCbuild8/PGUpdate.vsprops with 54% similarity]
PC/VS8.0/rmpyc.py [moved from PCbuild8/rmpyc.py with 85% similarity]
PC/VS8.0/rt.bat [moved from PCbuild8/rt.bat with 71% similarity]
PC/VS8.0/select.vcproj [moved from PCbuild8/select/select.vcproj with 61% similarity]
PC/VS8.0/unicodedata.vcproj [moved from PCbuild8/unicodedata/unicodedata.vcproj with 63% similarity]
PC/VS8.0/w9xpopen.vcproj [new file with mode: 0644]
PC/VS8.0/winsound.vcproj [moved from PCbuild8/winsound/winsound.vcproj with 64% similarity]
PC/VS8.0/x64.vsprops [new file with mode: 0644]
PCbuild/pyproject.vsprops
PCbuild/readme.txt
PCbuild/vs9to8.py [new file with mode: 0644]
PCbuild8/PGInstrument.vsprops [deleted file]
PCbuild8/_ctypes/_ctypes.vsprops [deleted file]
PCbuild8/_ctypes/masm64.rules [deleted file]
PCbuild8/_elementtree/_elementtree.vcproj [deleted file]
PCbuild8/_tkinter/_tkinter.vcproj [deleted file]
PCbuild8/build.bat [deleted file]
PCbuild8/installer.bmp [deleted file]
PCbuild8/make_buildinfo/make_buildinfo.c [deleted file]
PCbuild8/make_buildinfo/make_buildinfo.vcproj [deleted file]
PCbuild8/make_versioninfo/make_versioninfo.vcproj [deleted file]
PCbuild8/pcbuild.sln [deleted file]
PCbuild8/pyd.vsprops [deleted file]
PCbuild8/pyd_d.vsprops [deleted file]
PCbuild8/pyproject.vsprops [deleted file]
PCbuild8/pythoncore/getbuildinfo.vsprops [deleted file]
PCbuild8/readme.txt [deleted file]
Tools/buildbot/build.bat
Tools/buildbot/buildmsi.bat
Tools/buildbot/clean.bat
Tools/buildbot/external.bat
Tools/buildbot/kill_python.c
Tools/buildbot/test.bat

index aecb317efaee576ef01b69c4e56d1d65d5b94625..33b5ed01743e1996f3c37f795a28909c39b50630 100644 (file)
@@ -2977,7 +2977,7 @@ class Text(Widget):
         return self.tk.call(self._w, "image", "names")
     def index(self, index):
         """Return the index in the form line.char for INDEX."""
-        return self.tk.call(self._w, 'index', index)
+        return str(self.tk.call(self._w, 'index', index))
     def insert(self, index, chars, *args):
         """Insert CHARS before the characters at INDEX. An additional
         tag can be given in ARGS. Additional CHARS and tags can follow in ARGS."""
index 875903ee842b269abf2e77472d4200a215cbadc4..a87ab71ff9c7c5edd766b71f22fa5bda6ff4aaab 100644 (file)
@@ -126,10 +126,23 @@ class urlopen_HttpTests(unittest.TestCase):
         finally:
             self.unfakehttp()
 
+    def test_read_bogus(self):
+        # urlopen() should raise IOError for many error codes.
+        self.fakehttp(b'''HTTP/1.1 401 Authentication Required
+Date: Wed, 02 Jan 2008 03:03:54 GMT
+Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+''')
+        try:
+            self.assertRaises(IOError, urllib.urlopen, "http://python.org/")
+        finally:
+            self.unfakehttp()
+
     def test_empty_socket(self):
         # urlopen() raises IOError if the underlying socket does not send any
         # data. (#1680230)
-        self.fakehttp(b"")
+        self.fakehttp(b'')
         try:
             self.assertRaises(IOError, urllib.urlopen, "http://something")
         finally:
index 81a8cd69e470fdb60d6023a1855836b3d9600d19..df2141995d8b4c4aadc4e2ce869c466023660060 100644 (file)
@@ -359,7 +359,7 @@ class URLopener:
 
         # According to RFC 2616, "2xx" code indicates that the client's
         # request was successfully received, understood, and accepted.
-        if not (200 <= response.status < 300):
+        if (200 <= response.status < 300):
             return addinfourl(response.fp, response.msg, "http:" + url)
         else:
             return self.http_error(
@@ -402,6 +402,77 @@ class URLopener:
             """Use HTTPS protocol."""
             return self._open_generic_http(self._https_connection, url, data)
 
+            import httplib
+            user_passwd = None
+            proxy_passwd = None
+            if isinstance(url, str):
+                host, selector = splithost(url)
+                if host:
+                    user_passwd, host = splituser(host)
+                    host = unquote(host)
+                realhost = host
+            else:
+                host, selector = url
+                # here, we determine, whether the proxy contains authorization information
+                proxy_passwd, host = splituser(host)
+                urltype, rest = splittype(selector)
+                url = rest
+                user_passwd = None
+                if urltype.lower() != 'https':
+                    realhost = None
+                else:
+                    realhost, rest = splithost(rest)
+                    if realhost:
+                        user_passwd, realhost = splituser(realhost)
+                    if user_passwd:
+                        selector = "%s://%s%s" % (urltype, realhost, rest)
+                #print "proxy via https:", host, selector
+            if not host: raise IOError('https error', 'no host given')
+            if proxy_passwd:
+                import base64
+                proxy_auth = base64.b64encode(proxy_passwd).strip()
+            else:
+                proxy_auth = None
+            if user_passwd:
+                import base64
+                auth = base64.b64encode(user_passwd).strip()
+            else:
+                auth = None
+            h = httplib.HTTPS(host, 0,
+                              key_file=self.key_file,
+                              cert_file=self.cert_file)
+            if data is not None:
+                h.putrequest('POST', selector)
+                h.putheader('Content-Type',
+                            'application/x-www-form-urlencoded')
+                h.putheader('Content-Length', '%d' % len(data))
+            else:
+                h.putrequest('GET', selector)
+            if proxy_auth: h.putheader('Proxy-Authorization', 'Basic %s' % proxy_auth)
+            if auth: h.putheader('Authorization', 'Basic %s' % auth)
+            if realhost: h.putheader('Host', realhost)
+            for args in self.addheaders: h.putheader(*args)
+            h.endheaders()
+            if data is not None:
+                h.send(data)
+            errcode, errmsg, headers = h.getreply()
+            fp = h.getfile()
+            if errcode == -1:
+                if fp: fp.close()
+                # something went wrong with the HTTP status line
+                raise IOError('http protocol error', 0,
+                                'got a bad status line', None)
+            # According to RFC 2616, "2xx" code indicates that the client's
+            # request was successfully received, understood, and accepted.
+            if (200 <= errcode < 300):
+                return addinfourl(fp, headers, "https:" + url)
+            else:
+                if data is None:
+                    return self.http_error(url, fp, errcode, errmsg, headers)
+                else:
+                    return self.http_error(url, fp, errcode, errmsg, headers,
+                                           data)
+
     def open_file(self, url):
         """Use local file or FTP depending on form of URL."""
         if not isinstance(url, str):
index bc54b7b1e45d841e810e0e9aed603b772f0ca186..0e9390404309621ccbda7d0a2027409c631eca22 100644 (file)
@@ -1906,7 +1906,7 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
        PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
        PyObject *self, *func, *arg, *res, *s;
        int i, rv;
-       Tcl_Obj *tres;
+       Tcl_Obj *obj_res;
 
        ENTER_PYTHON
 
@@ -1939,13 +1939,13 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
        if (res == NULL)
                return PythonCmd_Error(interp);
 
-       tres = AsObj(res);
-       if (tres == NULL) {
+       obj_res = AsObj(res);
+       if (obj_res == NULL) {
                Py_DECREF(res);
                return PythonCmd_Error(interp);
        }
        else {
-               Tcl_SetObjResult(Tkapp_Interp(self), tres);
+               Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
                rv = TCL_OK;
        }
 
similarity index 63%
rename from PCbuild8/_bsddb/_bsddb.vcproj
rename to PC/VS8.0/_bsddb.vcproj
index 9416b43368d5db1c3b31b7f5cd5e3c6f3c353e3a..0dbeb2850e8fb709534a07fdfede49087a8ce152 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_bsddb"\r
-       ProjectGUID="{E644B843-F7CA-4888-AA6D-653C77592856}"\r
+       ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"\r
        RootNamespace="_bsddb"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Debug /project db_static&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -85,9 +77,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -95,7 +84,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug_AMD64\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Debug AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"\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
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"\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
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"\r
+                               BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\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
+                       Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Release /project db_static&#x0D;&#x0A;"\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
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"\r
+                               BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\_bsddb.c"\r
+                               RelativePath="..\..\Modules\bsddb.h"\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
+                       Name="Source Files"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_bsddb.c"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
similarity index 62%
rename from PCbuild8/_ctypes/_ctypes.vcproj
rename to PC/VS8.0/_ctypes.vcproj
index 85ca24bbee36d0f97165180e9e5549330b98cdd0..bb68ad9ba1cb6c4a33a0e63a4a080f36853a4210 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_ctypes"\r
-       ProjectGUID="{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}"\r
+       ProjectGUID="{0E9791DB-593A-465F-98BC-681011311618}"\r
        RootNamespace="_ctypes"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\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
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\r
@@ -33,9 +31,6 @@
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -68,9 +55,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -90,9 +75,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        />\r
-                       <Tool\r
-                               Name="MASM64"\r
-                       />\r
                        <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"\r
+                               SubSystem="0"\r
+                               BaseAddress="0x1D1A0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
        <References>\r
        </References>\r
        <Files>\r
+               <Filter\r
+                       Name="Header Files"\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="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
                        <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
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
-                                               Name="MASM64"\r
+                                               Name="VCCustomBuildTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
-                                               Name="MASM64"\r
+                                               Name="VCCustomBuildTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
+                                               Outputs="$(IntDir)\win64.obj"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
-                                               Name="MASM64"\r
+                                               Name="VCCustomBuildTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGInstrument|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
+                                               Outputs="$(IntDir)\win64.obj"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
-                                               Name="MASM64"\r
+                                               Name="VCCustomBuildTool"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="PGUpdate|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
+                                               Outputs="$(IntDir)\win64.obj"\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
similarity index 63%
rename from PCbuild8/_ctypes_test/_ctypes_test.vcproj
rename to PC/VS8.0/_ctypes_test.vcproj
index 27f8e53fd7fe072fe4fc33c063825c5e3eff4880..097241ef98b60edb53bf654c69a4feb1c944981d 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_ctypes_test"\r
-       ProjectGUID="{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"\r
+       ProjectGUID="{9EC7190A-249F-4180-A900-548FDCF3055F}"\r
        RootNamespace="_ctypes_test"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
@@ -61,9 +54,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -83,9 +73,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -93,7 +80,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"\r
+                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"\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
+                       Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"\r
+                               RelativePath="..\..\Modules\_ctypes\_ctypes_test.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
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
similarity index 61%
rename from PCbuild8/pyexpat/pyexpat.vcproj
rename to PC/VS8.0/_elementtree.vcproj
index f45a0f7a4f98eb118f7a133ee5126a9efc004303..32fac0c75476cfc1c13123126a33355484e2d09b 100644 (file)
@@ -2,10 +2,11 @@
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="pyexpat"\r
-       ProjectGUID="{80EBF51A-6018-4589-9A53-5AAF2872E230}"\r
-       RootNamespace="pyexpat"\r
+       Name="_elementtree"\r
+       ProjectGUID="{17E1E049-C309-4D79-843F-AE483C264AEA}"\r
+       RootNamespace="_elementtree"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,9 +56,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,9 +77,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -94,7 +84,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\pyexpat.c"\r
+                               RelativePath="..\..\Modules\expat\ascii.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\expat\xmlparse.c"\r
+                               RelativePath="..\..\Modules\expat\asciitab.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\expat\xmlrole.c"\r
+                               RelativePath="..\..\Modules\expat\expat.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\expat\xmltok.c"\r
+                               RelativePath="..\..\Modules\expat\expat_config.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\expat_external.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\iasciitab.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\internal.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\latin1tab.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\macconfig.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\nametab.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\pyexpatns.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\utf8tab.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\expat\winconfig.h"\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
                </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
+                       Name="Source Files"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_elementtree.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
        </Files>\r
        <Globals>\r
similarity index 60%
rename from PCbuild8/_msi/_msi.vcproj
rename to PC/VS8.0/_msi.vcproj
index dc581d115b8b0093657a5c078266150d21e5a49a..99971c6b0081eb04e8294dddf78d7d57b6a7eb15 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_msi"\r
-       ProjectGUID="{A25ADCC5-8DE1-4F88-B842-C287923280B1}"\r
+       ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"\r
        RootNamespace="_msi"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,9 +75,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -94,7 +82,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               AdditionalDependencies="Rpcrt4.lib Msi.lib fci.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"\r
+                               BaseAddress="0x1D160000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
similarity index 64%
rename from PCbuild8/_socket/_socket.vcproj
rename to PC/VS8.0/_socket.vcproj
index 28e80d6eb3ffff5d1cc9f0feb06443139dc89f95..8abd982f7909a97e9134a97297dd075a3321df25 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_socket"\r
-       ProjectGUID="{AE31A248-5367-4EB2-A511-8722BC351CB4}"\r
+       ProjectGUID="{86937F53-C189-40EF-8CE8-8759D8E7D480}"\r
        RootNamespace="_socket"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
@@ -62,9 +55,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="ws2_32.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,9 +75,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -94,7 +82,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="ws2_32.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
+                               BaseAddress="0x1e1D0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\socketmodule.c"\r
+                               RelativePath="..\..\Modules\socketmodule.h"\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
+                       Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\socketmodule.h"\r
+                               RelativePath="..\..\Modules\socketmodule.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
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
similarity index 55%
rename from PCbuild8/_sqlite3/_sqlite3.vcproj
rename to PC/VS8.0/_sqlite3.vcproj
index f81c5a1b802b3b1f5a32529b03077afe9fdfc3df..2343afa351771e969ea2c69111f60b45149f8743 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_sqlite3"\r
-       ProjectGUID="{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"\r
+       ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}"\r
        RootNamespace="_sqlite3"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -85,9 +79,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -95,7 +86,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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
+                               PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="Build sqlite3 libs and dll"\r
+                               CommandLine="cd &quot;$(sqlite3Dir)&quot;&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;if not exist &quot;$(OutDir)\sqlite3.dll&quot; copy sqlite3.dll &quot;$(OutDir)&quot;&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"\r
+                               BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\cache.c"\r
+                               RelativePath="..\..\Modules\_sqlite\cache.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\connection.c"\r
+                               RelativePath="..\..\Modules\_sqlite\connection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\cursor.c"\r
+                               RelativePath="..\..\Modules\_sqlite\cursor.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\microprotocols.c"\r
+                               RelativePath="..\..\Modules\_sqlite\microprotocols.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\module.c"\r
+                               RelativePath="..\..\Modules\_sqlite\module.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"\r
+                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\row.c"\r
+                               RelativePath="..\..\Modules\_sqlite\row.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\statement.c"\r
+                               RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\util.c"\r
+                               RelativePath="..\..\Modules\_sqlite\statement.h"\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
+                               RelativePath="..\..\Modules\_sqlite\util.h"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\connection.h"\r
+                               RelativePath="..\..\Modules\_sqlite\cache.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\cursor.h"\r
+                               RelativePath="..\..\Modules\_sqlite\connection.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\microprotocols.h"\r
+                               RelativePath="..\..\Modules\_sqlite\cursor.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\module.h"\r
+                               RelativePath="..\..\Modules\_sqlite\microprotocols.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"\r
+                               RelativePath="..\..\Modules\_sqlite\module.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\row.h"\r
+                               RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"\r
+                               RelativePath="..\..\Modules\_sqlite\row.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\statement.h"\r
+                               RelativePath="..\..\Modules\_sqlite\statement.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sqlite\util.h"\r
+                               RelativePath="..\..\Modules\_sqlite\util.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
-               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
similarity index 60%
rename from PCbuild8/_ssl/_ssl.vcproj
rename to PC/VS8.0/_ssl.vcproj
index 81162b8ca23be4715fca07d10dd1432db8e25668..72d42920b2b073a96281522dfbde901512fc1a1b 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="_ssl"
-       ProjectGUID="{ECF06871-0C44-4137-93EE-E75A2F10DBE7}"
-       RootNamespace="_ssl"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd_d.vsprops"
-                       CharacterSet="0"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="4"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               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"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd_d.vsprops"
-                       CharacterSet="0"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python_d.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               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"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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="PGInstrument|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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="PGInstrument|x64"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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="PGUpdate|Win32"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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="PGUpdate|x64"
-                       ConfigurationType="2"
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine=""
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                               TargetEnvironment="3"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_SOCKET_EXPORTS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(OutDir)\python.exe $(OutDir)\..\build_ssl.py $(ConfigurationName) -a"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               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="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\Modules\_ssl.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_ssl"\r
+       ProjectGUID="{C6E20F84-3247-4AD6-B051-B073268F73BA}"\r
+       RootNamespace="_ssl"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\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
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc32"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"\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="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
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc32"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"\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="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
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc32"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"\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="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
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc32"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\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="$(opensslDir)\inc64"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                               CommandLine=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_hashopenssl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_ssl.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
similarity index 62%
rename from PCbuild8/_testcapi/_testcapi.vcproj
rename to PC/VS8.0/_testcapi.vcproj
index 61d94ab8b4af49feffa176a8d08062e4767dd766..76ad2d86c3c608ef7703548dc215a572342c8e09 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="_testcapi"\r
-       ProjectGUID="{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"\r
+       ProjectGUID="{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"\r
        RootNamespace="_testcapi"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
@@ -61,9 +54,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -83,9 +74,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -93,7 +81,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1e1F0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1e1F0000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1e1F0000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
diff --git a/PC/VS8.0/_tkinter.vcproj b/PC/VS8.0/_tkinter.vcproj
new file mode 100644 (file)
index 0000000..f1d9bb4
--- /dev/null
@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="_tkinter"\r
+       ProjectGUID="{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"\r
+       RootNamespace="_tkinter"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\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
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltkLib)"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.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
+                               AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltk64Lib)"\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="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="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltkLib)"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="&quot;$(tcltk64Dir)\include&quot;"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltk64Lib)"\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="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="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltkLib)"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="&quot;$(tcltk64Dir)\include&quot;"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltk64Lib)"\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="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="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltkLib)"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="&quot;$(tcltk64Dir)\include&quot;"\r
+                               PreprocessorDefinitions="WITH_APPINIT"\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="$(tcltk64Lib)"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\_tkinter.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\tkappinit.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PC/VS8.0/bdist_wininst.vcproj b/PC/VS8.0/bdist_wininst.vcproj
new file mode 100644 (file)
index 0000000..08adac6
--- /dev/null
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="bdist_wininst"\r
+       ProjectGUID="{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"\r
+       RootNamespace="wininst"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\distutils\command"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"\r
+                               HeaderFileName=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
+                               AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="0"\r
+                               AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="comctl32.lib imagehlp.lib"\r
+                               OutputFile="..\..\lib\distutils\command\wininst-8.0.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames="LIBC"\r
+                               ProgramDatabaseFile="..\..\lib\distutils\command\wininst-8.0.pdb"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\bdist_wininst\extract.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\bdist_wininst\install.c"\r
+                               >\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\crc32.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inffast.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inflate.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\inftrees.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\zutil.c"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\bdist_wininst\archive.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\bdist_wininst\install.rc"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\PC\bdist_wininst\PythonPowered.bmp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PC/VS8.0/build.bat b/PC/VS8.0/build.bat
new file mode 100644 (file)
index 0000000..a6d961e
--- /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%\r
diff --git a/PC/VS8.0/build_env.bat b/PC/VS8.0/build_env.bat
new file mode 100644 (file)
index 0000000..01024cf
--- /dev/null
@@ -0,0 +1 @@
+@%comspec% /k env.bat %*\r
similarity index 66%
rename from PCbuild8/build_pgo.bat
rename to PC/VS8.0/build_pgo.bat
index ec85323f23b7f9002a5e90a9b88bba28786ebf54..d28a7673002b49aaa6e90cb35410d147b4304b15 100644 (file)
@@ -9,12 +9,12 @@ setlocal
 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
+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
+set job2=..\..\lib\test\regrtest.py\r
+set path2=..\..\lib\r
 \r
 set job=%job1%\r
 set clrpath=%path1%\r
@@ -23,17 +23,19 @@ set clrpath=%path1%
 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
+set PGI=%platf%-pgi\r
+set PGO=%platf%-pgo\r
 \r
 @echo on\r
 rem build the instrumented version\r
-call build -r -p %platf% -c PGInstrument\r
+call build -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
+%PGI%\python.exe rmpyc.py %clrpath%\r
+del %PGI%\*.pgc\r
+%PGI%\python.exe %job%\r
 \r
 rem finally build the optimized version\r
-call build -r -p %platf% -c PGUpdate\r
+if exist %PGO% del /s /q %PGO%\r
+call build -p %platf% -c PGUpdate\r
+\r
diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat
new file mode 100644 (file)
index 0000000..04eab5b
--- /dev/null
@@ -0,0 +1,12 @@
+@echo off\r
+if not defined HOST_PYTHON (\r
+  if %1 EQU Debug (\r
+    set HOST_PYTHON=python_d.exe\r
+    if not exist python30_d.dll exit 1\r
+  ) ELSE (\r
+    set HOST_PYTHON=python.exe\r
+    if not exist python30.dll exit 1\r
+  )\r
+)\r
+%HOST_PYTHON% build_ssl.py %1 %2 %3\r
+\r
similarity index 56%
rename from PCbuild8/build_ssl.py
rename to PC/VS8.0/build_ssl.py
index 7658da155f54aa9a68f9948ba3d60b0f24eecb31..ab5fcea8f57d132f453814e3dc792c03d5bff7ba 100644 (file)
 # it should configure and build SSL, then build the _ssl and _hashlib
 # Python extensions without intervention.
 
-import os, sys, re
+# Modified by Christian Heimes
+# Now this script supports pre-generated makefiles and assembly files.
+# Developers don't need an installation of Perl anymore to build Python. A svn
+# checkout from our svn repository is enough.
+#
+# In Order to create the files in the case of an update you still need Perl.
+# Run build_ssl in this order:
+# python.exe build_ssl.py Release x64
+# python.exe build_ssl.py Release Win32
+
+import os, sys, re, shutil
 
 # Find all "foo.exe" files on the PATH.
 def find_all_on_path(filename, extras = None):
@@ -51,7 +61,6 @@ def find_working_perl(perls):
     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.
@@ -86,38 +95,82 @@ def find_best_ssl_dir(sources):
     sys.stdout.flush()
     return best_name
 
+def create_makefile64(makefile, m32):
+    """Create and fix makefile for 64bit
+
+    Replace 32 with 64bit directories
+    """
+    if not os.path.isfile(m32):
+        return
+    with open(m32) as fin:
+        with open(makefile, 'w') as fout:
+            for line in fin:
+                line = line.replace("=tmp32", "=tmp64")
+                line = line.replace("=out32", "=out64")
+                line = line.replace("=inc32", "=inc64")
+                # force 64 bit machine
+                line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64")
+                line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ")
+                # don't link against the lib on 64bit systems
+                line = line.replace("bufferoverflowu.lib", "")
+                fout.write(line)
+    os.unlink(m32)
+
+def fix_makefile(makefile):
+    """Fix some stuff in all makefiles
+    """
+    if not os.path.isfile(makefile):
+        return
+    with open(makefile) as fin:
+        lines = fin.readlines()
+    with open(makefile, 'w') as fout:
+        for line in lines:
+            if line.startswith("PERL="):
+                continue
+            if line.startswith("CP="):
+                line = "CP=copy\n"
+            if line.startswith("MKDIR="):
+                line = "MKDIR=mkdir\n"
+            if line.startswith("CFLAG="):
+                line = line.strip()
+                for algo in ("RC5", "MDC2", "IDEA"):
+                    noalgo = " -DOPENSSL_NO_%s" % algo
+                    if noalgo not in line:
+                        line = line + noalgo
+                line = line + '\n'
+            fout.write(line)
+
 def run_configure(configure, do_script):
+    print("perl Configure "+configure)
     os.system("perl Configure "+configure)
+    print(do_script)
     os.system(do_script)
 
 def main():
     build_all = "-a" in sys.argv
     if sys.argv[1] == "Release":
-        arch = "x86"
         debug = False
-        configure = "VC-WIN32"
-        do_script = "ms\\do_masm"
-        makefile = "ms\\nt.mak"
     elif sys.argv[1] == "Debug":
-        arch = "x86"
         debug = True
+    else:
+        raise ValueError(str(sys.argv))
+
+    if sys.argv[2] == "Win32":
+        arch = "x86"
         configure = "VC-WIN32"
-        do_script = "ms\\do_masm"
-        makefile="ms\\d32.mak"
-    elif sys.argv[1] == "ReleaseItanium":
-        arch = "ia64"
-        debug = False
-        configure = "VC-WIN64I"
-        do_script = "ms\\do_win64i"
-        makefile = "ms\\nt.mak"
-        os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
-    elif sys.argv[1] == "ReleaseAMD64":
+        do_script = "ms\\do_nasm"
+        makefile="ms\\nt.mak"
+        m32 = makefile
+    elif sys.argv[2] == "x64":
         arch="amd64"
-        debug=False
         configure = "VC-WIN64A"
         do_script = "ms\\do_win64a"
-        makefile = "ms\\nt.mak"
-        os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
+        makefile = "ms\\nt64.mak"
+        m32 = makefile.replace('64', '')
+        #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
+    else:
+        raise ValueError(str(sys.argv))
+
     make_flags = ""
     if build_all:
         make_flags = "-a"
@@ -126,23 +179,30 @@ def main():
     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("No Perl installation was found. Existing Makefiles are used.")
 
     print("Found a working perl at '%s'" % (perl,))
     sys.stdout.flush()
     # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
     ssl_dir = find_best_ssl_dir(("..\\..\\..",))
     if ssl_dir is None:
-        print(os.path.abspath(os.getcwd()))
         sys.exit(1)
 
     old_cd = os.getcwd()
     try:
         os.chdir(ssl_dir)
+        # rebuild makefile when we do the role over from 32 to 64 build
+        if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile):
+            os.unlink(m32)
+
         # If the ssl makefiles do not exist, we invoke Perl to generate them.
         # Due to a bug in this script, the makefile sometimes ended up empty
         # Force a regeneration if it is.
         if not os.path.isfile(makefile) or os.path.getsize(makefile)==0:
+            if perl is None:
+                print("Perl is required to build the makefiles!")
+                sys.exit(1)
+
             print("Creating the makefiles...")
             sys.stdout.flush()
             # Put our working Perl at the front of our path
@@ -150,13 +210,31 @@ def main():
                                           os.pathsep + \
                                           os.environ["PATH"]
             run_configure(configure, do_script)
-            if arch=="x86" and debug:
-                # the do_masm script in openssl doesn't generate a debug
-                # build makefile so we generate it here:
-                os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
+            if debug:
+                print("OpenSSL debug builds aren't supported.")
+            #if arch=="x86" and debug:
+            #    # the do_masm script in openssl doesn't generate a debug
+            #    # build makefile so we generate it here:
+            #    os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
+
+            if arch == "amd64":
+                create_makefile64(makefile, m32)
+            fix_makefile(makefile)
+            shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch)
+            shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch)
 
         # Now run make.
-        makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
+        if arch == "amd64":
+            rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm")
+            if rc:
+                print("ml64 assembler has failed.")
+                sys.exit(rc)
+
+        shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h")
+        shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h")
+
+        #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
+        makeCommand = "nmake /nologo -f \"%s\"" % makefile
         print("Executing ssl makefiles:", makeCommand)
         sys.stdout.flush()
         rc = os.system(makeCommand)
diff --git a/PC/VS8.0/build_tkinter.py b/PC/VS8.0/build_tkinter.py
new file mode 100644 (file)
index 0000000..defafe8
--- /dev/null
@@ -0,0 +1,86 @@
+"""Script to compile the dependencies of _tkinter
+
+Copyright (c) 2007 by Christian Heimes <christian@cheimes.de>
+
+Licensed to PSF under a Contributor Agreement.
+"""
+
+import os
+import sys
+import shutil
+
+here = os.path.abspath(os.path.dirname(__file__))
+par = os.path.pardir
+
+if 1:
+    TCL = "tcl8.4.16"
+    TK = "tk8.4.16"
+    TIX = "tix-8.4.0"
+else:
+    TCL = "tcl8.5b3"
+    TK = "tcl8.5b3"
+    TIX = "Tix8.4.2"
+
+ROOT = os.path.abspath(os.path.join(here, par, par, par))
+# Windows 2000 compatibility: WINVER 0x0500
+# http://msdn2.microsoft.com/en-us/library/aa383745.aspx
+NMAKE = "nmake /nologo /f %s COMPILERFLAGS=-DWINVER=0x0500 %s %s"
+
+def nmake(makefile, command="", **kw):
+    defines = ' '.join(k+'='+v for k, v in kw.items())
+    cmd = NMAKE % (makefile, defines, command)
+    print("\n\n"+cmd+"\n")
+    if os.system(cmd) != 0:
+        raise RuntimeError(cmd)
+
+def build(platform, clean):
+    if platform == "Win32":
+        dest = os.path.join(ROOT, "tcltk")
+        machine = "X86"
+    elif platform == "x64":
+        dest = os.path.join(ROOT, "tcltk64")
+        machine = "X64"
+    else:
+        raise ValueError(platform)
+
+    # TCL
+    tcldir = os.path.join(ROOT, TCL)
+    if 1:
+        os.chdir(os.path.join(tcldir, "win"))
+        if clean:
+            nmake("makefile.vc", "clean")
+        nmake("makefile.vc")
+        nmake("makefile.vc", "install", INSTALLDIR=dest)
+
+    # TK
+    if 1:
+        os.chdir(os.path.join(ROOT, TK, "win"))
+        if clean:
+            nmake("makefile.vc", "clean", TCLDIR=tcldir)
+        nmake("makefile.vc", TCLDIR=tcldir)
+        nmake("makefile.vc", "install", TCLDIR=tcldir, INSTALLDIR=dest)
+
+    # TIX
+    if 1:
+        # python9.mak is available at http://svn.python.org
+        os.chdir(os.path.join(ROOT, TIX, "win"))
+        if clean:
+            nmake("python9.mak", "clean")
+        nmake("python9.mak", MACHINE=machine)
+        nmake("python9.mak", "install")
+
+def main():
+    if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"):
+        print("%s Win32|x64" % sys.argv[0])
+        sys.exit(1)
+
+    if "-c" in sys.argv:
+        clean = True
+    else:
+        clean = False
+
+    build(sys.argv[1], clean)
+
+
+if __name__ == '__main__':
+    main()
similarity index 61%
rename from PCbuild8/bz2/bz2.vcproj
rename to PC/VS8.0/bz2.vcproj
index 68935decf5774bea5573be98ac79055b00fc4e11..8f78335254b382ca561dbbb1252cc75849f6e72a 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="bz2"\r
-       ProjectGUID="{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}"\r
+       ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"\r
        RootNamespace="bz2"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -85,9 +77,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -95,7 +84,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\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="VCPreLinkEventTool"\r
+                               Description="Build libbz2"\r
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"\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
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
diff --git a/PC/VS8.0/debug.vsprops b/PC/VS8.0/debug.vsprops
new file mode 100644 (file)
index 0000000..803da6e
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="debug"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               PreprocessorDefinitions="_DEBUG"\r
+       />\r
+</VisualStudioPropertySheet>
\ No newline at end of file
diff --git a/PC/VS8.0/env.bat b/PC/VS8.0/env.bat
new file mode 100644 (file)
index 0000000..7717d01
--- /dev/null
@@ -0,0 +1,5 @@
+@echo off\r
+set VS8=%ProgramFiles%\Microsoft Visual Studio 8\r
+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64\r
+echo.\r
+call "%VS8%\VC\vcvarsall.bat" %1\r
diff --git a/PC/VS8.0/field3.py b/PC/VS8.0/field3.py
new file mode 100644 (file)
index 0000000..edcbe36
--- /dev/null
@@ -0,0 +1,35 @@
+# 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)
diff --git a/PC/VS8.0/idle.bat b/PC/VS8.0/idle.bat
new file mode 100644 (file)
index 0000000..274ae1a
--- /dev/null
@@ -0,0 +1,15 @@
+@echo off\r
+rem start idle\r
+rem Usage:  idle [-d]\r
+rem -d   Run Debug build (python_d.exe).  Else release build.\r
+\r
+setlocal\r
+set exe=python\r
+PATH %PATH%;..\..\..\tcltk\bin\r
+\r
+if "%1"=="-d" (set exe=python_d) & shift\r
+\r
+set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+\r
+echo on\r
+%cmd%\r
diff --git a/PC/VS8.0/make_buildinfo.c b/PC/VS8.0/make_buildinfo.c
new file mode 100644 (file)
index 0000000..133cfee
--- /dev/null
@@ -0,0 +1,94 @@
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
+#define CMD_SIZE 500
+
+/* This file creates the getbuildinfo.o object, by first
+   invoking subwcrev.exe (if found), and then invoking cl.exe.
+   As a side effect, it might generate PCBuild\getbuildinfo2.c
+   also. If this isn't a subversion checkout, or subwcrev isn't
+   found, it compiles ..\\..\\Modules\\getbuildinfo.c instead.
+
+   Currently, subwcrev.exe is found from the registry entries
+   of TortoiseSVN.
+
+   No attempt is made to place getbuildinfo.o into the proper
+   binary directory. This isn't necessary, as this tool is
+   invoked as a pre-link step for pythoncore, so that overwrites
+   any previous getbuildinfo.o.
+
+*/
+
+int make_buildinfo2()
+{
+       struct _stat st;
+       HKEY hTortoise;
+       char command[CMD_SIZE+1];
+       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, CMD_SIZE, "bin\\subwcrev.exe");
+       if (_stat(command+1, &st) < 0)
+               /* subwcrev.exe not part of the release */
+               return 0;
+       strcat_s(command, CMD_SIZE, "\" ..\\.. ..\\..\\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] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
+       int do_unlink, result;
+       if (argc != 2) {
+               fprintf(stderr, "make_buildinfo $(ConfigurationName)\n");
+               return EXIT_FAILURE;
+       }
+       if (strcmp(argv[1], "Release") == 0) {
+               strcat_s(command, CMD_SIZE, "-MD ");
+       }
+       else if (strcmp(argv[1], "Debug") == 0) {
+               strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd ");
+       }
+       else if (strcmp(argv[1], "ReleaseItanium") == 0) {
+               strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
+       }
+       else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
+               strcat_s(command, CMD_SIZE, "-MD ");
+               strcat_s(command, CMD_SIZE, "-MD /USECL:MS_OPTERON ");
+       }
+       else {
+               fprintf(stderr, "unsupported configuration %s\n", argv[1]);
+               return EXIT_FAILURE;
+       }
+
+       if ((do_unlink = make_buildinfo2()))
+               strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV ");
+       else
+               strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
+       strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\..\\Include -I..\\..\\PC");
+       puts(command); fflush(stdout);
+       result = system(command);
+       if (do_unlink)
+               _unlink("getbuildinfo2.c");
+       if (result < 0)
+               return EXIT_FAILURE;
+       return 0;
+}
\ No newline at end of file
diff --git a/PC/VS8.0/make_buildinfo.vcproj b/PC/VS8.0/make_buildinfo.vcproj
new file mode 100644 (file)
index 0000000..3cc71e6
--- /dev/null
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="windows-1250"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="make_buildinfo"\r
+       ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"\r
+       RootNamespace="make_buildinfo"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\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="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.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
+                               InlineFunctionExpansion="1"\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               RuntimeLibrary="0"\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)/make_buildinfo.exe"\r
+                               ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
+                               SubSystem="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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\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="_CONSOLE"\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
+                       />\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\make_buildinfo.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj
new file mode 100644 (file)
index 0000000..b097162
--- /dev/null
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="make_versioninfo"\r
+       ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"\r
+       RootNamespace="make_versioninfo"\r
+       TargetFrameworkVersion="131072"\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="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                               Description="Build PC/pythonnt_rc(_d).h"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"\r
+                               Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\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="odbccp32.lib"\r
+                               OutputFile="$(SolutionDir)make_versioninfo.exe"\r
+                               ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
+                               SubSystem="1"\r
+                               BaseAddress="0x1d000000"\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="VCPostBuildEventTool"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                               Description="Build PC/pythonnt_rc(_d).h"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"\r
+                               Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               EnableIntrinsicFunctions="true"\r
+                               PreprocessorDefinitions="_CONSOLE"\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="$(SolutionDir)make_versioninfo.exe"\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="VCPostBuildEventTool"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                               Description="Build PC/pythonnt_rc(_d).h"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"\r
+                               Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"\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
+                               InlineFunctionExpansion="1"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\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="odbccp32.lib"\r
+                               OutputFile="$(SolutionDir)make_versioninfo_d.exe"\r
+                               ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
+                               SubSystem="1"\r
+                               BaseAddress="0x1d000000"\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="VCPostBuildEventTool"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                               Description="Build PC/pythonnt_rc(_d).h"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"\r
+                               Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"\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
+                               InlineFunctionExpansion="1"\r
+                               EnableIntrinsicFunctions="false"\r
+                               PreprocessorDefinitions="_CONSOLE"\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="$(SolutionDir)make_versioninfo_d.exe"\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="VCPostBuildEventTool"\r
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\make_versioninfo.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PC/VS8.0/pcbuild.sln b/PC/VS8.0/pcbuild.sln
new file mode 100644 (file)
index 0000000..954179e
--- /dev/null
@@ -0,0 +1,471 @@
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               ..\..\Modules\getbuildinfo.c = ..\..\Modules\getbuildinfo.c\r
+               readme.txt = readme.txt\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
+               PGInstrument|Win32 = PGInstrument|Win32\r
+               PGInstrument|x64 = PGInstrument|x64\r
+               PGUpdate|Win32 = PGUpdate|Win32\r
+               PGUpdate|x64 = PGUpdate|x64\r
+               Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32\r
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64\r
+               {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64\r
+               {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32\r
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64\r
+               {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.ActiveCfg = Debug|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Debug|x64.Build.0 = Debug|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|Win32.Build.0 = Release|Win32\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.ActiveCfg = Release|x64\r
+               {B4D38F3F-68FB-42EC-A45D-E00657BB3627}.Release|x64.Build.0 = Release|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64\r
+               {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64\r
+               {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64\r
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64\r
+               {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64\r
+               {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|Win32.Build.0 = Debug|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.ActiveCfg = Debug|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Debug|x64.Build.0 = Debug|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.ActiveCfg = Release|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Release|Win32.Build.0 = Release|Win32\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.ActiveCfg = Release|x64\r
+               {13CECB97-4119-4316-9D42-8534019A5A44}.Release|x64.Build.0 = Release|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64\r
+               {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64\r
+               {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.ActiveCfg = Debug|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Debug|x64.Build.0 = Debug|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.Build.0 = Release|Win32\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.ActiveCfg = Release|x64\r
+               {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.Build.0 = Release|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.ActiveCfg = Debug|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Debug|x64.Build.0 = Debug|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|Win32.Build.0 = Release|Win32\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.ActiveCfg = Release|x64\r
+               {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}.Release|x64.Build.0 = Release|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64\r
+               {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64\r
+               {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64\r
+               {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/PC/VS8.0/pginstrument.vsprops b/PC/VS8.0/pginstrument.vsprops
new file mode 100644 (file)
index 0000000..38c5f18
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pginstrument"\r
+       OutputDirectory="$(OutDirPGI)"\r
+       IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               Optimization="2"\r
+               InlineFunctionExpansion="1"\r
+               EnableIntrinsicFunctions="false"\r
+               FavorSizeOrSpeed="2"\r
+               OmitFramePointers="true"\r
+               EnableFiberSafeOptimizations="false"\r
+               WholeProgramOptimization="true"\r
+               StringPooling="true"\r
+               ExceptionHandling="0"\r
+               BufferSecurityCheck="false"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               OptimizeReferences="2"\r
+               EnableCOMDATFolding="2"\r
+               LinkTimeCodeGeneration="2"\r
+               ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"\r
+               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"\r
+       />\r
+       <UserMacro\r
+               Name="OutDirPGI"\r
+               Value="$(SolutionDir)$(PlatformName)-pgi\"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PC/VS8.0/pgupdate.vsprops b/PC/VS8.0/pgupdate.vsprops
new file mode 100644 (file)
index 0000000..26cfc2d
--- /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="pgupdate"\r
+       OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"\r
+       InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalManifestDependencies=""\r
+               LinkTimeCodeGeneration="4"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PC/VS8.0/pyd.vsprops b/PC/VS8.0/pyd.vsprops
new file mode 100644 (file)
index 0000000..1294146
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyd"\r
+       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               RuntimeLibrary="2"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               OutputFile="$(OutDir)\$(ProjectName).pyd"\r
+               ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
+               ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+       />\r
+       <Tool\r
+               Name="VCPostBuildEventTool"\r
+               CommandLine=""\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops
new file mode 100644 (file)
index 0000000..18f4bcf
--- /dev/null
@@ -0,0 +1,30 @@
+<?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;.\debug.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               Optimization="0"\r
+               InlineFunctionExpansion="0"\r
+               EnableIntrinsicFunctions="false"\r
+               RuntimeLibrary="3"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               OutputFile="$(OutDir)\$(ProjectName)_d.pyd"\r
+               LinkIncremental="1"\r
+               ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"\r
+               ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+       />\r
+       <Tool\r
+               Name="VCPostBuildEventTool"\r
+               CommandLine=""\r
+       />\r
+       <UserMacro\r
+               Name="PythonExe"\r
+               Value="$(SolutionDir)python_d.exe"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PC/VS8.0/pyexpat.vcproj b/PC/VS8.0/pyexpat.vcproj
new file mode 100644 (file)
index 0000000..b59e4ec
--- /dev/null
@@ -0,0 +1,553 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyexpat"\r
+       ProjectGUID="{D06B6426-4762-44CC-8BAD-D79052507F2F}"\r
+       RootNamespace="pyexpat"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\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
+                               AdditionalIncludeDirectories=".\..\..\Modules\expat"\r
+                               PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.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
+                               AdditionalIncludeDirectories=".\..\..\Modules\expat"\r
+                               PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                               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="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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                       />\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="2"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.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="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"\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
+                               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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\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="Source Files"\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
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
new file mode 100644 (file)
index 0000000..a09a794
--- /dev/null
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="pyproject"\r
+       OutputDirectory="$(SolutionDir)"\r
+       IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               Optimization="2"\r
+               InlineFunctionExpansion="1"\r
+               EnableIntrinsicFunctions="true"\r
+               AdditionalIncludeDirectories="..\..\Include; ..\..\PC"\r
+               PreprocessorDefinitions="_WIN32"\r
+               StringPooling="true"\r
+               ExceptionHandling="0"\r
+               RuntimeLibrary="0"\r
+               EnableFunctionLevelLinking="true"\r
+               WarningLevel="3"\r
+               DebugInformationFormat="3"\r
+               CompileAs="0"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               LinkIncremental="1"\r
+               AdditionalLibraryDirectories="$(OutDir)"\r
+               GenerateDebugInformation="true"\r
+               ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"\r
+               SubSystem="2"\r
+               RandomizedBaseAddress="1"\r
+               DataExecutionPrevention="0"\r
+               TargetMachine="1"\r
+       />\r
+       <Tool\r
+               Name="VCResourceCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\PC;..\..\Include"\r
+       />\r
+       <UserMacro\r
+               Name="PyDllName"\r
+               Value="python30"\r
+       />\r
+       <UserMacro\r
+               Name="PythonExe"\r
+               Value="$(SolutionDir)\python.exe"\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
+       <UserMacro\r
+               Name="opensslDir"\r
+               Value="..\..\..\openssl-0.9.8g\"\r
+       />\r
+       <UserMacro\r
+               Name="tcltkDir"\r
+               Value="..\..\..\tcltk\"\r
+       />\r
+       <UserMacro\r
+               Name="tcltk64Dir"\r
+               Value="..\..\..\tcltk64"\r
+       />\r
+       <UserMacro\r
+               Name="tcltkLib"\r
+               Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"\r
+       />\r
+       <UserMacro\r
+               Name="tcltk64Lib"\r
+               Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"\r
+       />\r
+</VisualStudioPropertySheet>\r
similarity index 60%
rename from PCbuild8/python/python.vcproj
rename to PC/VS8.0/python.vcproj
index 2ec1b8aef8a581bd68a83c1296c906c611d19c9b..7d10e1446dea3e3b151aec16de1283b839d38eb5 100644 (file)
@@ -3,9 +3,8 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="python"\r
-       ProjectGUID="{AE617428-B823-4B87-BC6D-DC7C12C746D3}"\r
-       RootNamespace="python"\r
-       Keyword="Win32Proj"\r
+       ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"\r
+       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
+                       Name="Release|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Release|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\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
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
-                               StackReserveSize="3000000"\r
-                               TargetMachine="17"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Debug|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               Optimization="0"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               RuntimeLibrary="3"\r
+                               BrowseInformation="1"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Debug|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               Optimization="0"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               RuntimeLibrary="3"\r
+                               BrowseInformation="1"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
-                               StackReserveSize="3000000"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
-                               StackReserveSize="3000000"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_CONSOLE"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)\$(ProjectName).exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               AdditionalDependencies="odbccp32.lib"\r
+                               OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
-                               StackReserveSize="3000000"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
                </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Modules\python.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
similarity index 75%
rename from PCbuild8/pythoncore/pythoncore.vcproj
rename to PC/VS8.0/pythoncore.vcproj
index 0fe33907476f12f9b5a4f2464638709b9023e18f..6a16cd9d22dbd21b82e981b3c6bbe19b5bde48c3 100644 (file)
@@ -3,9 +3,9 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="pythoncore"\r
-       ProjectGUID="{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"\r
-       RootNamespace="PCBuild9"\r
-       Keyword="Win32Proj"\r
+       ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"\r
+       RootNamespace="pythoncore"\r
+       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
+                       Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
+                               RuntimeLibrary="2"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"\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
+                               AdditionalDependencies="getbuildinfo.o"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDir)$(PyDllName).lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
+                               RuntimeLibrary="2"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\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
+                               AdditionalDependencies="getbuildinfo.o"\r
+                               OutputFile="$(OutDir)\$(PyDllName).dll"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDir)$(PyDllName).lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalOptions="/Zm200 "\r
+                               Optimization="0"\r
+                               InlineFunctionExpansion="0"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
+                               RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"\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
+                               AdditionalDependencies="getbuildinfo.o"\r
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDir)$(PyDllName)_d.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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
+                       Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\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
+                               AdditionalOptions="/Zm200 "\r
+                               Optimization="0"\r
+                               InlineFunctionExpansion="0"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
+                               RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\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
+                               AdditionalDependencies="getbuildinfo.o"\r
+                               OutputFile="$(OutDir)\$(PyDllName)_d.dll"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDir)$(PyDllName)_d.lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
                                RuntimeLibrary="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="getbuildinfo.o"\r
                                OutputFile="$(OutDir)\$(PyDllName).dll"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
                                RuntimeLibrary="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="getbuildinfo.o"\r
                                OutputFile="$(OutDir)\$(PyDllName).dll"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
                                RuntimeLibrary="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="getbuildinfo.o"\r
                                OutputFile="$(OutDir)\$(PyDllName).dll"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops;.\getbuildinfo.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Py_BUILD_CORE"\r
+                               AdditionalOptions="/Zm200 "\r
+                               AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"\r
+                               PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"\r
                                RuntimeLibrary="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\Include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
+                               Description="generate buildinfo"\r
+                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="getbuildinfo.o"\r
                                OutputFile="$(OutDir)\$(PyDllName).dll"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"\r
+                               BaseAddress="0x1e000000"\r
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Include"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Python\asdl.c"\r
+                               RelativePath="..\..\Include\abstract.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\ast.c"\r
+                               RelativePath="..\..\Include\asdl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\atof.c"\r
+                               RelativePath="..\..\Include\ast.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\bltinmodule.c"\r
+                               RelativePath="..\..\Include\bitset.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\ceval.c"\r
+                               RelativePath="..\..\Include\boolobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\codecs.c"\r
+                               RelativePath="..\..\Include\bytes_methods.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\compile.c"\r
+                               RelativePath="..\..\Include\bytesobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\dynload_win.c"\r
+                               RelativePath="..\..\Include\cellobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\errors.c"\r
+                               RelativePath="..\..\Include\ceval.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\frozen.c"\r
+                               RelativePath="..\..\Include\classobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\future.c"\r
+                               RelativePath="..\..\Include\cobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getargs.c"\r
+                               RelativePath="..\..\Include\code.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getcompiler.c"\r
+                               RelativePath="..\..\Include\codecs.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getcopyright.c"\r
+                               RelativePath="..\..\Include\compile.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getmtime.c"\r
+                               RelativePath="..\..\Include\complexobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getopt.c"\r
+                               RelativePath="..\..\Include\cStringIO.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getplatform.c"\r
+                               RelativePath="..\..\Include\datetime.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\getversion.c"\r
+                               RelativePath="..\..\Include\descrobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\graminit.c"\r
+                               RelativePath="..\..\Include\dictobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\import.c"\r
+                               RelativePath="..\..\Include\enumobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\importdl.c"\r
+                               RelativePath="..\..\Include\errcode.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\importdl.h"\r
+                               RelativePath="..\..\Include\eval.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\marshal.c"\r
+                               RelativePath="..\..\Include\fileobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\modsupport.c"\r
+                               RelativePath="..\..\Include\floatobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\mysnprintf.c"\r
+                               RelativePath="..\..\Include\formatter_unicode.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\mystrtoul.c"\r
+                               RelativePath="..\..\Include\frameobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\peephole.c"\r
+                               RelativePath="..\..\Include\funcobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pyarena.c"\r
+                               RelativePath="..\..\Include\genobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pyfpe.c"\r
+                               RelativePath="..\..\Include\graminit.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pystate.c"\r
+                               RelativePath="..\..\Include\grammar.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pystrcmp.c"\r
+                               RelativePath="..\..\Include\import.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pystrtod.c"\r
+                               RelativePath="..\..\Include\intobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\formatter_unicode.c"\r
+                               RelativePath="..\..\Include\intrcheck.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\Python-ast.c"\r
+                               RelativePath="..\..\Include\iterobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\pythonrun.c"\r
+                               RelativePath="..\..\Include\listobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\structmember.c"\r
+                               RelativePath="..\..\Include\longintrepr.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\symtable.c"\r
+                               RelativePath="..\..\Include\longobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\sysmodule.c"\r
+                               RelativePath="..\..\Include\marshal.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\thread.c"\r
+                               RelativePath="..\..\Include\memoryobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\thread_nt.h"\r
+                               RelativePath="..\..\Include\metagrammar.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Python\traceback.c"\r
+                               RelativePath="..\..\Include\methodobject.h"\r
                                >\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Objects"\r
-                       >\r
                        <File\r
-                               RelativePath="..\..\Objects\abstract.c"\r
+                               RelativePath="..\..\Include\modsupport.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\boolobject.c"\r
+                               RelativePath="..\..\Include\moduleobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\bytes_methods.c"\r
+                               RelativePath="..\..\Include\node.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\bytesobject.c"\r
+                               RelativePath="..\..\Include\object.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\cellobject.c"\r
+                               RelativePath="..\..\Include\objimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\classobject.c"\r
+                               RelativePath="..\..\Include\opcode.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\cobject.c"\r
+                               RelativePath="..\..\Include\osdefs.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\codeobject.c"\r
+                               RelativePath="..\..\Include\parsetok.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\complexobject.c"\r
+                               RelativePath="..\..\Include\patchlevel.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\stringlib\count.h"\r
+                               RelativePath="..\..\Include\pgen.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\descrobject.c"\r
+                               RelativePath="..\..\Include\pgenheaders.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\dictobject.c"\r
+                               RelativePath="..\..\Include\py_curses.h"\r
                                >\r
                        </File>\r
-                       <!--File\r
-                               RelativePath="..\..\Objects\doubledigits.c"\r
-                               >\r
-                       </File-->\r
                        <File\r
-                               RelativePath="..\..\Objects\doubledigits.c"\r
+                               RelativePath="..\..\Include\pyarena.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\memoryobject.c"\r
+                               RelativePath="..\..\Include\pydebug.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\enumobject.c"\r
+                               RelativePath="..\..\Include\pyerrors.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\exceptions.c"\r
+                               RelativePath="..\..\Include\pyexpat.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\stringlib\fastsearch.h"\r
+                               RelativePath="..\..\Include\pyfpe.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\fileobject.c"\r
+                               RelativePath="..\..\Include\pygetopt.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\stringlib\find.h"\r
+                               RelativePath="..\..\Include\pymactoolbox.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\floatobject.c"\r
+                               RelativePath="..\..\Include\pymem.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\frameobject.c"\r
+                               RelativePath="..\..\Include\pyport.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\funcobject.c"\r
+                               RelativePath="..\..\Include\pystate.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\genobject.c"\r
+                               RelativePath="..\..\Include\pystrcmp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\iterobject.c"\r
+                               RelativePath="..\..\Include\pystrtod.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\listobject.c"\r
+                               RelativePath="..\..\Include\Python-ast.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\longobject.c"\r
+                               RelativePath="..\..\Include\Python.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\methodobject.c"\r
+                               RelativePath="..\..\Include\pythonrun.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\moduleobject.c"\r
+                               RelativePath="..\..\Include\pythread.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\object.c"\r
+                               RelativePath="..\..\Include\rangeobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\obmalloc.c"\r
+                               RelativePath="..\..\Include\setobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\stringlib\partition.h"\r
+                               RelativePath="..\..\Include\sliceobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\rangeobject.c"\r
+                               RelativePath="..\..\Include\stringobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\setobject.c"\r
+                               RelativePath="..\..\Include\structmember.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\sliceobject.c"\r
+                               RelativePath="..\..\Include\structseq.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\stringobject.c"\r
+                               RelativePath="..\..\Include\symtable.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\structseq.c"\r
+                               RelativePath="..\..\Include\sysmodule.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\tupleobject.c"\r
+                               RelativePath="..\..\Include\timefuncs.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\typeobject.c"\r
+                               RelativePath="..\..\Include\token.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\unicodectype.c"\r
+                               RelativePath="..\..\Include\traceback.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\unicodeobject.c"\r
+                               RelativePath="..\..\Include\tupleobject.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\unicodetype_db.h"\r
+                               RelativePath="..\..\Include\ucnhash.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\weakrefobject.c"\r
+                               RelativePath="..\..\Include\unicodeobject.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
                        <File\r
-                               RelativePath="..\..\PC\python_nt.rc"\r
+                               RelativePath="..\..\Include\weakrefobject.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Include"\r
+                       Name="Modules"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Include\abstract.h"\r
+                               RelativePath="..\..\Modules\_bisectmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\asdl.h"\r
+                               RelativePath="..\..\Modules\_codecsmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\ast.h"\r
+                               RelativePath="..\..\Modules\_collectionsmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\bitset.h"\r
+                               RelativePath="..\..\Modules\_csv.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\boolobject.h"\r
+                               RelativePath="..\..\Modules\_fileio.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\bytes_methods.h"\r
+                               RelativePath="..\..\Modules\_functoolsmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\bytesobject.h"\r
+                               RelativePath="..\..\Modules\_heapqmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\cellobject.h"\r
+                               RelativePath="..\..\Modules\_localemodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\ceval.h"\r
+                               RelativePath="..\..\Modules\_lsprof.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\classobject.h"\r
+                               RelativePath="..\..\Modules\_randommodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\cobject.h"\r
+                               RelativePath="..\..\Modules\_sre.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\code.h"\r
+                               RelativePath="..\..\Modules\_struct.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\codecs.h"\r
+                               RelativePath="..\..\Modules\_typesmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\compile.h"\r
+                               RelativePath="..\..\Modules\_weakref.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\complexobject.h"\r
+                               RelativePath="..\..\Modules\arraymodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\cStringIO.h"\r
+                               RelativePath="..\..\Modules\atexitmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\datetime.h"\r
+                               RelativePath="..\..\Modules\audioop.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\descrobject.h"\r
+                               RelativePath="..\..\Modules\binascii.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\dictobject.h"\r
+                               RelativePath="..\..\Modules\cmathmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\memoryobject.h"\r
+                               RelativePath="..\..\Modules\cStringIO.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\enumobject.h"\r
+                               RelativePath="..\..\Modules\datetimemodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\errcode.h"\r
+                               RelativePath="..\..\Modules\errnomodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\eval.h"\r
+                               RelativePath="..\..\Modules\gcmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\fileobject.h"\r
+                               RelativePath="..\..\Modules\itertoolsmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\floatobject.h"\r
+                               RelativePath="..\..\Modules\main.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\frameobject.h"\r
+                               RelativePath="..\..\Modules\mathmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\funcobject.h"\r
+                               RelativePath="..\..\Modules\md5module.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\genobject.h"\r
+                               RelativePath="..\..\Modules\mmapmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\graminit.h"\r
+                               RelativePath="..\..\Modules\operator.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\grammar.h"\r
+                               RelativePath="..\..\Modules\parsermodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\import.h"\r
+                               RelativePath="..\..\Modules\posixmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\intobject.h"\r
+                               RelativePath="..\..\Modules\rotatingtree.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\intrcheck.h"\r
+                               RelativePath="..\..\Modules\rotatingtree.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\iterobject.h"\r
+                               RelativePath="..\..\Modules\sha1module.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\listobject.h"\r
+                               RelativePath="..\..\Modules\sha256module.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\longintrepr.h"\r
+                               RelativePath="..\..\Modules\sha512module.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\longobject.h"\r
+                               RelativePath="..\..\Modules\signalmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\marshal.h"\r
+                               RelativePath="..\..\Modules\symtablemodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\metagrammar.h"\r
+                               RelativePath="..\..\Modules\threadmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\methodobject.h"\r
+                               RelativePath="..\..\Modules\timemodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\modsupport.h"\r
+                               RelativePath="..\..\Modules\xxsubtype.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\moduleobject.h"\r
+                               RelativePath="..\..\Modules\yuv.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\node.h"\r
+                               RelativePath="..\..\Modules\yuvconvert.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\object.h"\r
+                               RelativePath="..\..\Modules\zipimport.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\objimpl.h"\r
+                               RelativePath="..\..\Modules\zlibmodule.c"\r
                                >\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="Objects"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\Include\opcode.h"\r
+                               RelativePath="..\..\Objects\abstract.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\osdefs.h"\r
+                               RelativePath="..\..\Objects\boolobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\parsetok.h"\r
+                               RelativePath="..\..\Objects\bytes_methods.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\patchlevel.h"\r
+                               RelativePath="..\..\Objects\bytesobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pgen.h"\r
+                               RelativePath="..\..\Objects\cellobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pgenheaders.h"\r
+                               RelativePath="..\..\Objects\classobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\py_curses.h"\r
+                               RelativePath="..\..\Objects\cobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pyarena.h"\r
+                               RelativePath="..\..\Objects\codeobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pydebug.h"\r
+                               RelativePath="..\..\Objects\complexobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pyerrors.h"\r
+                               RelativePath="..\..\Objects\stringlib\count.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pyexpat.h"\r
+                               RelativePath="..\..\Objects\descrobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pyfpe.h"\r
+                               RelativePath="..\..\Objects\dictobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pygetopt.h"\r
+                               RelativePath="..\..\Objects\enumobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pymactoolbox.h"\r
+                               RelativePath="..\..\Objects\exceptions.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pymem.h"\r
+                               RelativePath="..\..\Objects\stringlib\fastsearch.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pyport.h"\r
+                               RelativePath="..\..\Objects\fileobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pystate.h"\r
+                               RelativePath="..\..\Objects\stringlib\find.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pystrcmp.h"\r
+                               RelativePath="..\..\Objects\floatobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pystrtod.h"\r
+                               RelativePath="..\..\Objects\frameobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\Python-ast.h"\r
+                               RelativePath="..\..\Objects\funcobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\Python.h"\r
+                               RelativePath="..\..\Objects\genobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pythonrun.h"\r
+                               RelativePath="..\..\Objects\iterobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\pythread.h"\r
+                               RelativePath="..\..\Objects\listobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\rangeobject.h"\r
+                               RelativePath="..\..\Objects\longobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\setobject.h"\r
+                               RelativePath="..\..\Objects\memoryobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\sliceobject.h"\r
+                               RelativePath="..\..\Objects\methodobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\stringobject.h"\r
+                               RelativePath="..\..\Objects\moduleobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\structmember.h"\r
+                               RelativePath="..\..\Objects\object.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\structseq.h"\r
+                               RelativePath="..\..\Objects\obmalloc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\symtable.h"\r
+                               RelativePath="..\..\Objects\stringlib\partition.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\sysmodule.h"\r
+                               RelativePath="..\..\Objects\rangeobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\timefuncs.h"\r
+                               RelativePath="..\..\Objects\setobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\token.h"\r
+                               RelativePath="..\..\Objects\sliceobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\traceback.h"\r
+                               RelativePath="..\..\Objects\stringobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\tupleobject.h"\r
+                               RelativePath="..\..\Objects\structseq.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\ucnhash.h"\r
+                               RelativePath="..\..\Objects\tupleobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\unicodeobject.h"\r
+                               RelativePath="..\..\Objects\typeobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Include\weakrefobject.h"\r
+                               RelativePath="..\..\Objects\unicodectype.c"\r
                                >\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="PC"\r
-                       >\r
                        <File\r
-                               RelativePath="..\..\PC\_subprocess.c"\r
+                               RelativePath="..\..\Objects\unicodeobject.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\_winreg.c"\r
+                               RelativePath="..\..\Objects\unicodetype_db.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\config.c"\r
+                               RelativePath="..\..\Objects\weakrefobject.c"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Parser"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\PC\dl_nt.c"\r
+                               RelativePath="..\..\Parser\acceler.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\errmap.h"\r
+                               RelativePath="..\..\Parser\bitset.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\getbuildinfo.c"\r
+                               RelativePath="..\..\Parser\firstsets.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\getpathp.c"\r
+                               RelativePath="..\..\Parser\grammar.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\import_nt.c"\r
+                               RelativePath="..\..\Parser\grammar1.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
+                               RelativePath="..\..\Parser\listnode.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\PC\pyconfig.h"\r
+                               RelativePath="..\..\Parser\metagrammar.c"\r
                                >\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Modules"\r
-                       >\r
                        <File\r
-                               RelativePath="..\..\Modules\_bisectmodule.c"\r
+                               RelativePath="..\..\Parser\myreadline.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_codecsmodule.c"\r
+                               RelativePath="..\..\Parser\node.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_collectionsmodule.c"\r
+                               RelativePath="..\..\Parser\parser.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_csv.c"\r
+                               RelativePath="..\..\Parser\parser.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_fileio.c"\r
+                               RelativePath="..\..\Parser\parsetok.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_functoolsmodule.c"\r
+                               RelativePath="..\..\Parser\tokenizer.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_heapqmodule.c"\r
+                               RelativePath="..\..\Parser\tokenizer.h"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="PC"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\Modules\_localemodule.c"\r
+                               RelativePath="..\..\PC\_subprocess.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_lsprof.c"\r
+                               RelativePath="..\..\PC\_winreg.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_randommodule.c"\r
+                               RelativePath="..\..\PC\config.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_sre.c"\r
+                               RelativePath="..\..\PC\dl_nt.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_struct.c"\r
+                               RelativePath="..\..\PC\errmap.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_typesmodule.c"\r
+                               RelativePath="..\..\PC\getpathp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\_weakref.c"\r
+                               RelativePath="..\..\PC\import_nt.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\arraymodule.c"\r
+                               RelativePath="..\..\PC\msvcrtmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\atexitmodule.c"\r
+                               RelativePath="..\..\PC\pyconfig.h"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Python"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\Modules\audioop.c"\r
+                               RelativePath="..\..\Python\asdl.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\binascii.c"\r
+                               RelativePath="..\..\Python\ast.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\cmathmodule.c"\r
+                               RelativePath="..\..\Python\atof.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\cStringIO.c"\r
+                               RelativePath="..\..\Python\bltinmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\datetimemodule.c"\r
+                               RelativePath="..\..\Python\ceval.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\errnomodule.c"\r
+                               RelativePath="..\..\Python\codecs.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\gcmodule.c"\r
+                               RelativePath="..\..\Python\compile.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\itertoolsmodule.c"\r
+                               RelativePath="..\..\Python\dynload_win.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\main.c"\r
+                               RelativePath="..\..\Python\errors.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\mathmodule.c"\r
+                               RelativePath="..\..\Python\formatter_unicode.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\md5module.c"\r
+                               RelativePath="..\..\Python\frozen.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\mmapmodule.c"\r
+                               RelativePath="..\..\Python\future.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\operator.c"\r
+                               RelativePath="..\..\Python\getargs.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\parsermodule.c"\r
+                               RelativePath="..\..\Python\getcompiler.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\posixmodule.c"\r
+                               RelativePath="..\..\Python\getcopyright.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\rotatingtree.c"\r
+                               RelativePath="..\..\Python\getmtime.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\rotatingtree.h"\r
+                               RelativePath="..\..\Python\getopt.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\sha1module.c"\r
+                               RelativePath="..\..\Python\getplatform.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\sha256module.c"\r
+                               RelativePath="..\..\Python\getversion.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\sha512module.c"\r
+                               RelativePath="..\..\Python\graminit.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\signalmodule.c"\r
+                               RelativePath="..\..\Python\import.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\symtablemodule.c"\r
+                               RelativePath="..\..\Python\importdl.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\threadmodule.c"\r
+                               RelativePath="..\..\Python\importdl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\timemodule.c"\r
+                               RelativePath="..\..\Python\marshal.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\xxsubtype.c"\r
+                               RelativePath="..\..\Python\modsupport.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\yuv.h"\r
+                               RelativePath="..\..\Python\mysnprintf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\yuvconvert.c"\r
+                               RelativePath="..\..\Python\mystrtoul.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\zipimport.c"\r
+                               RelativePath="..\..\Python\peephole.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
+                               RelativePath="..\..\Python\pyarena.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\bitset.c"\r
+                               RelativePath="..\..\Python\pyfpe.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\firstsets.c"\r
+                               RelativePath="..\..\Python\pystate.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\grammar.c"\r
+                               RelativePath="..\..\Python\pystrcmp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\grammar1.c"\r
+                               RelativePath="..\..\Python\pystrtod.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\listnode.c"\r
+                               RelativePath="..\..\Python\Python-ast.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\metagrammar.c"\r
+                               RelativePath="..\..\Python\pythonrun.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\myreadline.c"\r
+                               RelativePath="..\..\Python\structmember.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\node.c"\r
+                               RelativePath="..\..\Python\symtable.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\parser.c"\r
+                               RelativePath="..\..\Python\sysmodule.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\parser.h"\r
+                               RelativePath="..\..\Python\thread.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\parsetok.c"\r
+                               RelativePath="..\..\Python\thread_nt.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Parser\tokenizer.c"\r
+                               RelativePath="..\..\Python\traceback.c"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       >\r
                        <File\r
-                               RelativePath="..\..\Parser\tokenizer.h"\r
+                               RelativePath="..\..\PC\python_nt.rc"\r
                                >\r
                        </File>\r
                </Filter>\r
similarity index 61%
rename from PCbuild8/pythonw/pythonw.vcproj
rename to PC/VS8.0/pythonw.vcproj
index 9e2dc7bfce0cb5e71527328381537d5acdef3a45..5037b7845d3f30d808a8a4d3c2fa4ea03c24cd29 100644 (file)
@@ -3,9 +3,8 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="pythonw"\r
-       ProjectGUID="{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}"\r
-       RootNamespace="pythonw"\r
-       Keyword="Win32Proj"\r
+       ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"\r
+       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +20,9 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
                                RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\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
+                               OutputFile="$(OutDir)\pythonw_d.exe"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
+                               BaseAddress="0x1d000000"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -87,9 +85,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -97,8 +92,9 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
+                               EnableIntrinsicFunctions="false"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
                                RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\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
+                               OutputFile="$(OutDir)\pythonw_d.exe"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               OutputFile="$(OutDir)\pythonw.exe"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1d000000"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\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
+                               OutputFile="$(OutDir)\pythonw.exe"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               OutputFile="$(OutDir)\pythonw.exe"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGInstrument.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\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
+                               OutputFile="$(OutDir)\pythonw.exe"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
+                               OutputFile="$(OutDir)\pythonw.exe"\r
                                StackReserveSize="2000000"\r
-                               LargeAddressAware="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\pyproject.vsprops;..\PGUpdate.vsprops"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="_WINDOWS"\r
+                               StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
+                               EnableFunctionLevelLinking="true"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\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
+                               OutputFile="$(OutDir)\pythonw.exe"\r
+                               StackReserveSize="2000000"\r
+                               BaseAddress="0x1d000000"\r
+                               ImportLibrary=""\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Resource Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\PC\WinMain.c"\r
+                               RelativePath="..\..\PC\python_exe.rc"\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
+                       Name="Source Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\PC\pycon.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\PC\python_exe.rc"\r
+                               RelativePath="..\..\PC\WinMain.c"\r
                                >\r
                        </File>\r
                </Filter>\r
similarity index 54%
rename from PCbuild8/PGUpdate.vsprops
rename to PC/VS8.0/release.vsprops
index 0501126978b87c87e7387d86899c40671cab7367..c4f85678e3019dc9d23987781e1ebcfdfee5ad65 100644 (file)
@@ -2,11 +2,10 @@
 <VisualStudioPropertySheet\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
-       Name="PGUpdate"\r
-       InheritedPropertySheets=".\PGInstrument.vsprops"\r
+       Name="release"\r
        >\r
        <Tool\r
-               Name="VCLinkerTool"\r
-               LinkTimeCodeGeneration="4"\r
+               Name="VCCLCompilerTool"\r
+               PreprocessorDefinitions="NDEBUG"\r
        />\r
 </VisualStudioPropertySheet>\r
similarity index 85%
rename from PCbuild8/rmpyc.py
rename to PC/VS8.0/rmpyc.py
index 21923606dd8eb48abe4c7420d98a041044f2bde2..18e170557f26998f0f08641c9709e19ed583f5cd 100644 (file)
@@ -1,5 +1,4 @@
 # Remove all the .pyc and .pyo files under ../Lib.
-import sys
 
 
 def deltree(root):
@@ -22,9 +21,5 @@ def deltree(root):
 
     return npyc, npyo
 
-path = "../Lib"
-if len(sys.argv) > 1:
-    path = sys.argv[1]
-
-npyc, npyo = deltree(path)
+npyc, npyo = deltree("../../Lib")
 print(npyc, ".pyc deleted,", npyo, ".pyo deleted")
similarity index 71%
rename from PCbuild8/rt.bat
rename to PC/VS8.0/rt.bat
index 8927879d5ee7243fef51b7c64f3d51b0cb6e64d7..90fd794421d638e0bdecf1c6fa7ebf44b86d8ceb 100644 (file)
@@ -2,8 +2,6 @@
 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
@@ -26,22 +24,17 @@ rem     rt -u "network,largefile"
 \r
 setlocal\r
 \r
-set platf=win32\r
-set exe=python.exe\r
+set exe=python\r
 set qmode=\r
 set dashO=\r
-set conf=Release\r
-PATH %PATH%;..\..\tcltk\bin\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.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
+if "%1"=="-d" (set exe=python_d) & 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
+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
 echo Deleting .pyc/.pyo files ...\r
similarity index 61%
rename from PCbuild8/select/select.vcproj
rename to PC/VS8.0/select.vcproj
index a20a18b27a125c4a70e787cf511f0b9ce2c3af40..76a98ae048a0271d6e7de71e4b0accc8b1f535a7 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="select"\r
-       ProjectGUID="{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"\r
+       ProjectGUID="{18CAE28C-B454-46C1-87A0-493D91D97F03}"\r
        RootNamespace="select"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,9 +76,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -94,7 +83,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="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
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               AdditionalDependencies="wsock32.lib"\r
+                               IgnoreDefaultLibraryNames="libc"\r
+                               BaseAddress="0x1D110000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
similarity index 63%
rename from PCbuild8/unicodedata/unicodedata.vcproj
rename to PC/VS8.0/unicodedata.vcproj
index 8e9bb5e89be9e83ede7bbc7e6809647de89a33cc..4cf7d23869fb727aaa7e7e57331b68fc0a454531 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="unicodedata"\r
-       ProjectGUID="{D04B2089-7DA9-4D92-B23F-07453BC46652}"\r
+       ProjectGUID="{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"\r
        RootNamespace="unicodedata"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
@@ -61,9 +54,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -83,9 +74,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -93,7 +81,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1D120000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               BaseAddress="0x1D120000"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
+                               BaseAddress="0x1D120000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
+                       Name="Header Files"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Modules\unicodedata.c"\r
+                               RelativePath="..\..\Modules\unicodedata_db.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\unicodename_db.h"\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
+                       Name="Source Files"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\Modules\unicodedata.c"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
diff --git a/PC/VS8.0/w9xpopen.vcproj b/PC/VS8.0/w9xpopen.vcproj
new file mode 100644 (file)
index 0000000..e14d206
--- /dev/null
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="w9xpopen"\r
+       ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"\r
+       RootNamespace="w9xpopen"\r
+       TargetFrameworkVersion="131072"\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;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\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
+                               SubSystem="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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\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
+                               SubSystem="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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="1"\r
+                               ImportLibrary=""\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGInstrument|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="1"\r
+                               ImportLibrary=""\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|Win32"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="1"\r
+                               ImportLibrary=""\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="PGUpdate|x64"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\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="2"\r
+                               InlineFunctionExpansion="1"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\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="false"\r
+                               SubSystem="1"\r
+                               ImportLibrary=""\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="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\PC\w9xpopen.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
similarity index 64%
rename from PCbuild8/winsound/winsound.vcproj
rename to PC/VS8.0/winsound.vcproj
index c46ba2ae51cdd6e6c6b929a53aaf04e60b3635b6..d379357c4997311d2fd9bec0864dda443a75f063 100644 (file)
@@ -3,9 +3,10 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="winsound"\r
-       ProjectGUID="{1015E3B4-FD3B-4402-AA6E-7806514156D6}"\r
+       ProjectGUID="{28B5D777-DDF2-4B6B-B34F-31D938813856}"\r
        RootNamespace="winsound"\r
        Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -21,7 +22,7 @@
                <Configuration\r
                        Name="Debug|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
@@ -62,9 +55,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="winmm.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -84,9 +74,6 @@
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
@@ -94,7 +81,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd_d.vsprops"\r
+                       InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        >\r
                        <Tool\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
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="winmm.lib"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="Release|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGInstrument|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|Win32"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                <Configuration\r
                        Name="PGUpdate|x64"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"\r
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"\r
                        CharacterSet="0"\r
                        WholeProgramOptimization="1"\r
                        >\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
                        <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
                        <Tool\r
                                Name="VCAppVerifierTool"\r
                        />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                        />\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
diff --git a/PC/VS8.0/x64.vsprops b/PC/VS8.0/x64.vsprops
new file mode 100644 (file)
index 0000000..5514692
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="amd64"\r
+       OutputDirectory="$(SolutionDir)\amd64\"\r
+       IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalOptions="/USECL:MS_OPTERON /GS-"\r
+               PreprocessorDefinitions="_WIN64;_M_X64"\r
+       />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               TargetMachine="17"\r
+       />\r
+</VisualStudioPropertySheet>\r
index 64cadc3625acb667c59a87823d7ad63880acaa78..54819e883bf08b42289c49d29b8d2ebf6ec75001 100644 (file)
        />
        <UserMacro
                Name="tcltkLib"
-               Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+               Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
        />
        <UserMacro
                Name="tcltk64Lib"
-               Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
+               Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
        />
 </VisualStudioPropertySheet>
index fe264e363ef7a16d66c90e713cf34bd5512e64ba..00b7de0db028990f4ed9ffd883db22f680d677d1 100644 (file)
@@ -1,5 +1,6 @@
 Building Python using VC++ 9.0
 ------------------------------
+
 This directory is used to build Python for Win32 platforms, e.g. Windows
 2000, XP and Vista.  It requires Microsoft Visual C++ 9.0
 (a.k.a. Visual Studio .NET 2008).
@@ -36,6 +37,36 @@ The 32bit builds end up in the solution folder PCbuild while the x64 builds
 land in the amd64 subfolder. The PGI and PGO builds for profile guided
 optimization end up in their own folders, too.
 
+Legacy support
+--------------
+
+You can find build directories for older versions of Visual Studio and 
+Visual C++ in the PC directory. The legacy build directories are no longer
+actively maintained and may not work out of the box.
+
+PC/VC6/
+    Visual C++ 6.0
+PC/VS7.1/
+    Visual Studio 2003 (7.1)
+PCbuild8/
+    Visual Studio 2005 (8.0)
+
+
+C RUNTIME
+---------
+
+Visual Studio 2008 uses version 9 of the C runtime (MSVCRT9).  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. 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
 -----------
 These subprojects should build out of the box.  Subprojects other than the
diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py
new file mode 100644 (file)
index 0000000..09496ae
--- /dev/null
@@ -0,0 +1,30 @@
+from __future__ import with_statement
+import os
+
+def vs9to8(src, dest):
+    for name in os.listdir(src):
+        path, ext = os.path.splitext(name)
+        if ext.lower() not in ('.sln', '.vcproj', '.vsprops'):
+            continue
+
+        filename = os.path.normpath(os.path.join(src, name))
+        destname = os.path.normpath(os.path.join(dest, name))
+        print("%s -> %s" % (filename, destname))
+
+        with open(filename, 'rU') as fin:
+            lines = fin.read()
+            lines = lines.replace('Version="9,00"', 'Version="8.00"')
+            lines = lines.replace('Version="9.00"', 'Version="8.00"')
+            lines = lines.replace('Format Version 10.00', 'Format Version 9.00')
+            lines = lines.replace('Visual Studio 2008', 'Visual Studio 2005')
+
+            lines = lines.replace('wininst-9.0', 'wininst-8.0')
+            lines = lines.replace('..\\', '..\\..\\')
+            lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
+
+        with open(destname, 'wb') as fout:
+            lines = lines.replace("\n", "\r\n").encode()
+            fout.write(lines)
+
+if __name__ == "__main__":
+    vs9to8(src=".", dest="../PC/VS8.0")
diff --git a/PCbuild8/PGInstrument.vsprops b/PCbuild8/PGInstrument.vsprops
deleted file mode 100644 (file)
index 58518b7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/_ctypes/_ctypes.vsprops b/PCbuild8/_ctypes/_ctypes.vsprops
deleted file mode 100644 (file)
index 28155bd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644 (file)
index d25d86c..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-<?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/_elementtree/_elementtree.vcproj b/PCbuild8/_elementtree/_elementtree.vcproj
deleted file mode 100644 (file)
index d0fe7fe..0000000
+++ /dev/null
@@ -1,724 +0,0 @@
-<?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/_tkinter/_tkinter.vcproj b/PCbuild8/_tkinter/_tkinter.vcproj
deleted file mode 100644 (file)
index f52e87b..0000000
+++ /dev/null
@@ -1,664 +0,0 @@
-<?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
-                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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="$(tcltkDir)\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\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="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.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
-                               CommandLine="copy $(tcltkDir)\bin\*.dll $(OutDir)"\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
deleted file mode 100644 (file)
index ba21390..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-@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%\r
-\r
-rem Copy whatever was built to the canonical 'PCBuild' directory.\r
-rem This helps extensions which use distutils etc.\r
-rem (Don't check if the build was successful - we expect a few failures\r
-rem due to missing libs)\r
-echo Copying built files to ..\PCBuild\r
-if not exist %platf%%conf%\. (echo %platf%%conf% does not exist - nothing copied & goto xit)\r
-if not exist ..\PCBuild\. (echo ..\PCBuild does not exist - nothing copied & goto xit)\r
-xcopy /q/y %platf%%conf%\* ..\PCBuild\.\r
-\r
-:xit\r
diff --git a/PCbuild8/installer.bmp b/PCbuild8/installer.bmp
deleted file mode 100644 (file)
index 1875e19..0000000
Binary files a/PCbuild8/installer.bmp and /dev/null differ
diff --git a/PCbuild8/make_buildinfo/make_buildinfo.c b/PCbuild8/make_buildinfo/make_buildinfo.c
deleted file mode 100644 (file)
index 6f89716..0000000
+++ /dev/null
@@ -1,66 +0,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
diff --git a/PCbuild8/make_buildinfo/make_buildinfo.vcproj b/PCbuild8/make_buildinfo/make_buildinfo.vcproj
deleted file mode 100644 (file)
index c3f3491..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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/make_versioninfo.vcproj b/PCbuild8/make_versioninfo/make_versioninfo.vcproj
deleted file mode 100644 (file)
index 6e51944..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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
diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
deleted file mode 100644 (file)
index a734e1a..0000000
+++ /dev/null
@@ -1,433 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
-       ProjectSection(ProjectDependencies) = postProject
-               {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}") = "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
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-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}") = "_sqlite3", "_sqlite3\_sqlite3.vcproj", "{D50E5319-41CC-429A-8E81-B1CD391C3A7B}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl\_ssl.vcproj", "{ECF06871-0C44-4137-93EE-E75A2F10DBE7}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python\python.vcproj", "{AE617428-B823-4B87-BC6D-DC7C12C746D3}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-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}") = "select", "select\select.vcproj", "{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata\unicodedata.vcproj", "{D04B2089-7DA9-4D92-B23F-07453BC46652}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound\winsound.vcproj", "{1015E3B4-FD3B-4402-AA6E-7806514156D6}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket\_socket.vcproj", "{AE31A248-5367-4EB2-A511-8722BC351CB4}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-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}") = "_testcapi", "_testcapi\_testcapi.vcproj", "{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}"
-       ProjectSection(ProjectDependencies) = postProject
-               {987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
-       EndProjectSection
-EndProject
-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
-               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
-               {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
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|Win32.ActiveCfg = Debug|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|Win32.Build.0 = Debug|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|x64.ActiveCfg = Debug|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Debug|x64.Build.0 = Debug|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGInstrument|x64.Build.0 = PGInstrument|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.PGUpdate|x64.Build.0 = PGUpdate|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|Win32.ActiveCfg = Release|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|Win32.Build.0 = Release|Win32
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.Release|x64.ActiveCfg = Release|x64
-               {ECF06871-0C44-4137-93EE-E75A2F10DBE7}.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 = Release|Win32
-               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = Release|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
-       EndGlobalSection
-EndGlobal
diff --git a/PCbuild8/pyd.vsprops b/PCbuild8/pyd.vsprops
deleted file mode 100644 (file)
index afbfb50..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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
deleted file mode 100644 (file)
index 4bb3a40..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/pyproject.vsprops b/PCbuild8/pyproject.vsprops
deleted file mode 100644 (file)
index a509677..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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="python30"\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
-       <UserMacro\r
-               Name="opensslDir"\r
-               Value="..\..\..\openssl-0.9.8a"\r
-       />\r
-       <UserMacro\r
-               Name="tcltkDir"\r
-               Value="..\..\..\tcltk"\r
-       />\r
-</VisualStudioPropertySheet>\r
diff --git a/PCbuild8/pythoncore/getbuildinfo.vsprops b/PCbuild8/pythoncore/getbuildinfo.vsprops
deleted file mode 100644 (file)
index 2aff8d3..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/readme.txt b/PCbuild8/readme.txt
deleted file mode 100644 (file)
index eb15dc8..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-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).  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 solution.
-
-A .bat file, build.bat, is provided to simplify command line builds.
-
-Some of the subprojects rely on external libraries and won't build
-unless you have them installed.
-
-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.
-
-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
------------
-These subprojects should build out of the box.  Subprojects other than the
-main ones (pythoncore, python, pythonw) generally build a DLL (renamed to
-.pyd) from a specific module so that users don't have to load the code
-supporting that module unless they import the module.
-
-pythoncore
-    .dll and .lib
-python
-    .exe
-pythonw
-    pythonw.exe, a variant of python.exe that doesn't pop up a DOS box
-_socket
-    socketmodule.c
-_testcapi
-    tests of the Python C API, run via Lib/test/test_capi.py, and
-    implemented by module Modules/_testcapimodule.c
-pyexpat
-    Python wrapper for accelerated XML parsing, which incorporates stable
-    code from the Expat project:  http://sourceforge.net/projects/expat/
-select
-    selectmodule.c
-unicodedata
-    large tables of Unicode data
-winsound
-    play sounds (typically .wav files) under Windows
-    
-Note: Check the dependencies of subprojects when building a subproject.  You 
-need to manually build each of the dependencies, in order, first.  A good 
-example of this is the pythoncore subproject.  It is dependent on both the 
-make_versioninfo and the make_buildinfo subprojects.  You can check the build 
-order by right clicking on the project name, in the solution explorer, and 
-selecting the project build order item.
-
-The following subprojects will generally NOT build out of the box.  They
-wrap code Python doesn't control, and you'll need to download the base
-packages first and unpack them into siblings of PCbuilds's parent
-directory; for example, if your PCbuild is  .......\dist\src\PCbuild\,
-unpack into new subdirectories of dist\.
-
-_tkinter
-    Python wrapper for the Tk windowing system.  Requires building
-    Tcl/Tk first.  Following are instructions for Tcl/Tk 8.4.12.
-
-    Get source
-    ----------
-    In the dist directory, run
-    svn export http://svn.python.org/projects/external/tcl8.4.12
-    svn export http://svn.python.org/projects/external/tk8.4.12
-    svn export http://svn.python.org/projects/external/tix-8.4.0
-
-    Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
-    ---------------
-    Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
-         -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
-    to get a shell window with the correct environment settings
-    cd dist\tcl8.4.12\win
-    nmake -f makefile.vc
-    nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
-
-    XXX Should we compile with OPTS=threads?
-
-    Optional:  run tests, via
-        nmake -f makefile.vc test
-
-        On WinXP Pro, wholly up to date as of 30-Aug-2004:
-        all.tcl:        Total   10678   Passed  9969    Skipped 709     Failed  0
-        Sourced 129 Test Files.
-
-    Build Tk
-    --------
-    cd dist\tk8.4.12\win
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
-
-    XXX Should we compile with OPTS=threads?
-
-    XXX Our installer copies a lot of stuff out of the Tcl/Tk install
-    XXX directory.  Is all of that really needed for Python use of Tcl/Tk?
-
-    Optional:  run tests, via
-        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test
-
-        On WinXP Pro, wholly up to date as of 30-Aug-2004:
-        all.tcl:        Total   8420    Passed  6826    Skipped 1581    Failed  13
-        Sourced 91 Test Files.
-        Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test
-
-   Built Tix
-   ---------
-   cd dist\tix-8.4.0\win
-   nmake -f python.mak
-   nmake -f python.mak install
-
-bz2
-    Python wrapper for the libbz2 compression library.  Homepage
-        http://sources.redhat.com/bzip2/
-    Download the source from the python.org copy into the dist
-    directory:
-
-    svn export http://svn.python.org/projects/external/bzip2-1.0.3
-
-    A custom pre-link step in the bz2 project settings should manage to
-    build bzip2-1.0.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
-    linked in PCbuild\.
-    However, the bz2 project is not smart enough to remove anything under
-    bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.3\ by hand.
-
-    The build step shouldn't yield any warnings or errors, and should end
-    by displaying 6 blocks each terminated with
-        FC: no differences encountered
-
-    All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python
-    project links in.
-
-
-_bsddb
-    To use the version of bsddb that Python is built with by default, invoke
-    (in the dist directory)
-
-     svn export http://svn.python.org/projects/external/db-4.4.20
-
-
-    Then open a VS.NET 2003 shell, and invoke:
-
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
-
-    and do that a second time for a Debug build too:
-
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
-
-    Alternatively, if you want to start with the original sources,
-    go to Sleepycat's download page:
-        http://www.sleepycat.com/downloads/releasehistorybdb.html
-
-    and download version 4.4.20.
-
-    With or without strong cryptography? You can choose either with or
-    without strong cryptography, as per the instructions below.  By
-    default, Python is built and distributed WITHOUT strong crypto.
-
-    Unpack the sources; if you downloaded the non-crypto version, rename
-    the directory from db-4.4.20.NC to db-4.4.20.
-
-    Now apply any patches that apply to your version.
-
-    Open
-        dist\db-4.4.20\docs\index.html
-
-    and follow the "Windows->Building Berkeley DB with Visual C++ .NET"
-    instructions for building the Sleepycat
-    software.  Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
-    Build the "db_static" project, for "Release" mode.
-
-    To run extensive tests, pass "-u bsddb" to regrtest.py.  test_bsddb3.py
-    is then enabled.  Running in verbose mode may be helpful.
-
-    XXX The test_bsddb3 tests don't always pass, on Windows (according to
-    XXX me) or on Linux (according to Barry).  (I had much better luck
-    XXX on Win2K than on Win98SE.)  The common failure mode across platforms
-    XXX is
-    XXX     DBAgainError: (11, 'Resource temporarily unavailable -- unable
-    XXX                         to join the environment')
-    XXX
-    XXX and it appears timing-dependent.  On Win2K I also saw this once:
-    XXX
-    XXX test02_SimpleLocks (bsddb.test.test_thread.HashSimpleThreaded) ...
-    XXX Exception in thread reader 1:
-    XXX Traceback (most recent call last):
-    XXX File "C:\Code\python\lib\threading.py", line 411, in __bootstrap
-    XXX    self.run()
-    XXX File "C:\Code\python\lib\threading.py", line 399, in run
-    XXX    apply(self.__target, self.__args, self.__kwargs)
-    XXX File "C:\Code\python\lib\bsddb\test\test_thread.py", line 268, in
-    XXX                  readerThread
-    XXX    rec = c.next()
-    XXX DBLockDeadlockError: (-30996, 'DB_LOCK_DEADLOCK: Locker killed
-    XXX                                to resolve a deadlock')
-    XXX
-    XXX I'm told that DBLockDeadlockError is expected at times.  It
-    XXX doesn't cause a test to fail when it happens (exceptions in
-    XXX threads are invisible to unittest).
-
-    Building for Win64:
-    - open a VS.NET 2003 command prompt
-    - run the SDK setenv.cmd script, passing /RETAIL and the target
-      architecture (/SRV64 for Itanium, /X64 for AMD64)
-    - build BerkeleyDB with the solution configuration matching the
-      target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
-    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
-
-_sqlite3
-    Python wrapper for SQLite library.
-    
-    Get the source code through
-    
-    svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
-    
-    To use the extension module in a Python build tree, copy sqlite3.dll into
-    the PCbuild folder.
-
-_ssl
-    Python wrapper for the secure sockets library.
-
-    Get the source code through
-
-    svn export http://svn.python.org/projects/external/openssl-0.9.8a
-
-    Alternatively, get the latest version from http://www.openssl.org.
-    You can (theoretically) use any version of OpenSSL you like - the
-    build process will automatically select the latest version.
-
-    You must also install ActivePerl from
-        http://www.activestate.com/Products/ActivePerl/
-    as this is used by the OpenSSL build process.  Complain to them <wink>.
-
-    The MSVC project simply invokes PCBuild/build_ssl.py to perform
-    the build.  This Python script locates and builds your OpenSSL
-    installation, then invokes a simple makefile to build the final .pyd.
-
-    build_ssl.py attempts to catch the most common errors (such as not
-    being able to find OpenSSL sources, or not being able to find a Perl
-    that works with OpenSSL) and give a reasonable error message.
-    If you have a problem that doesn't seem to be handled correctly
-    (eg, you know you have ActivePerl but we can't find it), please take
-    a peek at build_ssl.py and suggest patches.  Note that build_ssl.py
-    should be able to be run directly from the command-line.
-
-    build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
-    this by hand.
-
-
-Building for AMD64
-------------------
-
-Select x64 as the destination platform.
-
-
-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 f64c2192ebd209bac4ad46e4eafcd835e92ae34f..69edef20a913f83a2ccaf48067eaf3c5eccc437b 100644 (file)
@@ -1,5 +1,6 @@
 @rem Used by the buildbot "compile" step.
 cmd /c Tools\buildbot\external.bat
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Debug PC\VS7.1\pcbuild.sln
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
+
index c30faee8ba4d783221a816d3aecf694f41da135e..c0537b4c0686ac02a2d77643560dd11a729a5bb1 100644 (file)
@@ -2,14 +2,14 @@
 
 cmd /c Tools\buildbot\external.bat
 @rem build release versions of things
-call "%VS71COMNTOOLS%vsvars32.bat"
+call "%VS90COMNTOOLS%vsvars32.bat"
 if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
    devenv ..\db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
 )
 
 @rem build Python
 cmd /q/c Tools\buildbot\kill_python.bat
-devenv.com /useenv /build Release PC\VS7.1\pcbuild.sln
+devenv.com /useenv /build Release PCbuild\pcbuild.sln
 
 @rem build the documentation
 bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
index 7101b533d8f9629eaa6981f20f23bd006fda4528..15d7365068f1dd84e05312927a98e9cd3a0dbffb 100644 (file)
@@ -1,7 +1,7 @@
 @rem Used by the buildbot "clean" step.
-call "%VS71COMNTOOLS%vsvars32.bat"
-cd PC\VS7.1
+call "%VS90COMNTOOLS%vsvars32.bat"
+cd PCbuild
 @echo Deleting .pyc/.pyo files ...
 del /s Lib\*.pyc Lib\*.pyo
-devenv.com /clean Release pcbuild.sln
-devenv.com /clean Debug pcbuild.sln
+vcbuild /clean pcbuild.sln "Release|Win32"
+vcbuild /clean pcbuild.sln "Debug|Win32"
index 463285fa4989bac9b3dcad662efa2d2abe22d8c6..9797aa25f96a14b08a7c9395cd7b85fbb8a6ef64 100644 (file)
@@ -2,7 +2,7 @@
 \r
 @rem Assume we start inside the Python source directory\r
 cd ..\r
-call "%VS71COMNTOOLS%vsvars32.bat"\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
 \r
 @rem bzip\r
 if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3\r
@@ -10,24 +10,29 @@ if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip
 @rem Sleepycat db\r
 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20\r
 if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (\r
-   devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static\r
+   vcbuild db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static\r
 )\r
 \r
 @rem OpenSSL\r
-if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a\r
+if not exist openssl-0.9.8g (\r
+  if exist openssl-0.9.8a rd /s/q openssl-0.9.8a\r
+  svn export http://svn.python.org/projects/external/openssl-0.9.8g\r
+)\r
 \r
 @rem tcltk\r
-if not exist tcl8.4.12 (\r
+if not exist tcl8.4.16 (\r
    if exist tcltk rd /s/q tcltk\r
-   svn export http://svn.python.org/projects/external/tcl8.4.12\r
-   svn export http://svn.python.org/projects/external/tk8.4.12\r
-   cd tcl8.4.12\win\r
-   nmake -f makefile.vc\r
-   nmake -f makefile.vc INSTALLDIR=..\..\tcltk install\r
+   if exist tcl8.4.12 rd /s/q tcl8.4.12\r
+   if exist tk8.4.12 rd /s/q tk8.4.12\r
+   svn export http://svn.python.org/projects/external/tcl8.4.16\r
+   svn export http://svn.python.org/projects/external/tk8.4.16\r
+   cd tcl8.4.16\win\r
+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500\r
+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install\r
    cd ..\..\r
-   cd tk8.4.12\win\r
-   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12\r
-   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install\r
+   cd tk8.4.16\win\r
+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16\r
+   nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install\r
    cd ..\..\r
 )\r
 \r
index fd707da6d588e23579c2460ad49b41b966528dbc..5ba450f302d745d7e4fe9c6e2b0ef3cd4e859e42 100644 (file)
@@ -1,4 +1,4 @@
-/* This program looks for processes which have build\PC\VS7.1\python.exe
+/* This program looks for processes which have build\PCbuild\python.exe
    in their path and terminates them. */
 #include <windows.h>
 #include <psapi.h>
@@ -46,14 +46,14 @@ int main()
                /* Check if we are running a buildbot version of Python.
 
                   On Windows, this will always be a debug build from the
-                  PC\VS7.1 directory.  build\\PC\\VS7.1\\python_d.exe
+                  PCbuild directory.  build\\PCbuild\\python_d.exe
                   
                   On Cygwin, the pathname is similar to other Unixes.
                   Use \\build\\python.exe to ensure we don't match
-                  PC\\VS7.1\\python.exe which could be a normal instance
+                  PCbuild\\python.exe which could be a normal instance
                   of Python running on vanilla Windows.
                */
-               if ((strstr(path, "build\\pc\\vs7.1\\python_d.exe") != NULL) ||
+               if ((strstr(path, "pcbuild\\python_d.exe") != NULL) ||
                    (strstr(path, "\\build\\python.exe") != NULL)) {
                        printf("Terminating %s (pid %d)\n", path, pids[i]);
                        if (!TerminateProcess(hProcess, 1)) {
index 680ef98ea39f427ea5454cedabd44d633b841f44..51569d24e25ee083be8da40fe8526e12b8c1f828 100644 (file)
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PC\VS7.1
+cd PCbuild
 call rt.bat -d -q -uall -rw -n