Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d078e40

Browse files
loewisloewis
committed
Generate getbuildinfo.o each time the linker is invoked;
try to generate SVNVERSION information if subwcrev.exe can be found.
1 parent d790a7b commit d078e40

4 files changed

Lines changed: 151 additions & 12 deletions

File tree

‎Modules/getbuildinfo.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
#endif
2121
#endif
2222

23+
#ifdef SUBWCREV
24+
#define SVNVERSION "$WCRANGE$$WCMODS?M:$"
25+
#endif
26+
2327
const char *
2428
Py_GetBuildInfo(void)
2529
{

‎PCbuild/make_buildinfo.vcproj‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="windows-1250"?>
2+
<VisualStudioProject
3+
ProjectType="Visual C++"
4+
Version="7.10"
5+
Name="make_buildinfo"
6+
ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
7+
Keyword="Win32Proj">
8+
<Platforms>
9+
<Platform
10+
Name="Win32"/>
11+
</Platforms>
12+
<Configurations>
13+
<Configuration
14+
Name="Debug|Win32"
15+
OutputDirectory="."
16+
IntermediateDirectory=".\x86-temp-release\make_buildinfo"
17+
ConfigurationType="1"
18+
CharacterSet="2">
19+
<Tool
20+
Name="VCCLCompilerTool"
21+
Optimization="0"
22+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
23+
MinimalRebuild="TRUE"
24+
BasicRuntimeChecks="3"
25+
RuntimeLibrary="5"
26+
UsePrecompiledHeader="0"
27+
WarningLevel="3"
28+
Detect64BitPortabilityProblems="TRUE"
29+
DebugInformationFormat="4"/>
30+
<Tool
31+
Name="VCCustomBuildTool"/>
32+
<Tool
33+
Name="VCLinkerTool"
34+
OutputFile="$(OutDir)/make_buildinfo.exe"
35+
LinkIncremental="2"
36+
GenerateDebugInformation="TRUE"
37+
ProgramDatabaseFile="$(OutDir)/make_buildinfo.pdb"
38+
SubSystem="1"
39+
TargetMachine="1"/>
40+
<Tool
41+
Name="VCMIDLTool"/>
42+
<Tool
43+
Name="VCPostBuildEventTool"/>
44+
<Tool
45+
Name="VCPreBuildEventTool"/>
46+
<Tool
47+
Name="VCPreLinkEventTool"/>
48+
<Tool
49+
Name="VCResourceCompilerTool"/>
50+
<Tool
51+
Name="VCWebServiceProxyGeneratorTool"/>
52+
<Tool
53+
Name="VCXMLDataGeneratorTool"/>
54+
<Tool
55+
Name="VCWebDeploymentTool"/>
56+
<Tool
57+
Name="VCManagedWrapperGeneratorTool"/>
58+
<Tool
59+
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
60+
</Configuration>
61+
<Configuration
62+
Name="Release|Win32"
63+
OutputDirectory="."
64+
IntermediateDirectory=".\x86-temp-release\make_buildinfo"
65+
ConfigurationType="1"
66+
CharacterSet="2">
67+
<Tool
68+
Name="VCCLCompilerTool"
69+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
70+
RuntimeLibrary="4"
71+
UsePrecompiledHeader="0"
72+
WarningLevel="3"
73+
Detect64BitPortabilityProblems="TRUE"
74+
DebugInformationFormat="3"/>
75+
<Tool
76+
Name="VCCustomBuildTool"/>
77+
<Tool
78+
Name="VCLinkerTool"
79+
OutputFile="$(OutDir)/make_buildinfo.exe"
80+
LinkIncremental="1"
81+
GenerateDebugInformation="TRUE"
82+
SubSystem="1"
83+
OptimizeReferences="2"
84+
EnableCOMDATFolding="2"
85+
TargetMachine="1"/>
86+
<Tool
87+
Name="VCMIDLTool"/>
88+
<Tool
89+
Name="VCPostBuildEventTool"/>
90+
<Tool
91+
Name="VCPreBuildEventTool"/>
92+
<Tool
93+
Name="VCPreLinkEventTool"/>
94+
<Tool
95+
Name="VCResourceCompilerTool"/>
96+
<Tool
97+
Name="VCWebServiceProxyGeneratorTool"/>
98+
<Tool
99+
Name="VCXMLDataGeneratorTool"/>
100+
<Tool
101+
Name="VCWebDeploymentTool"/>
102+
<Tool
103+
Name="VCManagedWrapperGeneratorTool"/>
104+
<Tool
105+
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
106+
</Configuration>
107+
</Configurations>
108+
<References>
109+
</References>
110+
<Files>
111+
<Filter
112+
Name="Source Files"
113+
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
114+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
115+
<File
116+
RelativePath=".\make_buildinfo.c">
117+
</File>
118+
</Filter>
119+
</Files>
120+
<Globals>
121+
</Globals>
122+
</VisualStudioProject>

‎PCbuild/pcbuild.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ EndProject
4848
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
4949
ProjectSection(ProjectDependencies) = postProject
5050
{F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}
51+
{C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
5152
EndProjectSection
5253
EndProject
5354
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
@@ -79,6 +80,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtre
7980
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
8081
EndProjectSection
8182
EndProject
83+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
84+
ProjectSection(ProjectDependencies) = postProject
85+
EndProjectSection
86+
EndProject
8287
Global
8388
GlobalSection(SolutionConfiguration) = preSolution
8489
Debug = Debug
@@ -181,8 +186,15 @@ Global
181186
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release.Build.0 = Release|Win32
182187
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
183188
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
189+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug.ActiveCfg = Debug|Win32
190+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug.Build.0 = Debug|Win32
191+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release.ActiveCfg = Release|Win32
192+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release.Build.0 = Release|Win32
193+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium.ActiveCfg = Release|Win32
194+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.ReleaseItanium.Build.0 = Release|Win32
184195
EndGlobalSection
185196
GlobalSection(SolutionItems) = postSolution
197+
..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c
186198
readme.txt = readme.txt
187199
EndGlobalSection
188200
GlobalSection(ExtensibilityGlobals) = postSolution

‎PCbuild/pythoncore.vcproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
Version="7.10"
55
Name="pythoncore"
66
ProjectGUID="{7AFA1F0B-A8A1-455A-A832-BF263404BBEF}"
7+
RootNamespace="pythoncore"
78
SccProjectName="pythoncore"
89
SccLocalPath="..">
910
<Platforms>
@@ -37,6 +38,7 @@
3738
Name="VCCustomBuildTool"/>
3839
<Tool
3940
Name="VCLinkerTool"
41+
AdditionalDependencies="getbuildinfo.o"
4042
OutputFile="./python25.dll"
4143
LinkIncremental="1"
4244
SuppressStartupBanner="TRUE"
@@ -54,7 +56,9 @@
5456
<Tool
5557
Name="VCPreBuildEventTool"/>
5658
<Tool
57-
Name="VCPreLinkEventTool"/>
59+
Name="VCPreLinkEventTool"
60+
Description="generate buildinfo"
61+
CommandLine="make_buildinfo.exe ${ConfigurationName}"/>
5862
<Tool
5963
Name="VCResourceCompilerTool"
6064
PreprocessorDefinitions="NDEBUG"
@@ -94,6 +98,7 @@
9498
Name="VCCustomBuildTool"/>
9599
<Tool
96100
Name="VCLinkerTool"
101+
AdditionalDependencies="getbuildinfo.o"
97102
OutputFile="./python25_d.dll"
98103
LinkIncremental="1"
99104
SuppressStartupBanner="TRUE"
@@ -111,7 +116,9 @@
111116
<Tool
112117
Name="VCPreBuildEventTool"/>
113118
<Tool
114-
Name="VCPreLinkEventTool"/>
119+
Name="VCPreLinkEventTool"
120+
Description="generate buildinfo"
121+
CommandLine="make_buildinfo.exe $(ConfigurationName)"/>
115122
<Tool
116123
Name="VCResourceCompilerTool"
117124
PreprocessorDefinitions="_DEBUG"
@@ -158,6 +165,7 @@
158165
<Tool
159166
Name="VCLinkerTool"
160167
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
168+
AdditionalDependencies="getbuildinfo.o"
161169
OutputFile="./python25.dll"
162170
LinkIncremental="1"
163171
SuppressStartupBanner="FALSE"
@@ -175,7 +183,9 @@
175183
<Tool
176184
Name="VCPreBuildEventTool"/>
177185
<Tool
178-
Name="VCPreLinkEventTool"/>
186+
Name="VCPreLinkEventTool"
187+
Description="generate buildinfo"
188+
CommandLine="make_buildinfo.exe ${ConfigurationName}"/>
179189
<Tool
180190
Name="VCResourceCompilerTool"
181191
PreprocessorDefinitions="NDEBUG"
@@ -443,15 +453,6 @@
443453
<File
444454
RelativePath="..\Python\getargs.c">
445455
</File>
446-
<File
447-
RelativePath="..\Modules\getbuildinfo.c">
448-
<FileConfiguration
449-
Name="Release|Win32">
450-
<Tool
451-
Name="VCCLCompilerTool"
452-
PreprocessorDefinitions="BUILD=\&quot;60\&quot;"/>
453-
</FileConfiguration>
454-
</File>
455456
<File
456457
RelativePath="..\Python\getcompiler.c">
457458
</File>

0 commit comments

Comments
 (0)