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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Ted John
2016-04-15 23:25:45 +01:00
parent f73e3ab0e1 1eb91cb210
commit 63f008566c
33 changed files with 167 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/ps/appveyor_run.ps1
View File

@@ -43,16 +43,20 @@ $installer = $false
$symbols = $false
if (${env:OPENRCT2.ORG_TOKEN} -ne $null)
{
$pushBuilds = $true
$installer = $true
$symbols = $true
if ($tag -ne $null -or $env:APPVEYOR_REPO_BRANCH -match "^develop$|^push/")
{
$pushBuilds = $true
}
}
# Write out summary of the build
Write-Host "AppVeyor CI Build" -ForegroundColor Green
if ($tag -ne $null)
{
Write-Host " $version-$tag" -ForegroundColor Green
Write-Host " $version ($tag)" -ForegroundColor Green
}
else
{
@@ -117,7 +121,11 @@ if ($pushBuilds)
$versionExtension = ""
if ($tag -ne $null)
{
$versionExtension = "-$tag"
# Hide tag if it is a version
if ($GitTag -notmatch "^v[0-9]")
{
$versionExtension = "-$tag"
}
}
else
{
@@ -146,7 +154,7 @@ if ($pushBuilds)
if ($symbols)
{
Write-Host "Sending symbols to OpenRCT2.org" -ForegroundColor Cyan
Push-Build -file ".\artifacts\openrct2-symbols.zip" `
Push-Build -file ".\artifacts\openrct2-symbols-${env:APPVEYOR_REPO_COMMIT_SHORT}.zip" `
-name "$pushFileName-symbols.zip" `
-version $version `
-flavourId 5

23
scripts/ps/publish.ps1
View File

@@ -50,7 +50,15 @@ function Do-PrepareSource()
$defines["OPENRCT2_BUILD_SERVER"] = $Server;
if ($GitTag -ne "")
{
$defines["OPENRCT2_BRANCH"] = $GitTag;
# Hide tag if it is a version
if ($GitTag -match "^v[0-9]")
{
$defines["OPENRCT2_BRANCH"] = "";
}
else
{
$defines["OPENRCT2_BRANCH"] = $GitTag;
}
}
else
{
@@ -104,9 +112,10 @@ function Do-Symbols()
Write-Host "Publishing OpenRCT2 debug symbols as zip..." -ForegroundColor Cyan
$artifactsDir = "$rootPath\artifacts"
$releaseDir = "$rootPath\bin"
$outZip = "$rootPath\artifacts\openrct2-symbols.zip"
$outZip = "$rootPath\artifacts\openrct2-symbols-$GitSha1Short.zip"
Copy-Item -Force "$releaseDir\openrct2.pdb" $artifactsDir -ErrorAction Stop
Copy-Item -Force "$releaseDir\openrct2.dll" $artifactsDir -ErrorAction Stop
# Create archive using 7z (renowned for speed and compression)
$7zcmd = "7za"
@@ -120,7 +129,7 @@ function Do-Symbols()
return 1
}
}
& $7zcmd a -tzip -mx9 $outZip "$artifactsDir\openrct2.pdb" > $null
& $7zcmd a -tzip -mx9 $outZip "$artifactsDir\openrct2.pdb" "$artifactsDir\openrct2.dll" > $null
if ($LASTEXITCODE -ne 0)
{
Write-Host "Failed to create zip." -ForegroundColor Red
@@ -192,11 +201,15 @@ function Do-Installer()
$VersionExtra = ""
if ($GitTag -ne "")
{
$VersionExtra = "$GitTag"
# Hide tag if it is a version
if ($GitTag -notmatch "^v[0-9]")
{
$VersionExtra = "-$GitTag";
}
}
else
{
$VersionExtra = "$GitBranch-$GitCommitSha1Short"
$VersionExtra = "-$GitBranch-$GitCommitSha1Short"
}
# Create installer