From 06528da61b93b687f47067d42b8435882cdb3ad6 Mon Sep 17 00:00:00 2001 From: Jarno Veuger Date: Fri, 25 Dec 2015 14:05:21 +0100 Subject: [PATCH 1/2] Installed will be moved instead of copied --- scripts/ps/publish.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ps/publish.ps1 b/scripts/ps/publish.ps1 index b626cbac14..89591d66df 100644 --- a/scripts/ps/publish.ps1 +++ b/scripts/ps/publish.ps1 @@ -138,7 +138,7 @@ function Do-Installer() return 1 } - Copy-Item $binaries[0].FullName $artifactsDir + Move-Item $binaries[0].FullName $artifactsDir return 0 } From d77c1039dc747ea160e6b214cd13ef6215b6bda3 Mon Sep 17 00:00:00 2001 From: Jarno Veuger Date: Fri, 25 Dec 2015 14:41:39 +0100 Subject: [PATCH 2/2] Added support for buildnumbers in installer --- distribution/windows/build.ps1 | 8 +++++++- scripts/ps/publish.ps1 | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/distribution/windows/build.ps1 b/distribution/windows/build.ps1 index 2836e38771..21d0d383e5 100644 --- a/distribution/windows/build.ps1 +++ b/distribution/windows/build.ps1 @@ -1,3 +1,9 @@ +param ( + [Parameter(Position = 1)] + [string]$BuildNumber = "", + [string]$GitBranch = "" +) + $path = Split-Path $Script:MyInvocation.MyCommand.Path Write-Host "Building Windows Installer (NSIS script)"; -makensis /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log; +makensis /DAPPV_BUILD=$BuildNumber /DAPPV_EXTRA=-$GitBranch-b$BuildNumber /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log; diff --git a/scripts/ps/publish.ps1 b/scripts/ps/publish.ps1 index 89591d66df..e96dc733f9 100644 --- a/scripts/ps/publish.ps1 +++ b/scripts/ps/publish.ps1 @@ -120,7 +120,7 @@ function Do-Installer() New-Item -Force -ItemType Directory $artifactsDir > $null # Create installer - & "$installerDir\build.ps1" + & "$installerDir\build.ps1" -BuildNumber $BuildNumber -GitBranch $GitBranch if ($LASTEXITCODE -ne 0) { Write-Host "Failed to create installer." -ForegroundColor Red