mirror of https://github.com/OpenRCT2/OpenRCT2.git
Add `git describe` support for AppVeyor builds
This commit is contained in:
parent
56250b43ab
commit
314707d67a
|
@ -5,6 +5,7 @@
|
|||
- GIT_TAG
|
||||
- GIT_BRANCH
|
||||
- GIT_COMMIT_SHA1
|
||||
- GIT_DESCRIBE
|
||||
- SIGN_PASSWORD
|
||||
- OPENRCT2_ORG_TOKEN
|
||||
- NO_NSIS: set to true to prevent the NSIS installer building
|
||||
|
@ -28,6 +29,7 @@
|
|||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_BRANCH)'!=''">/D "OPENRCT2_BRANCH=\"$(GIT_BRANCH)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1)'!=''">/D "OPENRCT2_COMMIT_SHA1=\"$(GIT_COMMIT_SHA1)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">/D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(GIT_COMMIT_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_DESCRIBE)'!=''">/D "OPENRCT2_VERSION_TAG=\"$(GIT_DESCRIBE)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
|
||||
<RootDir>$(MsBuildThisFileDirectory)</RootDir>
|
||||
<DistDir>$(RootDir)distribution\</DistDir>
|
||||
|
@ -161,6 +163,7 @@
|
|||
<PropertyGroup>
|
||||
<BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString>
|
||||
<BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
|
||||
<BuildString Condition="'$(GIT_DESCRIBE)'!=''">$(BuildString) ($(GIT_DESCRIBE))</BuildString>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<DataItems Include="$(RootDir)data\**\*" />
|
||||
|
|
|
@ -66,3 +66,4 @@ if (${env:APPVEYOR_REPO_TAG} -ne "true")
|
|||
$env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH
|
||||
}
|
||||
$env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT
|
||||
$env:GIT_DESCRIBE = (git describe HEAD | sed -E "s/-g.+$//")
|
||||
|
|
Loading…
Reference in New Issue