diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-03-04 05:20:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-04 05:20:37 (GMT) |
| commit | a0c07d2edd345d2867f97ac31822c9544f9cbcf0 (patch) | |
| tree | ee1449a5076df1ec37c30ed956b96e17f29a0f6e | |
| parent | 5c4b0d063aba0a68c325073f5f312a2c9f40d178 (diff) | |
| download | cpython-a0c07d2edd345d2867f97ac31822c9544f9cbcf0.zip cpython-a0c07d2edd345d2867f97ac31822c9544f9cbcf0.tar.gz cpython-a0c07d2edd345d2867f97ac31822c9544f9cbcf0.tar.bz2 | |
bpo-27593: Updates Windows build to use information from git (#262)
* bpo-27593: Updates Windows build to use information from git
| -rw-r--r-- | PCbuild/build.bat | 8 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 24 | ||||
| -rw-r--r-- | Tools/msi/buildrelease.bat | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 70ab340..f7f2858 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -105,9 +105,9 @@ if "%platf%"=="x64" ( )
)
-if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
-if exist "%HG%" set HGProperty=/p:HG="%HG%"
-if not exist "%HG%" echo Cannot find Mercurial on PATH & set HGProperty=
+if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc"
+if exist "%GIT%" set GITProperty=/p:GIT="%GIT%"
+if not exist "%GIT%" echo Cannot find Git on PATH & set GITProperty=
rem Setup the environment
call "%dir%env.bat" %vs_platf% >nul
@@ -145,7 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^ /p:Configuration=%conf% /p:Platform=%platf%^
/p:IncludeExternals=%IncludeExternals%^
/p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
- /p:UseTestMarker=%UseTestMarker% %HGProperty%^
+ /p:UseTestMarker=%UseTestMarker% %GITProperty%^
%1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index c18c174..e373a91 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -408,24 +408,24 @@ </ImportGroup> <Target Name="_GetBuildInfo" BeforeTargets="PrepareForBuild"> <PropertyGroup> - <HG Condition="$(HG) == ''">hg</HG> - <_HG>$(HG)</_HG> - <_HG Condition="$(HG.Contains(` `))">"$(HG)"</_HG> + <GIT Condition="$(GIT) == ''">git</GIT> + <_GIT>$(GIT)</_GIT> + <_GIT Condition="$(GIT.Contains(` `))">"$(GIT)"</_GIT> </PropertyGroup> - <Message Text="Getting build info from $(_HG)" Importance="high" /> + <Message Text="Getting build info from $(_GIT)" Importance="high" /> <MakeDir Directories="$(IntDir)" Condition="!Exists($(IntDir))" /> - <Exec Command="$(_HG) id -b > "$(IntDir)hgbranch.txt"" ContinueOnError="true" /> - <Exec Command="$(_HG) id -i > "$(IntDir)hgversion.txt"" ContinueOnError="true" /> - <Exec Command="$(_HG) id -t > "$(IntDir)hgtag.txt"" ContinueOnError="true" /> + <Exec Command="$(_GIT) name-rev --name-only HEAD > "$(IntDir)gitbranch.txt"" ContinueOnError="true" /> + <Exec Command="$(_GIT) rev-parse HEAD > "$(IntDir)gitversion.txt"" ContinueOnError="true" /> + <Exec Command="$(_GIT) name-rev --tags --name id -t > "$(IntDir)gittag.txt"" ContinueOnError="true" /> <PropertyGroup> - <HgBranch Condition="Exists('$(IntDir)hgbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgbranch.txt').Trim())</HgBranch> - <HgVersion Condition="Exists('$(IntDir)hgversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgversion.txt').Trim())</HgVersion> - <HgTag Condition="Exists('$(IntDir)hgtag.txt')">$([System.IO.File]::ReadAllText('$(IntDir)hgtag.txt').Trim())</HgTag> + <GitBranch Condition="Exists('$(IntDir)gitbranch.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitbranch.txt').Trim())</GitBranch> + <GitVersion Condition="Exists('$(IntDir)gitversion.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gitversion.txt').Trim())</GitVersion> + <GitTag Condition="Exists('$(IntDir)gittag.txt')">$([System.IO.File]::ReadAllText('$(IntDir)gittag.txt').Trim())</GitTag> </PropertyGroup> - <Message Text="Building $(HgTag):$(HgVersion) $(HgBranch)" Importance="high" /> + <Message Text="Building $(GitTag):$(GitVersion) $(GitBranch)" Importance="high" /> <ItemGroup> <ClCompile Include="..\Modules\getbuildinfo.c"> - <PreprocessorDefinitions>HGVERSION="$(HgVersion)";HGTAG="$(HgTag)";HGBRANCH="$(HgBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>GITVERSION="$(GitVersion)";GITTAG="$(GitTag)";GITBRANCH="$(GitBranch)";%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemGroup> </Target> diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index d144c2c..4247f77 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -65,8 +65,8 @@ if "%1" NEQ "" echo Invalid option: "%1" && exit /B 1 if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
-if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
-if not exist "%HG%" echo Cannot find Mercurial on PATH && exit /B 1
+if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc"
+if not exist "%GIT%" echo Cannot find Git on PATH && exit /B 1
call "%D%get_externals.bat"
|