bpo-27593: Updates Windows build to use information from git (#262) · pythoncapi/cpython@a0c07d2 · GitHub
Skip to content

Commit a0c07d2

Browse files
authored
bpo-27593: Updates Windows build to use information from git (python#262)
* bpo-27593: Updates Windows build to use information from git
1 parent 5c4b0d0 commit a0c07d2

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

PCbuild/build.bat

Lines changed: 4 additions & 4 deletions

PCbuild/pythoncore.vcxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -408,24 +408,24 @@
408408
</ImportGroup>
409409
<Target Name="_GetBuildInfo" BeforeTargets="PrepareForBuild">
410410
<PropertyGroup>
411-
<HG Condition="$(HG) == ''">hg</HG>
412-
<_HG>$(HG)</_HG>
413-
<_HG Condition="$(HG.Contains(` `))">"$(HG)"</_HG>
411+
<GIT Condition="$(GIT) == ''">git</GIT>
412+
<_GIT>$(GIT)</_GIT>
413+
<_GIT Condition="$(GIT.Contains(` `))">"$(GIT)"</_GIT>
414414
</PropertyGroup>
415-
<Message Text="Getting build info from $(_HG)" Importance="high" />
415+
<Message Text="Getting build info from $(_GIT)" Importance="high" />
416416
<MakeDir Directories="$(IntDir)" Condition="!Exists($(IntDir))" />
417-
<Exec Command="$(_HG) id -b &gt; &quot;$(IntDir)hgbranch.txt&quot;" ContinueOnError="true" />
418-
<Exec Command="$(_HG) id -i &gt; &quot;$(IntDir)hgversion.txt&quot;" ContinueOnError="true" />
419-
<Exec Command="$(_HG) id -t &gt; &quot;$(IntDir)hgtag.txt&quot;" ContinueOnError="true" />
417+
<Exec Command="$(_GIT) name-rev --name-only HEAD &gt; &quot;$(IntDir)gitbranch.txt&quot;" ContinueOnError="true" />
418+
<Exec Command="$(_GIT) rev-parse HEAD &gt; &quot;$(IntDir)gitversion.txt&quot;" ContinueOnError="true" />
419+
<Exec Command="$(_GIT) name-rev --tags --name id -t &gt; &quot;$(IntDir)gittag.txt&quot;" ContinueOnError="true" />
420420
<PropertyGroup>
421-
<HgBranch Condition="Exists('$(IntDir)hgbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgbranch.txt').Trim())</HgBranch>
422-
<HgVersion Condition="Exists('$(IntDir)hgversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgversion.txt').Trim())</HgVersion>
423-
<HgTag Condition="Exists('$(IntDir)hgtag.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgtag.txt').Trim())</HgTag>
421+
<GitBranch Condition="Exists('$(IntDir)gitbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitbranch.txt').Trim())</GitBranch>
422+
<GitVersion Condition="Exists('$(IntDir)gitversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitversion.txt').Trim())</GitVersion>
423+
<GitTag Condition="Exists('$(IntDir)gittag.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gittag.txt').Trim())</GitTag>
424424
</PropertyGroup>
425-
<Message Text="Building $(HgTag):$(HgVersion) $(HgBranch)" Importance="high" />
425+
<Message Text="Building $(GitTag):$(GitVersion) $(GitBranch)" Importance="high" />
426426
<ItemGroup>
427427
<ClCompile Include="..\Modules\getbuildinfo.c">
428-
<PreprocessorDefinitions>HGVERSION="$(HgVersion)";HGTAG="$(HgTag)";HGBRANCH="$(HgBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
428+
<PreprocessorDefinitions>GITVERSION="$(GitVersion)";GITTAG="$(GitTag)";GITBRANCH="$(GitBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
429429
</ClCompile>
430430
</ItemGroup>
431431
</Target>

Tools/msi/buildrelease.bat

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)