mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Add git describe support for AppVeyor builds

Browse Source
This commit is contained in:
Ted John
2018-06-14 12:52:01 +01:00
parent 56250b43ab
commit 314707d67a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openrct2.proj
View File

@@ -5,6 +5,7 @@
- GIT_TAG - GIT_TAG
- GIT_BRANCH - GIT_BRANCH
- GIT_COMMIT_SHA1 - GIT_COMMIT_SHA1
- GIT_DESCRIBE
- SIGN_PASSWORD - SIGN_PASSWORD
- OPENRCT2_ORG_TOKEN - OPENRCT2_ORG_TOKEN
- NO_NSIS: set to true to prevent the NSIS installer building - 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_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)'!=''">/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_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> <RootDir>$(MsBuildThisFileDirectory)</RootDir>
<DistDir>$(RootDir)distribution\</DistDir> <DistDir>$(RootDir)distribution\</DistDir>
@@ -161,6 +163,7 @@
<PropertyGroup> <PropertyGroup>
<BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString> <BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString>
<BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString> <BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
<BuildString Condition="'$(GIT_DESCRIBE)'!=''">$(BuildString) ($(GIT_DESCRIBE))</BuildString>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DataItems Include="$(RootDir)data\**\*" /> <DataItems Include="$(RootDir)data\**\*" />

1
scripts/ps/appveyor_install.ps1
View File

@@ -66,3 +66,4 @@ if (${env:APPVEYOR_REPO_TAG} -ne "true")
$env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH $env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH
} }
$env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT $env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT
$env:GIT_DESCRIBE = (git describe HEAD | sed -E "s/-g.+$//")