Skip to content

C
cpython
Commit 60954356 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto
Browse files
Options

Updated PC/VS8.0 with PCBuild/vs9to8.py.

parent 68201bdb
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 91 deletions
PC/VS8.0/_multiprocessing.vcproj
View file @ 60954356
......@@ -3,7 +3,7 @@
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"
......
PC/VS8.0/_sqlite3.vcproj
View file @ 60954356
......@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -417,7 +417,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......@@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/>
<Tool
......
PC/VS8.0/bdist_wininst.vcproj
View file @ 60954356
......@@ -55,7 +55,7 @@
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
......@@ -145,7 +145,7 @@
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
......
PC/VS8.0/pyd.vsprops
View file @ 60954356
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
......@@ -15,6 +15,11 @@
OutputFile="$(OutDir)\$(ProjectName).pyd"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/>
<Tool
Name="VCPostBuildEventTool"
......
PC/VS8.0/pyd_d.vsprops
View file @ 60954356
......@@ -19,6 +19,11 @@
LinkIncremental="1"
ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/>
<Tool
Name="VCPostBuildEventTool"
......
PC/VS8.0/pyproject.vsprops
View file @ 60954356
......@@ -50,7 +50,7 @@
/>
<UserMacro
Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-3.5.9"
Value="$(externalsDir)\sqlite-3.6.21"
/>
<UserMacro
Name="bz2Dir"
......@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-0.9.8g"
Value="$(externalsDir)\openssl-1.0.0a"
/>
<UserMacro
Name="tcltkDir"
......
PC/VS8.0/pythoncore.vcproj
View file @ 60954356
......@@ -702,10 +702,6 @@
RelativePath="..\..\Include\dictobject.h"
>
</File>
<File
RelativePath="..\..\Include\dtoa.h"
>
</File>
<File
RelativePath="..\..\Include\dynamic_annotations.h"
>
......@@ -846,6 +842,10 @@
RelativePath="..\..\Include\pyarena.h"
>
</File>
<File
RelativePath="..\..\Include\pycapsule.h"
>
</File>
<File
RelativePath="..\..\Include\pyctype.h"
>
......@@ -902,6 +902,10 @@
RelativePath="..\..\Include\pystrtod.h"
>
</File>
<File
RelativePath="..\..\Include\dtoa.h"
>
</File>
<File
RelativePath="..\..\Include\Python-ast.h"
>
......@@ -946,10 +950,6 @@
RelativePath="..\..\Include\sysmodule.h"
>
</File>
<File
RelativePath="..\..\Include\_time.h"
>
</File>
<File
RelativePath="..\..\Include\timefuncs.h"
>
......@@ -998,38 +998,6 @@
RelativePath="..\..\Modules\_csv.c"
>
</File>
<Filter
Name="_io"
>
<File
RelativePath="..\..\Modules\_io\fileio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bytesio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\stringio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bufferedio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\iobase.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
</Filter>
<File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
......@@ -1074,6 +1042,14 @@
RelativePath="..\..\Modules\_struct.c"
>
</File>
<File
RelativePath="..\..\Modules\_time.c"
>
</File>
<File
RelativePath="..\..\Modules\_time.h"
>
</File>
<File
RelativePath="..\..\Modules\_weakref.c"
>
......@@ -1174,10 +1150,6 @@
RelativePath="..\..\Modules\_threadmodule.c"
>
</File>
<File
RelativePath="..\..\Modules\_time.c"
>
</File>
<File
RelativePath="..\..\Modules\timemodule.c"
>
......@@ -1194,6 +1166,42 @@
RelativePath="..\..\Modules\zlibmodule.c"
>
</File>
<Filter
Name="_io"
>
<File
RelativePath="..\..\Modules\_io\fileio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bytesio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\stringio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bufferedio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\iobase.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.h"
>
</File>
</Filter>
<Filter
Name="zlib"
>
......@@ -1670,10 +1678,6 @@
RelativePath="..\..\Python\dynamic_annotations.c"
>
</File>
<File
RelativePath="..\..\Python\dtoa.c"
>
</File>
<File
RelativePath="..\..\Python\dynload_win.c"
>
......@@ -1786,6 +1790,10 @@
RelativePath="..\..\Python\pystrtod.c"
>
</File>
<File
RelativePath="..\..\Python\dtoa.c"
>
</File>
<File
RelativePath="..\..\Python\Python-ast.c"
>
......
PC/VS8.0/sqlite3.vcproj
View file @ 60954356
......@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0"
>
<Tool
......@@ -42,8 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -83,7 +82,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops;.\x64.vsprops"
CharacterSet="0"
>
<Tool
......@@ -104,8 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -145,7 +143,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -166,8 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -207,7 +204,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -229,8 +226,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -270,7 +266,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -291,8 +287,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories="&quot;..\..\..\sqlite-3.6.21&quot;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -332,7 +327,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -354,8 +349,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -394,7 +388,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -415,8 +409,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -456,7 +449,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
......@@ -478,8 +471,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
AdditionalIncludeDirectories=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -523,11 +515,11 @@
Name="Header Files"
>
<File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h"
RelativePath="..\..\..\sqlite-3.6.21\sqlite3.h"
>
</File>
<File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h"
RelativePath="..\..\..\sqlite-3.6.21\sqlite3ext.h"
>
</File>
</Filter>
......@@ -535,7 +527,7 @@
Name="Source Files"
>
<File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c"
RelativePath="..\..\..\sqlite-3.6.21\sqlite3.c"
>
</File>
</Filter>
......
PC/VS8.0/sqlite3.vsprops 0 → 100644
View file @ 60954356
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="sqlite3"
InheritedPropertySheets=".\pyproject.vsprops"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
WarningLevel="1"
/>
</VisualStudioPropertySheet>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7