]> granicus.if.org Git - python/commitdiff
Merged revisions 64202 via svnmerge from
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 12 Jun 2008 22:53:41 +0000 (22:53 +0000)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 12 Jun 2008 22:53:41 +0000 (22:53 +0000)
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64202 | amaury.forgeotdarc | 2008-06-12 23:58:20 +0200 (jeu., 12 juin 2008) | 5 lines

  Update VS8.0 build files, using the script vs9to8.py.

  Also remove references to odbc libraries, which are not shipped with vs2003 express.
  (and certainly not useful)
........

22 files changed:
PC/VS8.0/_bsddb.vcproj
PC/VS8.0/_elementtree.vcproj
PC/VS8.0/_sqlite3.vcproj
PC/VS8.0/_ssl.vcproj
PC/VS8.0/_tkinter.vcproj
PC/VS8.0/bdist_wininst.vcproj
PC/VS8.0/debug.vsprops
PC/VS8.0/kill_python.c [new file with mode: 0644]
PC/VS8.0/make_versioninfo.vcproj
PC/VS8.0/pcbuild.sln
PC/VS8.0/pyd.vsprops
PC/VS8.0/pyd_d.vsprops
PC/VS8.0/pyproject.vsprops
PC/VS8.0/python.vcproj
PC/VS8.0/pythoncore.vcproj
PC/VS8.0/release.vsprops
PC/VS8.0/x64.vsprops
PCbuild/_elementtree.vcproj
PCbuild/make_versioninfo.vcproj
PCbuild/pcbuild.sln
PCbuild/python.vcproj
PCbuild/vs9to8.py

index 0dbeb2850e8fb709534a07fdfede49087a8ce152..59b7ce246f61c3cdc069564f0df95ff5a1f06333 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
+                               CommandLine=""\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"\r
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
+                               CommandLine=""\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"\r
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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_AMD64\libdb44s.lib"\r
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(bsddbDir)"\r
+                               AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."\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_AMD64\libdb44s.lib"\r
+                               AdditionalDependencies="$(bsddbDepLibs)"\r
                                BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
index 32fac0c75476cfc1c13123126a33355484e2d09b..457da72f04d253fed6363b81db5e4767a88e770d 100644 (file)
@@ -56,7 +56,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
index 2343afa351771e969ea2c69111f60b45149f8743..689585f9ce2b39bfcb863f9554c0a678f5691fc0 100644 (file)
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(sqlite3Dir)"\r
+                               AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"\r
                                PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"\r
                        />\r
                        <Tool\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)\$(PlatformName)\sqlite3.lib"\r
                                BaseAddress="0x1e180000"\r
                                TargetMachine="17"\r
                        />\r
index 72d42920b2b073a96281522dfbde901512fc1a1b..69f77263178c311942f8a39ea4d8d079d3a7a974 100644 (file)
@@ -27,7 +27,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -89,7 +89,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a"\r
+                               CommandLine="cd &quot;$(SolutionDir)&quot;&#x0D;&#x0A;&quot;$(PythonExe)&quot; build_ssl.py Release $(PlatformName) -a&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\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
index f1d9bb4f7f10f69cfe393e9e7cf4c083b03b9238..9700bdea74a3d0dab444de5b964daef2c167c36b 100644 (file)
@@ -56,7 +56,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(tcltkLib)"\r
+                               AdditionalDependencies="$(tcltkLibDebug)"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"\r
+                               AdditionalIncludeDirectories="$(tcltk64Dir)\include"\r
                                PreprocessorDefinitions="WITH_APPINIT"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(tcltk64Lib)"\r
+                               AdditionalDependencies="$(tcltk64LibDebug)"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"\r
+                               AdditionalIncludeDirectories="$(tcltk64Dir)\include"\r
                                PreprocessorDefinitions="WITH_APPINIT"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"\r
+                               AdditionalIncludeDirectories="$(tcltk64Dir)\include"\r
                                PreprocessorDefinitions="WITH_APPINIT"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"\r
+                               AdditionalIncludeDirectories="$(tcltk64Dir)\include"\r
                                PreprocessorDefinitions="WITH_APPINIT"\r
                        />\r
                        <Tool\r
index 08adac6d7c80c18d4334ccc9a42b7a058d0e9d68..3b586dfa053f076496fb81a565d75192522fcf0e 100644 (file)
@@ -11,6 +11,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\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="3"\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-amd64.exe"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames="LIBC"\r
+                               ProgramDatabaseFile="..\..\lib\distutils\command\wininst-8.0-amd64.pdb"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\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
index 803da6ea8f59b755d31dad42ba26c68f37d00e27..bc643cb6be5737d5645a1b5168ce74033f51d88d 100644 (file)
@@ -8,4 +8,8 @@
                Name="VCCLCompilerTool"\r
                PreprocessorDefinitions="_DEBUG"\r
        />\r
-</VisualStudioPropertySheet>
\ No newline at end of file
+       <UserMacro\r
+               Name="KillPythonExe"\r
+               Value="$(OutDir)\kill_python_d.exe"\r
+       />\r
+</VisualStudioPropertySheet>\r
diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c
new file mode 100644 (file)
index 0000000..8ee22e8
--- /dev/null
@@ -0,0 +1,178 @@
+/*\r
+ * Helper program for killing lingering python[_d].exe processes before\r
+ * building, thus attempting to avoid build failures due to files being\r
+ * locked.\r
+ */\r
+\r
+#include <windows.h>\r
+#include <wchar.h>\r
+#include <tlhelp32.h>\r
+#include <stdio.h>\r
+\r
+#pragma comment(lib, "psapi")\r
+\r
+#ifdef _DEBUG\r
+#define PYTHON_EXE          (L"python_d.exe")\r
+#define PYTHON_EXE_LEN      (12)\r
+#define KILL_PYTHON_EXE     (L"kill_python_d.exe")\r
+#define KILL_PYTHON_EXE_LEN (17)\r
+#else\r
+#define PYTHON_EXE          (L"python.exe")\r
+#define PYTHON_EXE_LEN      (10)\r
+#define KILL_PYTHON_EXE     (L"kill_python.exe")\r
+#define KILL_PYTHON_EXE_LEN (15)\r
+#endif\r
+\r
+int\r
+main(int argc, char **argv)\r
+{\r
+    HANDLE   hp, hsp, hsm; /* process, snapshot processes, snapshot modules */\r
+    DWORD    dac, our_pid;\r
+    size_t   len;\r
+    wchar_t  path[MAX_PATH+1];\r
+\r
+    MODULEENTRY32W  me;\r
+    PROCESSENTRY32W pe;\r
+\r
+    me.dwSize = sizeof(MODULEENTRY32W);\r
+    pe.dwSize = sizeof(PROCESSENTRY32W);\r
+\r
+    memset(path, 0, MAX_PATH+1);\r
+\r
+    our_pid = GetCurrentProcessId();\r
+\r
+    hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);\r
+    if (hsm == INVALID_HANDLE_VALUE) {\r
+        printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());\r
+        return 1;\r
+    }\r
+\r
+    if (!Module32FirstW(hsm, &me)) {\r
+        printf("Module32FirstW[1] failed: %d\n", GetLastError());\r
+        CloseHandle(hsm);\r
+        return 1;\r
+    }\r
+\r
+    /*\r
+     * Enumerate over the modules for the current process in order to find\r
+     * kill_process[_d].exe, then take a note of the directory it lives in.\r
+     */\r
+    do {\r
+        if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))\r
+            continue;\r
+\r
+        len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;\r
+        wcsncpy_s(path, MAX_PATH+1, me.szExePath, len); \r
+\r
+        break;\r
+\r
+    } while (Module32NextW(hsm, &me));\r
+\r
+    CloseHandle(hsm);\r
+\r
+    if (path == NULL) {\r
+        printf("failed to discern directory of running process\n");\r
+        return 1;\r
+    }\r
+\r
+    /*\r
+     * Take a snapshot of system processes.  Enumerate over the snapshot,\r
+     * looking for python processes.  When we find one, verify it lives\r
+     * in the same directory we live in.  If it does, kill it.  If we're\r
+     * unable to kill it, treat this as a fatal error and return 1.\r
+     * \r
+     * The rationale behind this is that we're called at the start of the \r
+     * build process on the basis that we'll take care of killing any\r
+     * running instances, such that the build won't encounter permission\r
+     * denied errors during linking. If we can't kill one of the processes,\r
+     * we can't provide this assurance, and the build shouldn't start.\r
+     */\r
+\r
+    hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
+    if (hsp == INVALID_HANDLE_VALUE) {\r
+        printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());\r
+        return 1;\r
+    }\r
+\r
+    if (!Process32FirstW(hsp, &pe)) {\r
+        printf("Process32FirstW failed: %d\n", GetLastError());\r
+        CloseHandle(hsp);\r
+        return 1;\r
+    }\r
+\r
+    dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;\r
+    do {\r
+\r
+        /*\r
+         * XXX TODO: if we really wanted to be fancy, we could check the \r
+         * modules for all processes (not just the python[_d].exe ones)\r
+         * and see if any of our DLLs are loaded (i.e. python30[_d].dll),\r
+         * as that would also inhibit our ability to rebuild the solution.\r
+         * Not worth loosing sleep over though; for now, a simple check \r
+         * for just the python executable should be sufficient.\r
+         */\r
+\r
+        if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))\r
+            /* This isn't a python process. */\r
+            continue;\r
+\r
+        /* It's a python process, so figure out which directory it's in... */\r
+        hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);\r
+        if (hsm == INVALID_HANDLE_VALUE)\r
+            /* \r
+             * If our module snapshot fails (which will happen if we don't own\r
+             * the process), just ignore it and continue.  (It seems different\r
+             * versions of Windows return different values for GetLastError()\r
+             * in this situation; it's easier to just ignore it and move on vs.\r
+             * stopping the build for what could be a false positive.)\r
+             */\r
+             continue;\r
+\r
+        if (!Module32FirstW(hsm, &me)) {\r
+            printf("Module32FirstW[2] failed: %d\n", GetLastError());\r
+            CloseHandle(hsp);\r
+            CloseHandle(hsm);\r
+            return 1;\r
+        }\r
+\r
+        do {\r
+            if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))\r
+                /* Wrong module, we're looking for python[_d].exe... */\r
+                continue;\r
+\r
+            if (_wcsnicmp(path, me.szExePath, len))\r
+                /* Process doesn't live in our directory. */\r
+                break;\r
+\r
+            /* Python process residing in the right directory, kill it!  */\r
+            hp = OpenProcess(dac, FALSE, pe.th32ProcessID);\r
+            if (!hp) {\r
+                printf("OpenProcess failed: %d\n", GetLastError());\r
+                CloseHandle(hsp);\r
+                CloseHandle(hsm);\r
+                return 1;\r
+            }\r
+\r
+            if (!TerminateProcess(hp, 1)) {\r
+                printf("TerminateProcess failed: %d\n", GetLastError());\r
+                CloseHandle(hsp);\r
+                CloseHandle(hsm);\r
+                CloseHandle(hp);\r
+                return 1;\r
+            }\r
+\r
+            CloseHandle(hp);\r
+            break;\r
+\r
+        } while (Module32NextW(hsm, &me));\r
+\r
+        CloseHandle(hsm);\r
+\r
+    } while (Process32NextW(hsp, &pe));\r
+\r
+    CloseHandle(hsp);\r
+\r
+    return 0;\r
+}\r
+\r
+/* vi: set ts=8 sw=4 sts=4 expandtab */\r
index b097162f790fb66e0af2228426c1b2dcd0bc28b4..9dbf10d95a3ee43cc2fbbd2743b2321e6fef5c95 100644 (file)
@@ -67,7 +67,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(SolutionDir)make_versioninfo.exe"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="1"\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
index 954179e38a30cb87d5aedcadf54f47f475fcfacd..e6dd5daee614d8cef089102d508664594f058398 100644 (file)
@@ -11,6 +11,7 @@ EndProject
 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
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
                {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}\r
        EndProjectSection\r
 EndProject\r
@@ -20,6 +21,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj",
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"\r
 EndProject\r
@@ -36,6 +40,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"\r
        ProjectSection(ProjectDependencies) = postProject\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
+               {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19}\r
                {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
        EndProjectSection\r
 EndProject\r
@@ -67,6 +73,7 @@ EndProject
 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
+               {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"\r
@@ -108,6 +115,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj",
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}\r
+               {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"\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}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -457,13 +487,93 @@ Global
                {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}.Debug|x64.ActiveCfg = Release|x64\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}.PGInstrument|x64.ActiveCfg = Release|x64\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}.PGUpdate|x64.ActiveCfg = Release|x64\r
                {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32\r
-               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32\r
+               {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.ActiveCfg = Debug|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.Build.0 = Debug|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64\r
+               {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64\r
+               {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.Build.0 = Debug|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64\r
+               {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64\r
+               {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.Build.0 = Debug|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.ActiveCfg = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.Build.0 = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.ActiveCfg = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.Build.0 = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.ActiveCfg = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.Build.0 = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.ActiveCfg = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.Build.0 = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.Build.0 = Release|Win32\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64\r
+               {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 12941468b35b59eff2b445bee2b69bac0a999588..bfe6bd7e2d4c36474fe8f1f4f3962aa21502702d 100644 (file)
@@ -7,6 +7,7 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
+               PreprocessorDefinitions="Py_BUILD_CORE_MODULE"\r
                RuntimeLibrary="2"\r
        />\r
        <Tool\r
index 18f4bcf38863b2a91123f5aae83e8539758675b7..f3a951c53f542028d845543ec8f362a12f8cb14c 100644 (file)
@@ -10,6 +10,7 @@
                Optimization="0"\r
                InlineFunctionExpansion="0"\r
                EnableIntrinsicFunctions="false"\r
+               PreprocessorDefinitions="Py_BUILD_CORE_MODULE"\r
                RuntimeLibrary="3"\r
        />\r
        <Tool\r
index a09a7947dcf30e237e1a3da786b602d7ff36d767..b8d9cde69c2758eb4d4bad5d0a8b0df84751c6dd 100644 (file)
                Name="PythonExe"\r
                Value="$(SolutionDir)\python.exe"\r
        />\r
+       <UserMacro\r
+               Name="externalsDir"\r
+               Value="..\..\.."\r
+       />\r
        <UserMacro\r
                Name="bsddbDir"\r
-               Value="..\..\..\db-4.4.20\build_win32\"\r
+               Value="$(bsddb44Dir)"\r
+       />\r
+       <UserMacro\r
+               Name="bsddbDepLibs"\r
+               Value="$(bsddb44DepLibs)"\r
+       />\r
+       <UserMacro\r
+               Name="bsddb44Dir"\r
+               Value="$(externalsDir)\db-4.4.20\build_win32"\r
+       />\r
+       <UserMacro\r
+               Name="bsddb44DepLibs"\r
+               Value=""\r
+       />\r
+       <UserMacro\r
+               Name="bsddb45Dir"\r
+               Value="$(externalsDir)\db-4.5.20.x\build_windows"\r
+       />\r
+       <UserMacro\r
+               Name="bsddb45DepLibs"\r
+               Value="ws2_32.lib"\r
        />\r
        <UserMacro\r
                Name="sqlite3Dir"\r
-               Value="..\..\..\sqlite-source-3.3.4\"\r
+               Value="$(externalsDir)\sqlite-source-3.3.4"\r
        />\r
        <UserMacro\r
                Name="bz2Dir"\r
-               Value="..\..\..\bzip2-1.0.3\"\r
+               Value="$(externalsDir)\bzip2-1.0.3"\r
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="..\..\..\openssl-0.9.8g\"\r
+               Value="$(externalsDir)\openssl-0.9.8g"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r
-               Value="..\..\..\tcltk\"\r
+               Value="$(externalsDir)\tcltk"\r
        />\r
        <UserMacro\r
                Name="tcltk64Dir"\r
-               Value="..\..\..\tcltk64"\r
+               Value="$(externalsDir)\tcltk64"\r
        />\r
        <UserMacro\r
                Name="tcltkLib"\r
                Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"\r
        />\r
+       <UserMacro\r
+               Name="tcltkLibDebug"\r
+               Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"\r
+       />\r
        <UserMacro\r
                Name="tcltk64Lib"\r
                Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"\r
        />\r
+       <UserMacro\r
+               Name="tcltk64LibDebug"\r
+               Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"\r
+       />\r
 </VisualStudioPropertySheet>\r
index 7d10e1446dea3e3b151aec16de1283b839d38eb5..2f47c0ee8dd7bedbae638f7e13767c1d9c767bc1 100644 (file)
@@ -62,7 +62,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
-                               StackReserveSize="2000000"\r
+                               StackReserveSize="2100000"\r
                                BaseAddress="0x1d000000"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
index 8c61e88282403451eed6a6d663197cda866ec8d2..1aaa94f1cfd145b5c24127134f669cc533650503 100644 (file)
@@ -58,8 +58,8 @@
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe Release"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe Release"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
-                               Description="generate buildinfo"\r
-                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"\r
+                               Description="Generate build information..."\r
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                RelativePath="..\..\Include\bytes_methods.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\bytearrayobject.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Include\bytesobject.h"\r
                                >\r
                                RelativePath="..\..\Include\pymactoolbox.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\pymath.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Include\pymem.h"\r
                                >\r
                                RelativePath="..\..\Include\sliceobject.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Include\stringobject.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Include\structmember.h"\r
                                >\r
                                RelativePath="..\..\Modules\_fileio.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\_bytesio.c"\r
-                               >\r
-                       </File>\r
+                        <File\r
+                                RelativePath="..\..\Modules\_bytesio.c"\r
+                                >\r
+                        </File>\r
                        <File\r
                                RelativePath="..\..\Modules\_functoolsmodule.c"\r
                                >\r
                                RelativePath="..\..\Objects\bytes_methods.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\bytearrayobject.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Objects\bytesobject.c"\r
                                >\r
                                RelativePath="..\..\Objects\sliceobject.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Objects\stringobject.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Objects\structseq.c"\r
                                >\r
index c4f85678e3019dc9d23987781e1ebcfdfee5ad65..08def90651b03a2a67a87935ac22cfb73af52f71 100644 (file)
@@ -8,4 +8,8 @@
                Name="VCCLCompilerTool"\r
                PreprocessorDefinitions="NDEBUG"\r
        />\r
+       <UserMacro\r
+               Name="KillPythonExe"\r
+               Value="$(OutDir)\kill_python.exe"\r
+       />      \r
 </VisualStudioPropertySheet>\r
index 551469216a4c923dbe3d0898a8c454721535404e..9f88d443fe47b9021abdb81197bcd6e64f68d15f 100644 (file)
@@ -15,4 +15,8 @@
                Name="VCLinkerTool"\r
                TargetMachine="17"\r
        />\r
+       <UserMacro\r
+               Name="PythonExe"\r
+               Value="$(HOST_PYTHON)"\r
+       />\r
 </VisualStudioPropertySheet>\r
index c22c252014cf37a255fbf74ec70d8516133972b2..b308c186986cd065eed13ebae9896b34d44b7af2 100644 (file)
@@ -56,7 +56,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                                TargetMachine="17"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                BaseAddress="0x1D100000"
                                TargetMachine="17"
                        />
index dcb922bf1e85e4ba69308a695ff46483d486027f..e2b86c73f2f90073906cfe3e1990a6d20df17766 100644 (file)
@@ -67,7 +67,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(SolutionDir)make_versioninfo.exe"
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
                                SubSystem="1"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(SolutionDir)make_versioninfo_d.exe"
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
                                SubSystem="1"
index 384c4b865be641929ae91e9ae206de9241a454f1..dcf04e33ac14cc28c02949177b27c51fd99b887e 100644 (file)
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
        ProjectSection(ProjectDependencies) = postProject
                {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
@@ -152,20 +152,16 @@ Global
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32
                {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64
-               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
+               {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
@@ -312,20 +308,16 @@ Global
                {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64
                {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32
                {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64
-               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64
+               {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|Win32
                {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32
                {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32
                {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64
index f5f460547e82a9ae18c866262a4db8d97e07ca6f..85d2d9ee2fe039157837cc949e06655c37ffe8d2 100644 (file)
@@ -62,7 +62,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2100000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="odbccp32.lib"
                                OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
index 09496aeddcba52fef01268b8cbaab70358bb3240..c02cd79768fe0de1582a1cf7ce966532f7a193d6 100644 (file)
@@ -22,6 +22,12 @@ def vs9to8(src, dest):
             lines = lines.replace('..\\', '..\\..\\')
             lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
 
+            # Bah. VS8.0 does not expand macros in file names.
+            # Replace them here.
+            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4')
+            lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
+            lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
+
         with open(destname, 'wb') as fout:
             lines = lines.replace("\n", "\r\n").encode()
             fout.write(lines)