diff options
author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-02 22:36:25 (GMT) |
---|---|---|
committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-09-02 22:36:25 (GMT) |
commit | cb87f82fc8be29612a63f6dd4807be639c64240d (patch) | |
tree | 8a03d7b0f80566b1b46b714f25758af76758953a /PC | |
parent | 7aa42ea1bbe284901f03d4a5bdc02c8faf0fac71 (diff) | |
download | cpython-cb87f82fc8be29612a63f6dd4807be639c64240d.zip cpython-cb87f82fc8be29612a63f6dd4807be639c64240d.tar.gz cpython-cb87f82fc8be29612a63f6dd4807be639c64240d.tar.bz2 |
Merged revisions 66166 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
Note: The Windows projects still use bsddb 4.4.20 on the py3k branch
........
r66166 | amaury.forgeotdarc | 2008-09-02 23:17:05 +0200 (mar., 02 sept. 2008) | 2 lines
Use vs9to8.py to refresh the Visual Studio 2005 build files.
........
Diffstat (limited to 'PC')
-rw-r--r-- | PC/VS8.0/_ctypes.vcproj | 2 | ||||
-rw-r--r-- | PC/VS8.0/_multiprocessing.vcproj | 51 | ||||
-rw-r--r-- | PC/VS8.0/_sqlite3.vcproj | 16 | ||||
-rw-r--r-- | PC/VS8.0/pyproject.vsprops | 12 | ||||
-rw-r--r-- | PC/VS8.0/sqlite3.vcproj | 240 |
5 files changed, 67 insertions, 254 deletions
diff --git a/PC/VS8.0/_ctypes.vcproj b/PC/VS8.0/_ctypes.vcproj index 836f997..eb19943 100644 --- a/PC/VS8.0/_ctypes.vcproj +++ b/PC/VS8.0/_ctypes.vcproj @@ -642,7 +642,7 @@ > <Tool Name="VCCustomBuildTool" - CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" + CommandLine="ml64 /nologo /c /Zi /Fo "$(IntDir)\win64.obj" "$(InputPath)"
" Outputs="$(IntDir)\win64.obj" /> </FileConfiguration> diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj index 198b87a..735ed12 100644 --- a/PC/VS8.0/_multiprocessing.vcproj +++ b/PC/VS8.0/_multiprocessing.vcproj @@ -3,10 +3,9 @@ ProjectType="Visual C++" Version="8.00" Name="_multiprocessing" - ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}" + ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}" RootNamespace="_multiprocessing" Keyword="Win32Proj" - TargetFrameworkVersion="196613" > <Platforms> <Platform @@ -76,14 +75,18 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" + InheritedPropertySheets=".\pyd.vsprops" CharacterSet="0" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -99,7 +102,6 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -137,13 +139,16 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="Release|Win32" + Name="PGInstrument|Win32" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" CharacterSet="0" WholeProgramOptimization="1" > @@ -198,13 +203,16 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="Release|x64" + Name="PGUpdate|Win32" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" CharacterSet="0" WholeProgramOptimization="1" > @@ -222,7 +230,6 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -260,15 +267,17 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration - Name="PGInstrument|Win32" + Name="Debug|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" + InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" CharacterSet="0" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -284,6 +293,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -325,9 +335,9 @@ /> </Configuration> <Configuration - Name="PGInstrument|x64" + Name="Release|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" CharacterSet="0" WholeProgramOptimization="1" > @@ -363,7 +373,6 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" BaseAddress="0x1e1D0000" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -388,9 +397,9 @@ /> </Configuration> <Configuration - Name="PGUpdate|Win32" + Name="PGInstrument|x64" ConfigurationType="2" - InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" + InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" CharacterSet="0" WholeProgramOptimization="1" > @@ -408,6 +417,7 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" @@ -425,6 +435,7 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" BaseAddress="0x1e1D0000" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -519,11 +530,11 @@ Name="Header Files" > <File - RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h" + RelativePath="..\..\Modules\_multiprocessing\connection.h" > </File> <File - RelativePath="..\..\Modules\_multiprocessing\connection.h" + RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h" > </File> </Filter> diff --git a/PC/VS8.0/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj index aa31ad6..cbd02cc 100644 --- a/PC/VS8.0/_sqlite3.vcproj +++ b/PC/VS8.0/_sqlite3.vcproj @@ -42,7 +42,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -104,7 +104,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -166,7 +166,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -229,7 +229,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -291,7 +291,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -354,7 +354,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -417,7 +417,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool @@ -480,7 +480,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" PreprocessorDefinitions="MODULE_NAME=\"sqlite3\"" /> <Tool diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index b8d9cde..ae8b113 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -74,11 +74,11 @@ />
<UserMacro
Name="sqlite3Dir"
- Value="$(externalsDir)\sqlite-source-3.3.4"
+ Value="$(externalsDir)\sqlite-3.5.9"
/>
<UserMacro
Name="bz2Dir"
- Value="$(externalsDir)\bzip2-1.0.3"
+ Value="$(externalsDir)\bzip2-1.0.5"
/>
<UserMacro
Name="opensslDir"
@@ -94,18 +94,18 @@ />
<UserMacro
Name="tcltkLib"
- Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
+ Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltkLibDebug"
- Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
+ Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
/>
<UserMacro
Name="tcltk64Lib"
- Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
+ Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltk64LibDebug"
- Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
+ Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
/>
</VisualStudioPropertySheet>
diff --git a/PC/VS8.0/sqlite3.vcproj b/PC/VS8.0/sqlite3.vcproj index 93dda5d..071589a 100644 --- a/PC/VS8.0/sqlite3.vcproj +++ b/PC/VS8.0/sqlite3.vcproj @@ -42,7 +42,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -56,7 +57,6 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName)_d.dll" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -104,7 +104,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -118,7 +119,6 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName)_d.dll" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -166,7 +166,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -180,7 +181,6 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).dll" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -229,7 +229,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -243,7 +244,6 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName).dll" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -291,7 +291,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -304,7 +305,7 @@ /> <Tool Name="VCLinkerTool" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" + OutputFile="$(OutDir)\$(ProjectName).dll" /> <Tool Name="VCALinkTool" @@ -353,7 +354,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -366,7 +368,6 @@ /> <Tool Name="VCLinkerTool" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -414,7 +415,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -427,7 +429,7 @@ /> <Tool Name="VCLinkerTool" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" + OutputFile="$(OutDir)\$(ProjectName).dll" /> <Tool Name="VCALinkTool" @@ -476,7 +478,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4" + AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" + PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -489,7 +492,6 @@ /> <Tool Name="VCLinkerTool" - ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def" /> <Tool Name="VCALinkTool" @@ -521,51 +523,11 @@ Name="Header Files" > <File - RelativePath="..\..\..\sqlite-source-3.3.4\btree.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\hash.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\os.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\pager.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\parse.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h" + RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h" > </File> <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h" + RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h" > </File> </Filter> @@ -573,167 +535,7 @@ Name="Source Files" > <File - RelativePath="..\..\..\sqlite-source-3.3.4\alter.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\attach.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\auth.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\btree.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\build.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\callback.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\complete.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\date.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\delete.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\expr.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\func.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\hash.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\insert.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\main.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\os.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\pager.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\parse.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\printf.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\random.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\select.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\shell.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\table.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\update.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\utf.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\util.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c" - > - </File> - <File - RelativePath="..\..\..\sqlite-source-3.3.4\where.c" + RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c" > </File> </Filter> |