Skip to content

Commit 18a31d9

Browse files
author
martin.v.loewis
committed
Patch #1307806: Use project defaults where possible
git-svn-id: http://svn.python.org/projects/python/trunk@41897 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 5162bfb commit 18a31d9

14 files changed

Lines changed: 71 additions & 1048 deletions

‎PCbuild/_bsddb.vcproj‎

Lines changed: 6 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
2525
RuntimeLibrary="3"
2626
UsePrecompiledHeader="2"
27-
PrecompiledHeaderFile=".\x86-temp-debug\_bsddb/_bsddb.pch"
28-
AssemblerListingLocation=".\x86-temp-debug\_bsddb/"
29-
ObjectFile=".\x86-temp-debug\_bsddb/"
30-
ProgramDataBaseFileName=".\x86-temp-debug\_bsddb/"
3127
WarningLevel="3"
3228
SuppressStartupBanner="TRUE"
3329
DebugInformationFormat="3"
@@ -48,23 +44,15 @@
4844
ImportLibrary=".\./_bsddb_d.lib"
4945
TargetMachine="1"/>
5046
<Tool
51-
Name="VCMIDLTool"
52-
PreprocessorDefinitions="_DEBUG"
53-
MkTypLibCompatible="TRUE"
54-
SuppressStartupBanner="TRUE"
55-
TargetEnvironment="1"
56-
TypeLibraryName=".\./_bsddb.tlb"
57-
HeaderFileName=""/>
47+
Name="VCMIDLTool"/>
5848
<Tool
5949
Name="VCPostBuildEventTool"/>
6050
<Tool
6151
Name="VCPreBuildEventTool"/>
6252
<Tool
6353
Name="VCPreLinkEventTool"/>
6454
<Tool
65-
Name="VCResourceCompilerTool"
66-
PreprocessorDefinitions="_DEBUG"
67-
Culture="1033"/>
55+
Name="VCResourceCompilerTool"/>
6856
<Tool
6957
Name="VCWebServiceProxyGeneratorTool"/>
7058
<Tool
@@ -93,10 +81,6 @@
9381
RuntimeLibrary="2"
9482
EnableFunctionLevelLinking="TRUE"
9583
UsePrecompiledHeader="2"
96-
PrecompiledHeaderFile=".\x86-temp-release\_bsddb/_bsddb.pch"
97-
AssemblerListingLocation=".\x86-temp-release\_bsddb/"
98-
ObjectFile=".\x86-temp-release\_bsddb/"
99-
ProgramDataBaseFileName=".\x86-temp-release\_bsddb/"
10084
WarningLevel="3"
10185
SuppressStartupBanner="TRUE"
10286
DebugInformationFormat="3"
@@ -117,23 +101,15 @@
117101
ImportLibrary=".\./_bsddb.lib"
118102
TargetMachine="1"/>
119103
<Tool
120-
Name="VCMIDLTool"
121-
PreprocessorDefinitions="NDEBUG"
122-
MkTypLibCompatible="TRUE"
123-
SuppressStartupBanner="TRUE"
124-
TargetEnvironment="1"
125-
TypeLibraryName=".\./_bsddb.tlb"
126-
HeaderFileName=""/>
104+
Name="VCMIDLTool"/>
127105
<Tool
128106
Name="VCPostBuildEventTool"/>
129107
<Tool
130108
Name="VCPreBuildEventTool"/>
131109
<Tool
132110
Name="VCPreLinkEventTool"/>
133111
<Tool
134-
Name="VCResourceCompilerTool"
135-
PreprocessorDefinitions="NDEBUG"
136-
Culture="1033"/>
112+
Name="VCResourceCompilerTool"/>
137113
<Tool
138114
Name="VCWebServiceProxyGeneratorTool"/>
139115
<Tool
@@ -165,10 +141,6 @@
165141
BufferSecurityCheck="FALSE"
166142
EnableFunctionLevelLinking="TRUE"
167143
UsePrecompiledHeader="2"
168-
PrecompiledHeaderFile=".\ia64-temp-release\_bsddb/_bsddb.pch"
169-
AssemblerListingLocation=".\ia64-temp-release\_bsddb/"
170-
ObjectFile=".\ia64-temp-release\_bsddb/"
171-
ProgramDataBaseFileName=".\ia64-temp-release\_bsddb/"
172144
WarningLevel="3"
173145
SuppressStartupBanner="TRUE"
174146
Detect64BitPortabilityProblems="TRUE"
@@ -191,23 +163,15 @@
191163
ImportLibrary=".\./_bsddb.lib"
192164
TargetMachine="0"/>
193165
<Tool
194-
Name="VCMIDLTool"
195-
PreprocessorDefinitions="NDEBUG"
196-
MkTypLibCompatible="TRUE"
197-
SuppressStartupBanner="TRUE"
198-
TargetEnvironment="1"
199-
TypeLibraryName=".\./_bsddb.tlb"
200-
HeaderFileName=""/>
166+
Name="VCMIDLTool"/>
201167
<Tool
202168
Name="VCPostBuildEventTool"/>
203169
<Tool
204170
Name="VCPreBuildEventTool"/>
205171
<Tool
206172
Name="VCPreLinkEventTool"/>
207173
<Tool
208-
Name="VCResourceCompilerTool"
209-
PreprocessorDefinitions="NDEBUG"
210-
Culture="1033"/>
174+
Name="VCResourceCompilerTool"/>
211175
<Tool
212176
Name="VCWebServiceProxyGeneratorTool"/>
213177
<Tool
@@ -225,30 +189,6 @@
225189
<Files>
226190
<File
227191
RelativePath="..\Modules\_bsddb.c">
228-
<FileConfiguration
229-
Name="Debug|Win32">
230-
<Tool
231-
Name="VCCLCompilerTool"
232-
Optimization="0"
233-
AdditionalIncludeDirectories=""
234-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
235-
</FileConfiguration>
236-
<FileConfiguration
237-
Name="Release|Win32">
238-
<Tool
239-
Name="VCCLCompilerTool"
240-
Optimization="2"
241-
AdditionalIncludeDirectories=""
242-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
243-
</FileConfiguration>
244-
<FileConfiguration
245-
Name="ReleaseItanium|Win32">
246-
<Tool
247-
Name="VCCLCompilerTool"
248-
Optimization="2"
249-
AdditionalIncludeDirectories=""
250-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
251-
</FileConfiguration>
252192
</File>
253193
</Files>
254194
<Globals>

‎PCbuild/_socket.vcproj‎

Lines changed: 6 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
2525
RuntimeLibrary="3"
2626
UsePrecompiledHeader="2"
27-
PrecompiledHeaderFile=".\x86-temp-debug\_socket/_socket.pch"
28-
AssemblerListingLocation=".\x86-temp-debug\_socket/"
29-
ObjectFile=".\x86-temp-debug\_socket/"
30-
ProgramDataBaseFileName=".\x86-temp-debug\_socket/"
3127
WarningLevel="3"
3228
SuppressStartupBanner="TRUE"
3329
DebugInformationFormat="3"
@@ -47,23 +43,15 @@
4743
ImportLibrary=".\./_socket_d.lib"
4844
TargetMachine="1"/>
4945
<Tool
50-
Name="VCMIDLTool"
51-
PreprocessorDefinitions="_DEBUG"
52-
MkTypLibCompatible="TRUE"
53-
SuppressStartupBanner="TRUE"
54-
TargetEnvironment="1"
55-
TypeLibraryName=".\./_socket.tlb"
56-
HeaderFileName=""/>
46+
Name="VCMIDLTool"/>
5747
<Tool
5848
Name="VCPostBuildEventTool"/>
5949
<Tool
6050
Name="VCPreBuildEventTool"/>
6151
<Tool
6252
Name="VCPreLinkEventTool"/>
6353
<Tool
64-
Name="VCResourceCompilerTool"
65-
PreprocessorDefinitions="_DEBUG"
66-
Culture="1033"/>
54+
Name="VCResourceCompilerTool"/>
6755
<Tool
6856
Name="VCWebServiceProxyGeneratorTool"/>
6957
<Tool
@@ -92,10 +80,6 @@
9280
RuntimeLibrary="2"
9381
EnableFunctionLevelLinking="TRUE"
9482
UsePrecompiledHeader="2"
95-
PrecompiledHeaderFile=".\x86-temp-release\_socket/_socket.pch"
96-
AssemblerListingLocation=".\x86-temp-release\_socket/"
97-
ObjectFile=".\x86-temp-release\_socket/"
98-
ProgramDataBaseFileName=".\x86-temp-release\_socket/"
9983
WarningLevel="3"
10084
SuppressStartupBanner="TRUE"
10185
DebugInformationFormat="3"
@@ -115,23 +99,15 @@
11599
ImportLibrary=".\./_socket.lib"
116100
TargetMachine="1"/>
117101
<Tool
118-
Name="VCMIDLTool"
119-
PreprocessorDefinitions="NDEBUG"
120-
MkTypLibCompatible="TRUE"
121-
SuppressStartupBanner="TRUE"
122-
TargetEnvironment="1"
123-
TypeLibraryName=".\./_socket.tlb"
124-
HeaderFileName=""/>
102+
Name="VCMIDLTool"/>
125103
<Tool
126104
Name="VCPostBuildEventTool"/>
127105
<Tool
128106
Name="VCPreBuildEventTool"/>
129107
<Tool
130108
Name="VCPreLinkEventTool"/>
131109
<Tool
132-
Name="VCResourceCompilerTool"
133-
PreprocessorDefinitions="NDEBUG"
134-
Culture="1033"/>
110+
Name="VCResourceCompilerTool"/>
135111
<Tool
136112
Name="VCWebServiceProxyGeneratorTool"/>
137113
<Tool
@@ -163,10 +139,6 @@
163139
BufferSecurityCheck="FALSE"
164140
EnableFunctionLevelLinking="TRUE"
165141
UsePrecompiledHeader="2"
166-
PrecompiledHeaderFile=".\ia64-temp-release\_socket/_socket.pch"
167-
AssemblerListingLocation=".\ia64-temp-release\_socket/"
168-
ObjectFile=".\ia64-temp-release\_socket/"
169-
ProgramDataBaseFileName=".\ia64-temp-release\_socket/"
170142
WarningLevel="3"
171143
SuppressStartupBanner="TRUE"
172144
Detect64BitPortabilityProblems="TRUE"
@@ -188,23 +160,15 @@
188160
ImportLibrary=".\./_socket.lib"
189161
TargetMachine="0"/>
190162
<Tool
191-
Name="VCMIDLTool"
192-
PreprocessorDefinitions="NDEBUG"
193-
MkTypLibCompatible="TRUE"
194-
SuppressStartupBanner="TRUE"
195-
TargetEnvironment="1"
196-
TypeLibraryName=".\./_socket.tlb"
197-
HeaderFileName=""/>
163+
Name="VCMIDLTool"/>
198164
<Tool
199165
Name="VCPostBuildEventTool"/>
200166
<Tool
201167
Name="VCPreBuildEventTool"/>
202168
<Tool
203169
Name="VCPreLinkEventTool"/>
204170
<Tool
205-
Name="VCResourceCompilerTool"
206-
PreprocessorDefinitions="NDEBUG"
207-
Culture="1033"/>
171+
Name="VCResourceCompilerTool"/>
208172
<Tool
209173
Name="VCWebServiceProxyGeneratorTool"/>
210174
<Tool
@@ -222,30 +186,6 @@
222186
<Files>
223187
<File
224188
RelativePath="..\Modules\socketmodule.c">
225-
<FileConfiguration
226-
Name="Debug|Win32">
227-
<Tool
228-
Name="VCCLCompilerTool"
229-
Optimization="0"
230-
AdditionalIncludeDirectories=""
231-
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
232-
</FileConfiguration>
233-
<FileConfiguration
234-
Name="Release|Win32">
235-
<Tool
236-
Name="VCCLCompilerTool"
237-
Optimization="2"
238-
AdditionalIncludeDirectories=""
239-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
240-
</FileConfiguration>
241-
<FileConfiguration
242-
Name="ReleaseItanium|Win32">
243-
<Tool
244-
Name="VCCLCompilerTool"
245-
Optimization="2"
246-
AdditionalIncludeDirectories=""
247-
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;$(NoInherit)"/>
248-
</FileConfiguration>
249189
</File>
250190
</Files>
251191
<Globals>

0 commit comments

Comments
 (0)