diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-04-22 17:38:05 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-04-28 23:52:36 +0100 |
| commit | 95f53461c2c42490d12acd41463b86f0056e6f40 (patch) | |
| tree | a8066e0333a21ba1d47b89434061468a364e8689 /windows | |
| parent | d11317bcab8bfa9c702d0c708aa95381aad4fd84 (diff) | |
py: Replace py-version.sh with makeversionhdr.py, written in Python.
Also rename py-version.h to mpversion.h for consistency with mpconfig.h.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/msvc/genhdr.targets | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/windows/msvc/genhdr.targets b/windows/msvc/genhdr.targets index 5d8839416..90054c0b6 100644 --- a/windows/msvc/genhdr.targets +++ b/windows/msvc/genhdr.targets @@ -3,21 +3,21 @@ <Import Project="env.props" Condition="$(PyEnvIncluded)!=True"/> - <Target Name="GenerateHeaders" DependsOnTargets="MakeQstrData;MakeVersionHeader"> + <!--Generate qstrdefs.h and mpversion.h similar to what is done in py/py.mk--> + <Target Name="GenerateHeaders" DependsOnTargets="MakeQstrData;MakeVersionHdr"> </Target> <PropertyGroup> <DestDir>$(PyBuildDir)genhdr\</DestDir> + <PySrcDir>$(PyBaseDir)py\</PySrcDir> </PropertyGroup> <Target Name="MakeDestDir"> <MakeDir Directories="$(DestDir)"/> </Target> - <!--see py/py.mk under #qstr data--> <Target Name="MakeQstrData" DependsOnTargets="MakeDestDir"> <PropertyGroup> - <PySrcDir>$(PyBaseDir)py\</PySrcDir> <PreProc>$(DestDir)qstrdefs.preprocessed.h</PreProc> <QstrDefs>$(PyBaseDir)unix\qstrdefsport.h</QstrDefs> <DestFile>$(DestDir)qstrdefs.generated.h</DestFile> @@ -31,49 +31,12 @@ <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/> </Target> - <!--see py/py-version.sh--> - <Target Name="GetGitState"> - <Exec Command="git describe --dirty --always" ConsoleToMSBuild="true" IgnoreExitCode="true"> - <Output TaskParameter="ConsoleOutput" PropertyName="GitTag" /> - </Exec> - <Exec Command="git rev-parse --short HEAD 2>NUL || echo unknown" ConsoleToMSBuild="true" IgnoreExitCode="true"> - <Output TaskParameter="ConsoleOutput" PropertyName="GitHash" /> - </Exec> - <Exec Command="git diff --no-ext-diff --quiet --exit-code 2>NUL || echo 0" ConsoleToMSBuild="true" IgnoreExitCode="true"> - <Output TaskParameter="ConsoleOutput" PropertyName="GitFilesAreClean" /> - </Exec> - <Exec Command="git diff-index --cached --quiet HEAD -- 2>NUL || echo 0" ConsoleToMSBuild="true" IgnoreExitCode="true" Condition="'$(GitFilesAreClean)'==''"> - <Output TaskParameter="ConsoleOutput" PropertyName="GitFilesAreClean" /> - </Exec> - </Target> - - <Target Name="MakeVersionHeader" DependsOnTargets="MakeDestDir;GetGitState"> - <PropertyGroup Condition="'$(GitFilesAreClean)'=='0'"> - <GitHash>$(GitHash)-dirty</GitHash> - </PropertyGroup> + <Target Name="MakeVersionHdr" DependsOnTargets="MakeDestDir"> <PropertyGroup> - <DestFile>$(DestDir)py-version.h</DestFile> + <DestFile>$(DestDir)mpversion.h</DestFile> <TmpFile>$(DestFile).tmp</TmpFile> </PropertyGroup> - <PropertyGroup> - <Ver>$([System.Text.RegularExpressions.Regex]::Match($(GitTag), `^v[0-9\.]{5}`))</Ver> - <Ver Condition="'$(Ver)'==''">v0.0.1</Ver> - <Ver>$(Ver.Remove(0, 1))</Ver> - <VerMajor>$(Ver.Split(`.`)[0])</VerMajor> - <VerMinor>$(Ver.Split(`.`)[1])</VerMinor> - <VerMicro>$(Ver.Split(`.`)[2])</VerMicro> - </PropertyGroup> - <ItemGroup> - <Lines Include="// This file was generated by $([System.IO.Path]::GetFileName(`$(MsBuildThisFile)`))"/> - <Lines Include="#define MICROPY_GIT_TAG "$(GitTag)""/> - <Lines Include="#define MICROPY_GIT_HASH "$(GitHash)""/> - <Lines Include="#define MICROPY_BUILD_DATE "$([System.DateTime]::Now.ToString(`yyyy-MM-dd`))""/> - <Lines Include="#define MICROPY_VERSION_MAJOR ($(VerMajor))"/> - <Lines Include="#define MICROPY_VERSION_MINOR ($(VerMinor))"/> - <Lines Include="#define MICROPY_VERSION_MICRO ($(VerMicro))"/> - <Lines Include="#define MICROPY_VERSION_STRING "$(Ver)""/> - </ItemGroup> - <WriteLinesToFile Lines="@(Lines)" File="$(TmpFile)" Overwrite="true"/> + <Exec Command="python $(PySrcDir)makeversionhdr.py $(TmpFile)"/> <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/> </Target> |