Skip to content

Commit 3591027

Browse files
author
christian.heimes
committed
Used vs9to8.py to port all VS9.0 changes to 8.0
Updated VS7.1 and VC6 project files git-svn-id: http://svn.python.org/projects/python/trunk@63685 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent e662ebc commit 3591027

22 files changed

Lines changed: 3147 additions & 109 deletions

‎PC/VC6/pythoncore.dsp‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PC/VS7.1/pythoncore.vcproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,9 @@
442442
<File
443443
RelativePath="..\..\Objects\bufferobject.c">
444444
</File>
445+
<File
446+
RelativePath="..\..\Objects\bytearrayobject.c">
447+
</File>
445448
<File
446449
RelativePath="..\..\Objects\bytesobject.c">
447450
</File>
@@ -763,9 +766,6 @@
763766
<File
764767
RelativePath="..\..\Objects\sliceobject.c">
765768
</File>
766-
<File
767-
RelativePath="..\..\Objects\stringobject.c">
768-
</File>
769769
<File
770770
RelativePath="..\..\Modules\stropmodule.c">
771771
</File>

‎PC/VS8.0/_bsddb.vcproj‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
/>
4343
<Tool
4444
Name="VCCLCompilerTool"
45-
AdditionalIncludeDirectories="$(bsddbDir)"
45+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
4646
/>
4747
<Tool
4848
Name="VCManagedResourceCompilerTool"
@@ -52,11 +52,9 @@
5252
/>
5353
<Tool
5454
Name="VCPreLinkEventTool"
55-
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;"
5655
/>
5756
<Tool
5857
Name="VCLinkerTool"
59-
AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
6058
BaseAddress="0x1e180000"
6159
/>
6260
<Tool
@@ -105,7 +103,7 @@
105103
/>
106104
<Tool
107105
Name="VCCLCompilerTool"
108-
AdditionalIncludeDirectories="$(bsddbDir)"
106+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
109107
/>
110108
<Tool
111109
Name="VCManagedResourceCompilerTool"
@@ -115,11 +113,11 @@
115113
/>
116114
<Tool
117115
Name="VCPreLinkEventTool"
118-
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;"
116+
CommandLine=""
119117
/>
120118
<Tool
121119
Name="VCLinkerTool"
122-
AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"
120+
AdditionalDependencies="$(bsddbDepLibs)"
123121
BaseAddress="0x1e180000"
124122
/>
125123
<Tool
@@ -168,7 +166,7 @@
168166
/>
169167
<Tool
170168
Name="VCCLCompilerTool"
171-
AdditionalIncludeDirectories="$(bsddbDir)"
169+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
172170
/>
173171
<Tool
174172
Name="VCManagedResourceCompilerTool"
@@ -178,11 +176,10 @@
178176
/>
179177
<Tool
180178
Name="VCPreLinkEventTool"
181-
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;"
182179
/>
183180
<Tool
184181
Name="VCLinkerTool"
185-
AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
182+
AdditionalDependencies="$(bsddbDepLibs)"
186183
BaseAddress="0x1e180000"
187184
/>
188185
<Tool
@@ -232,7 +229,7 @@
232229
/>
233230
<Tool
234231
Name="VCCLCompilerTool"
235-
AdditionalIncludeDirectories="$(bsddbDir)"
232+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
236233
/>
237234
<Tool
238235
Name="VCManagedResourceCompilerTool"
@@ -242,11 +239,11 @@
242239
/>
243240
<Tool
244241
Name="VCPreLinkEventTool"
245-
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;"
242+
CommandLine=""
246243
/>
247244
<Tool
248245
Name="VCLinkerTool"
249-
AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
246+
AdditionalDependencies="$(bsddbDepLibs)"
250247
BaseAddress="0x1e180000"
251248
/>
252249
<Tool
@@ -295,7 +292,7 @@
295292
/>
296293
<Tool
297294
Name="VCCLCompilerTool"
298-
AdditionalIncludeDirectories="$(bsddbDir)"
295+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
299296
/>
300297
<Tool
301298
Name="VCManagedResourceCompilerTool"
@@ -305,11 +302,10 @@
305302
/>
306303
<Tool
307304
Name="VCPreLinkEventTool"
308-
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;"
309305
/>
310306
<Tool
311307
Name="VCLinkerTool"
312-
AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
308+
AdditionalDependencies="$(bsddbDepLibs)"
313309
BaseAddress="0x1e180000"
314310
/>
315311
<Tool
@@ -359,7 +355,7 @@
359355
/>
360356
<Tool
361357
Name="VCCLCompilerTool"
362-
AdditionalIncludeDirectories="$(bsddbDir)"
358+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
363359
/>
364360
<Tool
365361
Name="VCManagedResourceCompilerTool"
@@ -369,11 +365,10 @@
369365
/>
370366
<Tool
371367
Name="VCPreLinkEventTool"
372-
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;"
373368
/>
374369
<Tool
375370
Name="VCLinkerTool"
376-
AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
371+
AdditionalDependencies="$(bsddbDepLibs)"
377372
BaseAddress="0x1e180000"
378373
TargetMachine="17"
379374
/>
@@ -423,7 +418,7 @@
423418
/>
424419
<Tool
425420
Name="VCCLCompilerTool"
426-
AdditionalIncludeDirectories="$(bsddbDir)"
421+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
427422
/>
428423
<Tool
429424
Name="VCManagedResourceCompilerTool"
@@ -433,11 +428,10 @@
433428
/>
434429
<Tool
435430
Name="VCPreLinkEventTool"
436-
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;"
437431
/>
438432
<Tool
439433
Name="VCLinkerTool"
440-
AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
434+
AdditionalDependencies="$(bsddbDepLibs)"
441435
BaseAddress="0x1e180000"
442436
/>
443437
<Tool
@@ -487,7 +481,7 @@
487481
/>
488482
<Tool
489483
Name="VCCLCompilerTool"
490-
AdditionalIncludeDirectories="$(bsddbDir)"
484+
AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.."
491485
/>
492486
<Tool
493487
Name="VCManagedResourceCompilerTool"
@@ -497,11 +491,10 @@
497491
/>
498492
<Tool
499493
Name="VCPreLinkEventTool"
500-
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;"
501494
/>
502495
<Tool
503496
Name="VCLinkerTool"
504-
AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
497+
AdditionalDependencies="$(bsddbDepLibs)"
505498
BaseAddress="0x1e180000"
506499
TargetMachine="17"
507500
/>

0 commit comments

Comments
 (0)