Fixing the build

This commit is contained in:
Mark McDowall 2014-12-25 21:35:22 -08:00
parent 8306305207
commit be1d4ce4c6
1 changed files with 16 additions and 16 deletions

View File

@ -15,12 +15,12 @@ Function Build()
$clean = $msbuild + " src\nzbdrone.sln /t:Clean /m" $clean = $msbuild + " src\nzbdrone.sln /t:Clean /m"
$build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m" $build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m"
if(Test-Path $outputFolder) if(Test-Path $outputFolder)
{ {
Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
} }
Invoke-Expression $clean Invoke-Expression $clean
CheckExitCode CheckExitCode
@ -34,7 +34,7 @@ Function Build()
Write-Host "Removing Mono.Posix.dll" Write-Host "Removing Mono.Posix.dll"
Remove-Item "$outputFolder\Mono.Posix.dll" Remove-Item "$outputFolder\Mono.Posix.dll"
Write-Host "##teamcity[progressFinish 'Build']" Write-Host "##teamcity[progressFinish 'Build']"
} }
Function CleanFolder($path, $keepConfigFiles) Function CleanFolder($path, $keepConfigFiles)
@ -56,12 +56,12 @@ Function CleanFolder($path, $keepConfigFiles)
} }
get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
if($keepConfigFiles -ne $true) if($keepConfigFiles -ne $true)
{ {
get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname}
} }
Write-Host Removing FluentValidation.Resources files Write-Host Removing FluentValidation.Resources files
get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname} get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
@ -72,15 +72,15 @@ Function CleanFolder($path, $keepConfigFiles)
Write-Host Removing vshost files Write-Host Removing vshost files
get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname}
if(Test-Path $$path\NuGet) if(Test-Path $$path\NuGet)
{ {
Write-Host Removing NuGet Write-Host Removing NuGet
Remove-Item -Recurse -Force "$path\NuGet" Remove-Item -Recurse -Force "$path\NuGet"
} }
Write-Host Removing Empty folders Write-Host Removing Empty folders
while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path) while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
{ {
Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
} }
@ -109,7 +109,7 @@ Function PackageMono()
Write-Host Removing Service helpers Write-Host Removing Service helpers
get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
Write-Host Removing native windows binaries Sqlite, MediaInfo Write-Host Removing native windows binaries Sqlite, MediaInfo
get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname}
get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname} get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname}
@ -169,7 +169,7 @@ Function PackageOsxApp()
} }
Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse
Copy-Item $outputFolderOsx\* $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse Copy-Item $outputFolderOsx $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
Write-Host "##teamcity[progressFinish 'Creating OS X App Package']" Write-Host "##teamcity[progressFinish 'Creating OS X App Package']"
} }
@ -186,27 +186,27 @@ Function PackageTests()
Write-Host Packaging Tests Write-Host Packaging Tests
Write-Host "##teamcity[progressStart 'Creating Test Package']" Write-Host "##teamcity[progressStart 'Creating Test Package']"
if(Test-Path $testPackageFolder) if(Test-Path $testPackageFolder)
{ {
Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
} }
Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} | foreach($_){ Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} | foreach($_){
Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore
} }
.\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder .\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force
Copy-Item .\*.sh -Destination $testPackageFolder -Force Copy-Item .\*.sh -Destination $testPackageFolder -Force
Write-Host Creating MDBs for tests Write-Host Creating MDBs for tests
get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) { get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
Write-Host "Creating .mdb for $_" Write-Host "Creating .mdb for $_"
& "tools\pdb2mdb\pdb2mdb.exe" $_.fullname & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
} }
get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname} get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
@ -224,7 +224,7 @@ Function RunGulp()
$gulpPath = '.\node_modules\gulp\bin\gulp' $gulpPath = '.\node_modules\gulp\bin\gulp'
Invoke-Expression 'npm install' Invoke-Expression 'npm install'
CheckExitCode CheckExitCode
Invoke-Expression ('node ' + $gulpPath + ' build') -ErrorAction Continue -Verbose Invoke-Expression ('node ' + $gulpPath + ' build') -ErrorAction Continue -Verbose
CheckExitCode CheckExitCode