diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-12 22:53:41 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-12 22:53:41 (GMT) |
| commit | 6166717fa44494460b3bb641f158fd92a614d1ae (patch) | |
| tree | a1c1c9174f9b442ea3bde6fc6654116a275ce1ff /PC | |
| parent | 167cb5796056c2996534265fe9e2d417935d6d89 (diff) | |
| download | cpython-6166717fa44494460b3bb641f158fd92a614d1ae.zip cpython-6166717fa44494460b3bb641f158fd92a614d1ae.tar.gz cpython-6166717fa44494460b3bb641f158fd92a614d1ae.tar.bz2 | |
Merged revisions 64202 via svnmerge from
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)
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VS8.0/_bsddb.vcproj | 41 | ||||
| -rw-r--r-- | PC/VS8.0/_elementtree.vcproj | 8 | ||||
| -rw-r--r-- | PC/VS8.0/_sqlite3.vcproj | 40 | ||||
| -rw-r--r-- | PC/VS8.0/_ssl.vcproj | 20 | ||||
| -rw-r--r-- | PC/VS8.0/_tkinter.vcproj | 12 | ||||
| -rw-r--r-- | PC/VS8.0/bdist_wininst.vcproj | 93 | ||||
| -rw-r--r-- | PC/VS8.0/debug.vsprops | 6 | ||||
| -rw-r--r-- | PC/VS8.0/kill_python.c | 178 | ||||
| -rw-r--r-- | PC/VS8.0/make_versioninfo.vcproj | 2 | ||||
| -rw-r--r-- | PC/VS8.0/pcbuild.sln | 118 | ||||
| -rw-r--r-- | PC/VS8.0/pyd.vsprops | 1 | ||||
| -rw-r--r-- | PC/VS8.0/pyd_d.vsprops | 1 | ||||
| -rw-r--r-- | PC/VS8.0/pyproject.vsprops | 44 | ||||
| -rw-r--r-- | PC/VS8.0/python.vcproj | 10 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 60 | ||||
| -rw-r--r-- | PC/VS8.0/release.vsprops | 4 | ||||
| -rw-r--r-- | PC/VS8.0/x64.vsprops | 4 |
17 files changed, 510 insertions, 132 deletions
diff --git a/PC/VS8.0/_bsddb.vcproj b/PC/VS8.0/_bsddb.vcproj index 0dbeb28..59b7ce2 100644 --- a/PC/VS8.0/_bsddb.vcproj +++ b/PC/VS8.0/_bsddb.vcproj @@ -42,7 +42,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -52,11 +52,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build Debug /project db_static
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -105,7 +103,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -115,11 +113,11 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv
"
+ CommandLine=""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -168,7 +166,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -178,11 +176,10 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -232,7 +229,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -242,11 +239,11 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
+ CommandLine=""
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -295,7 +292,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -305,11 +302,10 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -359,7 +355,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -369,11 +365,10 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
@@ -423,7 +418,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -433,11 +428,10 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
<Tool
@@ -487,7 +481,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(bsddbDir)"
+ AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -497,11 +491,10 @@ />
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
+ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
diff --git a/PC/VS8.0/_elementtree.vcproj b/PC/VS8.0/_elementtree.vcproj index 32fac0c..457da72 100644 --- a/PC/VS8.0/_elementtree.vcproj +++ b/PC/VS8.0/_elementtree.vcproj @@ -56,7 +56,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -119,7 +118,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -182,7 +180,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -246,7 +243,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -309,7 +305,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -373,7 +368,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@@ -437,7 +431,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -501,7 +494,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
diff --git a/PC/VS8.0/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj index 2343afa..689585f 100644 --- a/PC/VS8.0/_sqlite3.vcproj +++ b/PC/VS8.0/_sqlite3.vcproj @@ -42,7 +42,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -53,12 +53,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -107,7 +104,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -118,12 +115,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -172,7 +166,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -183,12 +177,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -238,7 +229,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -249,12 +240,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -303,7 +291,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -314,12 +302,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -369,7 +354,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -380,12 +365,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
@@ -435,7 +417,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -446,12 +428,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
/>
<Tool
@@ -501,7 +480,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(sqlite3Dir)"
+ AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="MODULE_NAME=\"sqlite3\""
/>
<Tool
@@ -512,12 +491,9 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="Build sqlite3 libs and dll"
- CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
BaseAddress="0x1e180000"
TargetMachine="17"
/>
diff --git a/PC/VS8.0/_ssl.vcproj b/PC/VS8.0/_ssl.vcproj index 72d4292..69f7726 100644 --- a/PC/VS8.0/_ssl.vcproj +++ b/PC/VS8.0/_ssl.vcproj @@ -27,7 +27,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -89,7 +89,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -153,7 +153,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -216,7 +216,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -280,7 +280,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -343,7 +343,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -408,7 +408,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -471,7 +471,7 @@ >
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -535,10 +535,6 @@ Name="Source Files"
>
<File
- RelativePath="..\..\Modules\_hashopenssl.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\_ssl.c"
>
</File>
diff --git a/PC/VS8.0/_tkinter.vcproj b/PC/VS8.0/_tkinter.vcproj index f1d9bb4..9700bde 100644 --- a/PC/VS8.0/_tkinter.vcproj +++ b/PC/VS8.0/_tkinter.vcproj @@ -56,7 +56,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(tcltkLib)"
+ AdditionalDependencies="$(tcltkLibDebug)"
/>
<Tool
Name="VCALinkTool"
@@ -104,7 +104,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -118,7 +118,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(tcltk64Lib)"
+ AdditionalDependencies="$(tcltk64LibDebug)"
/>
<Tool
Name="VCALinkTool"
@@ -229,7 +229,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -354,7 +354,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
@@ -480,7 +480,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(tcltk64Dir)\include""
+ AdditionalIncludeDirectories="$(tcltk64Dir)\include"
PreprocessorDefinitions="WITH_APPINIT"
/>
<Tool
diff --git a/PC/VS8.0/bdist_wininst.vcproj b/PC/VS8.0/bdist_wininst.vcproj index 08adac6..3b586df 100644 --- a/PC/VS8.0/bdist_wininst.vcproj +++ b/PC/VS8.0/bdist_wininst.vcproj @@ -11,6 +11,9 @@ <Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -104,6 +107,96 @@ Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="0"
+ AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="comctl32.lib imagehlp.lib"
+ OutputFile="..\..\lib\distutils\command\wininst-8.0-amd64.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames="LIBC"
+ ProgramDatabaseFile="..\..\lib\distutils\command\wininst-8.0-amd64.pdb"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
diff --git a/PC/VS8.0/debug.vsprops b/PC/VS8.0/debug.vsprops index 803da6e..bc643cb 100644 --- a/PC/VS8.0/debug.vsprops +++ b/PC/VS8.0/debug.vsprops @@ -8,4 +8,8 @@ Name="VCCLCompilerTool"
PreprocessorDefinitions="_DEBUG"
/>
-</VisualStudioPropertySheet>
\ No newline at end of file + <UserMacro
+ Name="KillPythonExe"
+ Value="$(OutDir)\kill_python_d.exe"
+ />
+</VisualStudioPropertySheet>
diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c new file mode 100644 index 0000000..8ee22e8 --- /dev/null +++ b/PC/VS8.0/kill_python.c @@ -0,0 +1,178 @@ +/*
+ * Helper program for killing lingering python[_d].exe processes before
+ * building, thus attempting to avoid build failures due to files being
+ * locked.
+ */
+
+#include <windows.h>
+#include <wchar.h>
+#include <tlhelp32.h>
+#include <stdio.h>
+
+#pragma comment(lib, "psapi")
+
+#ifdef _DEBUG
+#define PYTHON_EXE (L"python_d.exe")
+#define PYTHON_EXE_LEN (12)
+#define KILL_PYTHON_EXE (L"kill_python_d.exe")
+#define KILL_PYTHON_EXE_LEN (17)
+#else
+#define PYTHON_EXE (L"python.exe")
+#define PYTHON_EXE_LEN (10)
+#define KILL_PYTHON_EXE (L"kill_python.exe")
+#define KILL_PYTHON_EXE_LEN (15)
+#endif
+
+int
+main(int argc, char **argv)
+{
+ HANDLE hp, hsp, hsm; /* process, snapshot processes, snapshot modules */
+ DWORD dac, our_pid;
+ size_t len;
+ wchar_t path[MAX_PATH+1];
+
+ MODULEENTRY32W me;
+ PROCESSENTRY32W pe;
+
+ me.dwSize = sizeof(MODULEENTRY32W);
+ pe.dwSize = sizeof(PROCESSENTRY32W);
+
+ memset(path, 0, MAX_PATH+1);
+
+ our_pid = GetCurrentProcessId();
+
+ hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);
+ if (hsm == INVALID_HANDLE_VALUE) {
+ printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());
+ return 1;
+ }
+
+ if (!Module32FirstW(hsm, &me)) {
+ printf("Module32FirstW[1] failed: %d\n", GetLastError());
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ /*
+ * Enumerate over the modules for the current process in order to find
+ * kill_process[_d].exe, then take a note of the directory it lives in.
+ */
+ do {
+ if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))
+ continue;
+
+ len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
+ wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
+
+ break;
+
+ } while (Module32NextW(hsm, &me));
+
+ CloseHandle(hsm);
+
+ if (path == NULL) {
+ printf("failed to discern directory of running process\n");
+ return 1;
+ }
+
+ /*
+ * Take a snapshot of system processes. Enumerate over the snapshot,
+ * looking for python processes. When we find one, verify it lives
+ * in the same directory we live in. If it does, kill it. If we're
+ * unable to kill it, treat this as a fatal error and return 1.
+ *
+ * The rationale behind this is that we're called at the start of the
+ * build process on the basis that we'll take care of killing any
+ * running instances, such that the build won't encounter permission
+ * denied errors during linking. If we can't kill one of the processes,
+ * we can't provide this assurance, and the build shouldn't start.
+ */
+
+ hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ if (hsp == INVALID_HANDLE_VALUE) {
+ printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());
+ return 1;
+ }
+
+ if (!Process32FirstW(hsp, &pe)) {
+ printf("Process32FirstW failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ return 1;
+ }
+
+ dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;
+ do {
+
+ /*
+ * XXX TODO: if we really wanted to be fancy, we could check the
+ * modules for all processes (not just the python[_d].exe ones)
+ * and see if any of our DLLs are loaded (i.e. python30[_d].dll),
+ * as that would also inhibit our ability to rebuild the solution.
+ * Not worth loosing sleep over though; for now, a simple check
+ * for just the python executable should be sufficient.
+ */
+
+ if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))
+ /* This isn't a python process. */
+ continue;
+
+ /* It's a python process, so figure out which directory it's in... */
+ hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
+ if (hsm == INVALID_HANDLE_VALUE)
+ /*
+ * If our module snapshot fails (which will happen if we don't own
+ * the process), just ignore it and continue. (It seems different
+ * versions of Windows return different values for GetLastError()
+ * in this situation; it's easier to just ignore it and move on vs.
+ * stopping the build for what could be a false positive.)
+ */
+ continue;
+
+ if (!Module32FirstW(hsm, &me)) {
+ printf("Module32FirstW[2] failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ do {
+ if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))
+ /* Wrong module, we're looking for python[_d].exe... */
+ continue;
+
+ if (_wcsnicmp(path, me.szExePath, len))
+ /* Process doesn't live in our directory. */
+ break;
+
+ /* Python process residing in the right directory, kill it! */
+ hp = OpenProcess(dac, FALSE, pe.th32ProcessID);
+ if (!hp) {
+ printf("OpenProcess failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ if (!TerminateProcess(hp, 1)) {
+ printf("TerminateProcess failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ CloseHandle(hp);
+ return 1;
+ }
+
+ CloseHandle(hp);
+ break;
+
+ } while (Module32NextW(hsm, &me));
+
+ CloseHandle(hsm);
+
+ } while (Process32NextW(hsp, &pe));
+
+ CloseHandle(hsp);
+
+ return 0;
+}
+
+/* vi: set ts=8 sw=4 sts=4 expandtab */
diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj index b097162..9dbf10d 100644 --- a/PC/VS8.0/make_versioninfo.vcproj +++ b/PC/VS8.0/make_versioninfo.vcproj @@ -67,7 +67,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -211,7 +210,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
diff --git a/PC/VS8.0/pcbuild.sln b/PC/VS8.0/pcbuild.sln index 954179e..e6dd5da 100644 --- a/PC/VS8.0/pcbuild.sln +++ b/PC/VS8.0/pcbuild.sln @@ -11,6 +11,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
ProjectSection(ProjectDependencies) = postProject
{F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
{C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
EndProjectSection
EndProject
@@ -20,6 +21,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
EndProject
@@ -36,6 +40,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
ProjectSection(ProjectDependencies) = postProject
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+ {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19}
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -67,6 +73,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
@@ -108,6 +115,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
+ ProjectSection(ProjectDependencies) = postProject
+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -457,13 +487,93 @@ Global {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64
{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|Win32
+ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|x64
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|Win32
+ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|Win32
+ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|x64
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32
- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32
+ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.Build.0 = Debug|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.ActiveCfg = Debug|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.Build.0 = Debug|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.ActiveCfg = Release|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64
+ {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.Build.0 = Debug|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.ActiveCfg = Release|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64
+ {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64
+ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.Build.0 = Debug|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.Build.0 = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.ActiveCfg = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.Build.0 = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.Build.0 = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.ActiveCfg = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.Build.0 = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.ActiveCfg = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.Build.0 = Release|Win32
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64
+ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PC/VS8.0/pyd.vsprops b/PC/VS8.0/pyd.vsprops index 1294146..bfe6bd7 100644 --- a/PC/VS8.0/pyd.vsprops +++ b/PC/VS8.0/pyd.vsprops @@ -7,6 +7,7 @@ >
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
RuntimeLibrary="2"
/>
<Tool
diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops index 18f4bcf..f3a951c 100644 --- a/PC/VS8.0/pyd_d.vsprops +++ b/PC/VS8.0/pyd_d.vsprops @@ -10,6 +10,7 @@ Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
+ PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
RuntimeLibrary="3"
/>
<Tool
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index a09a794..b8d9cde 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -45,35 +45,67 @@ Value="$(SolutionDir)\python.exe"
/>
<UserMacro
+ Name="externalsDir"
+ Value="..\..\.."
+ />
+ <UserMacro
Name="bsddbDir"
- Value="..\..\..\db-4.4.20\build_win32\"
+ Value="$(bsddb44Dir)"
+ />
+ <UserMacro
+ Name="bsddbDepLibs"
+ Value="$(bsddb44DepLibs)"
+ />
+ <UserMacro
+ Name="bsddb44Dir"
+ Value="$(externalsDir)\db-4.4.20\build_win32"
+ />
+ <UserMacro
+ Name="bsddb44DepLibs"
+ Value=""
+ />
+ <UserMacro
+ Name="bsddb45Dir"
+ Value="$(externalsDir)\db-4.5.20.x\build_windows"
+ />
+ <UserMacro
+ Name="bsddb45DepLibs"
+ Value="ws2_32.lib"
/>
<UserMacro
Name="sqlite3Dir"
- Value="..\..\..\sqlite-source-3.3.4\"
+ Value="$(externalsDir)\sqlite-source-3.3.4"
/>
<UserMacro
Name="bz2Dir"
- Value="..\..\..\bzip2-1.0.3\"
+ Value="$(externalsDir)\bzip2-1.0.3"
/>
<UserMacro
Name="opensslDir"
- Value="..\..\..\openssl-0.9.8g\"
+ Value="$(externalsDir)\openssl-0.9.8g"
/>
<UserMacro
Name="tcltkDir"
- Value="..\..\..\tcltk\"
+ Value="$(externalsDir)\tcltk"
/>
<UserMacro
Name="tcltk64Dir"
- Value="..\..\..\tcltk64"
+ Value="$(externalsDir)\tcltk64"
/>
<UserMacro
Name="tcltkLib"
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
/>
<UserMacro
+ Name="tcltkLibDebug"
+ Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
+ />
+ <UserMacro
Name="tcltk64Lib"
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
/>
+ <UserMacro
+ Name="tcltk64LibDebug"
+ Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
+ />
</VisualStudioPropertySheet>
diff --git a/PC/VS8.0/python.vcproj b/PC/VS8.0/python.vcproj index 7d10e14..2f47c0e 100644 --- a/PC/VS8.0/python.vcproj +++ b/PC/VS8.0/python.vcproj @@ -62,7 +62,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -136,7 +135,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -211,7 +209,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -287,10 +284,9 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
- StackReserveSize="2000000"
+ StackReserveSize="2100000"
BaseAddress="0x1d000000"
/>
<Tool
@@ -360,7 +356,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -435,7 +430,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -510,7 +504,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -585,7 +578,6 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index 8c61e88..1aaa94f 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -58,8 +58,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -133,8 +133,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -211,8 +211,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug"
/>
<Tool
Name="VCLinkerTool"
@@ -289,8 +289,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug"
/>
<Tool
Name="VCLinkerTool"
@@ -363,8 +363,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe Release"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -438,8 +438,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -513,8 +513,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe Release"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -588,8 +588,8 @@ />
<Tool
Name="VCPreLinkEventTool"
- Description="generate buildinfo"
- CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"
+ Description="Generate build information..."
+ CommandLine=""$(SolutionDir)make_buildinfo.exe" Release"
/>
<Tool
Name="VCLinkerTool"
@@ -655,6 +655,10 @@ >
</File>
<File
+ RelativePath="..\..\Include\bytearrayobject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Include\bytesobject.h"
>
</File>
@@ -867,6 +871,10 @@ >
</File>
<File
+ RelativePath="..\..\Include\pymath.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Include\pymem.h"
>
</File>
@@ -915,10 +923,6 @@ >
</File>
<File
- RelativePath="..\..\Include\stringobject.h"
- >
- </File>
- <File
RelativePath="..\..\Include\structmember.h"
>
</File>
@@ -986,10 +990,10 @@ RelativePath="..\..\Modules\_fileio.c"
>
</File>
- <File
- RelativePath="..\..\Modules\_bytesio.c"
- >
- </File>
+ <File
+ RelativePath="..\..\Modules\_bytesio.c"
+ >
+ </File>
<File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
@@ -1339,6 +1343,10 @@ >
</File>
<File
+ RelativePath="..\..\Objects\bytearrayobject.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Objects\bytesobject.c"
>
</File>
@@ -1459,10 +1467,6 @@ >
</File>
<File
- RelativePath="..\..\Objects\stringobject.c"
- >
- </File>
- <File
RelativePath="..\..\Objects\structseq.c"
>
</File>
diff --git a/PC/VS8.0/release.vsprops b/PC/VS8.0/release.vsprops index c4f8567..08def90 100644 --- a/PC/VS8.0/release.vsprops +++ b/PC/VS8.0/release.vsprops @@ -8,4 +8,8 @@ Name="VCCLCompilerTool"
PreprocessorDefinitions="NDEBUG"
/>
+ <UserMacro
+ Name="KillPythonExe"
+ Value="$(OutDir)\kill_python.exe"
+ />
</VisualStudioPropertySheet>
diff --git a/PC/VS8.0/x64.vsprops b/PC/VS8.0/x64.vsprops index 5514692..9f88d44 100644 --- a/PC/VS8.0/x64.vsprops +++ b/PC/VS8.0/x64.vsprops @@ -15,4 +15,8 @@ Name="VCLinkerTool"
TargetMachine="17"
/>
+ <UserMacro
+ Name="PythonExe"
+ Value="$(HOST_PYTHON)"
+ />
</VisualStudioPropertySheet>
|