From dffcc895cf7f0212a69722050ae4d8452a339200 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Fri, 11 Dec 2015 00:20:09 +0000 Subject: [PATCH] call build script from publish script --- scripts/build.ps1 | 13 +++++++++++-- scripts/publish.ps1 | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 28194ddf21..922e4ccd41 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -7,7 +7,10 @@ param ( [string]$Task = "openrct2", [Parameter(Mandatory = $false)] - [string]$Configuration = "Release" + [string]$Configuration = "Release", + + [Parameter(Mandatory = $false)] + [switch]$Rebuild = $false ) # Get paths @@ -28,7 +31,13 @@ function Build-Data() function Build-OpenRCT2() { Write-Host "Building OpenRCT2 ($Configuration)..." -ForegroundColor Cyan - msbuild ..\projects\openrct2.sln /p:Configuration=$Configuration /p:Platform=Win32 /v:minimal | Write-Host + + $target = "" + if ($Rebuild) + { + $target = "/t:rebuild" + } + msbuild ..\projects\openrct2.sln /p:Configuration=$Configuration /p:Platform=Win32 $target /v:minimal | Write-Host return $LASTEXITCODE } diff --git a/scripts/publish.ps1 b/scripts/publish.ps1 index f02b6510e9..80bda7f64b 100644 --- a/scripts/publish.ps1 +++ b/scripts/publish.ps1 @@ -48,7 +48,7 @@ function do-prepareSource($build_server = "", $build_number = "") function do-build() { Write-Host "Building OpenRCT2..." -ForegroundColor Cyan - msbuild $rootPath\projects\openrct2.sln /p:Configuration=Release /p:Platform=Win32 /t:rebuild /v:minimal + & "$scriptsPath\build.ps1" all -Rebuild } # Package