Skip to content

Commit be1d4ce

Browse files
committed
Fixing the build
1 parent 8306305 commit be1d4ce

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

build.ps1

+16-16
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ Function Build()
1515

1616
$clean = $msbuild + " src\nzbdrone.sln /t:Clean /m"
1717
$build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m"
18-
18+
1919
if(Test-Path $outputFolder)
2020
{
2121
Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
2222
}
23-
23+
2424
Invoke-Expression $clean
2525
CheckExitCode
2626

@@ -34,7 +34,7 @@ Function Build()
3434
Write-Host "Removing Mono.Posix.dll"
3535
Remove-Item "$outputFolder\Mono.Posix.dll"
3636

37-
Write-Host "##teamcity[progressFinish 'Build']"
37+
Write-Host "##teamcity[progressFinish 'Build']"
3838
}
3939

4040
Function CleanFolder($path, $keepConfigFiles)
@@ -56,12 +56,12 @@ Function CleanFolder($path, $keepConfigFiles)
5656
}
5757

5858
get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
59-
59+
6060
if($keepConfigFiles -ne $true)
6161
{
6262
get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname}
6363
}
64-
64+
6565
Write-Host Removing FluentValidation.Resources files
6666
get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
6767

@@ -72,15 +72,15 @@ Function CleanFolder($path, $keepConfigFiles)
7272

7373
Write-Host Removing vshost files
7474
get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname}
75-
75+
7676
if(Test-Path $$path\NuGet)
7777
{
7878
Write-Host Removing NuGet
7979
Remove-Item -Recurse -Force "$path\NuGet"
8080
}
81-
81+
8282
Write-Host Removing Empty folders
83-
while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
83+
while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
8484
{
8585
Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
8686
}
@@ -109,7 +109,7 @@ Function PackageMono()
109109
Write-Host Removing Service helpers
110110
get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
111111
get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
112-
112+
113113
Write-Host Removing native windows binaries Sqlite, MediaInfo
114114
get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname}
115115
get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname}
@@ -169,7 +169,7 @@ Function PackageOsxApp()
169169
}
170170

171171
Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse
172-
Copy-Item $outputFolderOsx\* $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
172+
Copy-Item $outputFolderOsx $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
173173

174174
Write-Host "##teamcity[progressFinish 'Creating OS X App Package']"
175175
}
@@ -186,27 +186,27 @@ Function PackageTests()
186186

187187
Write-Host Packaging Tests
188188
Write-Host "##teamcity[progressStart 'Creating Test Package']"
189-
189+
190190
if(Test-Path $testPackageFolder)
191191
{
192192
Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
193193
}
194194

195-
Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} | foreach($_){
195+
Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} | foreach($_){
196196
Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore
197197
}
198198

199-
.\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
199+
.\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
200200

201201
Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
202202
Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force
203203
Copy-Item .\*.sh -Destination $testPackageFolder -Force
204-
204+
205205
Write-Host Creating MDBs for tests
206206
get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
207207
Write-Host "Creating .mdb for $_"
208208
& "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
209-
}
209+
}
210210

211211
get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
212212

@@ -224,7 +224,7 @@ Function RunGulp()
224224
$gulpPath = '.\node_modules\gulp\bin\gulp'
225225
Invoke-Expression 'npm install'
226226
CheckExitCode
227-
227+
228228
Invoke-Expression ('node ' + $gulpPath + ' build') -ErrorAction Continue -Verbose
229229
CheckExitCode
230230

0 commit comments

Comments
 (0)