Browse Source

Fix classic installer generation problem.

pull/287/head v0.12-rc2
Adam Johnson 3 years ago
parent
commit
f24b80fe7f
Signed by: Hoikas
GPG Key ID: 0B6515D6FF6F271E
  1. 15
      build.ps1

15
build.ps1

@ -184,10 +184,9 @@ function Build-KormanClassicInstaller() {
New-Item -Path "$PSScriptRoot/installer/Files/x64" -ItemType Directory -Force New-Item -Path "$PSScriptRoot/installer/Files/x64" -ItemType Directory -Force
# CMake copies the vcredist for us. YAY! # CMake copies the vcredist for us. YAY!
Write-Host -ForegroundColor Cyan "Copying sub-installers..." Write-Host -ForegroundColor Cyan "Copying binary dependencies..."
Copy-Item "$BuildDir/x86/harvest/bin/vcredist_x86.exe" "$PSScriptRoot/installer/Files/x86/vcredist_x86.exe" Copy-Item -Recurse "$BuildDir/x86/harvest/bin/*" "$PSScriptRoot/installer/Files/x86"
Copy-Item "$BuildDir/x64/harvest/bin/vcredist_x64.exe" "$PSScriptRoot/installer/Files/x64/vcredist_x64.exe" Copy-Item -Recurse "$BuildDir/x64/harvest/bin/*" "$PSScriptRoot/installer/Files/x64"
Copy-Item "$BuildDir/x86/harvest/bin/Python-2.2.3.exe" "$PSScriptRoot/installer/Files/x86/Python-2.2.3.exe"
Write-Host -ForegroundColor Cyan "Determining Build Info..." Write-Host -ForegroundColor Cyan "Determining Build Info..."
if (Get-Command git) { if (Get-Command git) {
@ -207,13 +206,13 @@ function Build-KormanClassicInstaller() {
$PythonDLL = "python$($PythonVersion.Replace('.', '')).dll" $PythonDLL = "python$($PythonVersion.Replace('.', '')).dll"
makensis /DPYTHON_DLL=$PythonDLL Installer.nsi makensis /DPYTHON_DLL=$PythonDLL Installer.nsi
if ($LASTEXITCODE -Ne 0) { throw "makensis failed!" } if ($LASTEXITCODE -Ne 0) { throw "makensis failed!" }
# Move it into the expected location for a "new" installer.
New-Item -Path "$BuildDir/package" -ItemType Directory -Force
Move-Item "$PSScriptRoot/installer/korman.exe" "$BuildDir/package/korman-$KormanRev-windows-classic.exe"
} finally { } finally {
Pop-Location Pop-Location
} }
# Move it into the expected location for a "new" installer.
New-Item -Path "$BuildDir/package" -ItemType Directory -Force
Move-Item "$PSScriptRoot/installer/korman.exe" "$BuildDir/package/korman-$KormanRev-windows-classic.exe"
} }
function Build-KormanDev($HostGenerator, $TargetPlatform, $OutputDir) { function Build-KormanDev($HostGenerator, $TargetPlatform, $OutputDir) {

Loading…
Cancel
Save