Skip to content

Commit 195d1de

Browse files
committed
Whitespace cleanups
1 parent d1e7c83 commit 195d1de

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ environment:
22
VisualStudioVersion: 12.0
33

44
version: 57.0.0-CI{build}
5-
5+
66
shallow_clone: true
77

88
# Start builds on tags only (GitHub and BitBucket)
@@ -11,7 +11,7 @@ skip_non_tags: true
1111
# to run your custom scripts instead of automatic MSBuild
1212
build_script:
1313
- ps: .\build.ps1
14-
14+
1515
# Disable tests
1616
test: off
1717

@@ -27,4 +27,4 @@ deploy:
2727
secure: uftPtLACVpFbbbFBeFK6XD5fGkv33c+Xa3PWkyWgrod6FNl4AYGOtxScn+gsuuxD
2828
skip_symbols: false
2929
symbol_server: https://www.myget.org/F/cefsharp/api/v2/package
30-
artifact: nupkgfiles
30+
artifact: nupkgfiles

build.ps1

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
param(
44
[ValidateSet("vs2012", "vs2013", "vs2015", "nupkg", "nupkg-only")]
5-
[Parameter(Position = 0)]
5+
[Parameter(Position = 0)]
66
[string] $Target = "nupkg",
77

88
[ValidateSet("none", "download", "local")]
99
[Parameter(Position = 1)]
1010
[string] $DownloadBinary = "download",
11-
11+
1212
[Parameter(Position = 2)]
1313
# absolute or relative path to directory containing cef binaries archives (used if DownloadBinary = local)
1414
[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",
@@ -26,7 +26,7 @@ $Cef32vcx = Join-Path (Join-Path $Cef32 'libcef_dll_wrapper') 'libcef_dll_wrappe
2626
$Cef64 = Join-Path $WorkingDir 'cef_binary_3.y.z_windows64'
2727
$Cef64vcx = Join-Path (Join-Path $Cef64 'libcef_dll_wrapper') 'libcef_dll_wrapper.vcxproj'
2828

29-
function Write-Diagnostic
29+
function Write-Diagnostic
3030
{
3131
param(
3232
[Parameter(Position = 0, Mandatory = $true, ValueFromPipeline = $true)]
@@ -49,11 +49,11 @@ if ($env:APPVEYOR_REPO_TAG -eq "True")
4949
$CefPackageVersion = $CefVersion.SubString(0, $CefVersion.LastIndexOf('.'))
5050

5151
# https://github.com/jbake/Powershell_scripts/blob/master/Invoke-BatchFile.ps1
52-
function Invoke-BatchFile
52+
function Invoke-BatchFile
5353
{
5454
param(
5555
[Parameter(Position = 0, Mandatory = $true, ValueFromPipeline = $true)]
56-
[string]$Path,
56+
[string]$Path,
5757
[Parameter(Position = 1, Mandatory = $true, ValueFromPipeline = $true)]
5858
[string]$Parameters
5959
)
@@ -68,30 +68,30 @@ function Invoke-BatchFile
6868

6969
& $batFile
7070

71-
Get-Content $tempFile | Foreach-Object {
72-
if ($_ -match "^(.*?)=(.*)$")
73-
{
74-
Set-Content "env:\$($matches[1])" $matches[2]
75-
}
71+
Get-Content $tempFile | Foreach-Object {
72+
if ($_ -match "^(.*?)=(.*)$")
73+
{
74+
Set-Content "env:\$($matches[1])" $matches[2]
75+
}
7676
}
7777
Remove-Item $tempFile
7878
Remove-Item $batFile
7979
}
8080

81-
function Die
81+
function Die
8282
{
8383
param(
8484
[Parameter(Position = 0, ValueFromPipeline = $true)]
8585
[string] $Message
8686
)
8787

8888
Write-Host
89-
Write-Error $Message
89+
Write-Error $Message
9090
exit 1
9191

9292
}
9393

94-
function Warn
94+
function Warn
9595
{
9696
param(
9797
[Parameter(Position = 0, ValueFromPipeline = $true)]
@@ -104,7 +104,7 @@ function Warn
104104

105105
}
106106

107-
function TernaryReturn
107+
function TernaryReturn
108108
{
109109
param(
110110
[Parameter(Position = 0, ValueFromPipeline = $true)]
@@ -118,15 +118,15 @@ function TernaryReturn
118118
if($Yes) {
119119
return $Value
120120
}
121-
121+
122122
$Value2
123123

124124
}
125125

126126
function Bootstrap
127127
{
128128
param()
129-
129+
130130
if($Target -eq "nupkg-only") {
131131
return
132132
}
@@ -155,23 +155,23 @@ function Bootstrap
155155
md 'cef\x64\debug\VS2012' | Out-Null
156156
md 'cef\x64\debug\VS2013' | Out-Null
157157
md 'cef\x64\debug\VS2015' | Out-Null
158-
md 'cef\x64\release' | Out-Null
158+
md 'cef\x64\release' | Out-Null
159159
md 'cef\x64\release\VS2012' | Out-Null
160-
md 'cef\x64\release\VS2013' | Out-Null
160+
md 'cef\x64\release\VS2013' | Out-Null
161161
md 'cef\x64\release\VS2015' | Out-Null
162162

163163
}
164164

165-
function Msvs
165+
function Msvs
166166
{
167167
param(
168168
[ValidateSet('v110', 'v120', 'v140')]
169169
[Parameter(Position = 0, ValueFromPipeline = $true)]
170-
[string] $Toolchain,
170+
[string] $Toolchain,
171171

172172
[Parameter(Position = 1, ValueFromPipeline = $true)]
173173
[ValidateSet('Debug', 'Release')]
174-
[string] $Configuration,
174+
[string] $Configuration,
175175

176176
[Parameter(Position = 2, ValueFromPipeline = $true)]
177177
[ValidateSet('x86', 'x64')]
@@ -269,7 +269,7 @@ function Msvs
269269

270270
$Process = New-Object System.Diagnostics.Process
271271
$Process.StartInfo = $startInfo
272-
$Process.Start()
272+
$Process.Start()
273273
$Process.WaitForExit()
274274

275275
if($Process.ExitCode -ne 0) {
@@ -279,7 +279,7 @@ function Msvs
279279
CreateCefSdk $Toolchain $Configuration $Platform
280280
}
281281

282-
function VSX
282+
function VSX
283283
{
284284
param(
285285
[ValidateSet('v110', 'v120', 'v140')]
@@ -291,7 +291,7 @@ function VSX
291291
Warn "Toolchain $Toolchain is not installed on your development machine, skipping build."
292292
Return
293293
}
294-
294+
295295
if($Toolchain -eq 'v120' -and $env:VS120COMNTOOLS -eq $null) {
296296
Warn "Toolchain $Toolchain is not installed on your development machine, skipping build."
297297
Return
@@ -312,16 +312,16 @@ function VSX
312312
Write-Diagnostic "Finished build targeting toolchain $Toolchain"
313313
}
314314

315-
function CreateCefSdk
315+
function CreateCefSdk
316316
{
317317
param(
318318
[ValidateSet('v110', 'v120', 'v140')]
319319
[Parameter(Position = 0, ValueFromPipeline = $true)]
320-
[string] $Toolchain,
320+
[string] $Toolchain,
321321

322322
[Parameter(Position = 1, ValueFromPipeline = $true)]
323323
[ValidateSet('Debug', 'Release')]
324-
[string] $Configuration,
324+
[string] $Configuration,
325325

326326
[Parameter(Position = 2, ValueFromPipeline = $true)]
327327
[ValidateSet('x86', 'x64')]
@@ -403,11 +403,11 @@ function DownloadCefBinaryAndUnzip()
403403
{
404404
Die 'Win32 version is $CefWin32CefVersion.cef_version and Win64 version is $CefWin64CefVersion.cef_version - both must be the same'
405405
}
406-
406+
407407
set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"
408408

409409
$LocalFile = Join-Path $WorkingDir $Cef32FileName
410-
410+
411411
if(-not (Test-Path $LocalFile))
412412
{
413413
Write-Diagnostic "Download $Cef32FileName this will take a while as files are approx 200mb each"
@@ -430,12 +430,12 @@ function DownloadCefBinaryAndUnzip()
430430
Move-Item ($Folder + '\*') $Cef32 -force
431431
Remove-Item $Folder
432432
}
433-
433+
434434
$LocalFile = Join-Path $WorkingDir $Cef64FileName
435-
435+
436436
if(-not (Test-Path $LocalFile))
437437
{
438-
438+
439439
Write-Diagnostic "Download $Cef64FileName this will take a while as files are approx 200mb each"
440440
$Client.DownloadFile($CefBuildServerUrl + $Cef64FileName, $LocalFile);
441441
Write-Diagnostic "Download $Cef64FileName complete"
@@ -455,7 +455,7 @@ function DownloadCefBinaryAndUnzip()
455455
$Folder = Join-Path $WorkingDir ($Cef64FileName.Substring(0, $Cef64FileName.length - 8))
456456
Move-Item ($Folder + '\*') $Cef64 -force
457457
Remove-Item $Folder
458-
}
458+
}
459459
}
460460

461461
function CopyFromLocalCefBuild()
@@ -468,9 +468,9 @@ function CopyFromLocalCefBuild()
468468

469469
$Cef32FileName = "cef_binary_$($CefVersion)_windows32.tar.bz2"
470470
$Cef64FileName = "cef_binary_$($CefVersion)_windows64.tar.bz2"
471-
471+
472472
set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"
473-
473+
474474
if ([System.IO.Path]::IsPathRooted($CefBinaryDir))
475475
{
476476
$CefBuildDir = $CefBinaryDir
@@ -481,7 +481,7 @@ function CopyFromLocalCefBuild()
481481
}
482482

483483
$LocalFile = Join-Path $WorkingDir $Cef32FileName
484-
484+
485485
if(-not (Test-Path $LocalFile))
486486
{
487487
Write-Diagnostic "Copy $Cef32FileName (approx 200mb)"
@@ -504,12 +504,12 @@ function CopyFromLocalCefBuild()
504504
Move-Item ($Folder + '\*') $Cef32 -force
505505
Remove-Item $Folder
506506
}
507-
507+
508508
$LocalFile = Join-Path $WorkingDir $Cef64FileName
509-
509+
510510
if(-not (Test-Path $LocalFile))
511511
{
512-
512+
513513
Write-Diagnostic "Copy $Cef64FileName (approx 200mb)"
514514
Copy-Item ($CefBuildDir+$Cef64FileName) $LocalFile;
515515
Write-Diagnostic "Copy of $Cef64FileName complete"
@@ -535,8 +535,8 @@ function CopyFromLocalCefBuild()
535535
function CheckDependencies()
536536
{
537537
#Check for cmake
538-
if ((Get-Command "cmake.exe" -ErrorAction SilentlyContinue) -eq $null)
539-
{
538+
if ((Get-Command "cmake.exe" -ErrorAction SilentlyContinue) -eq $null)
539+
{
540540
Die "Unable to find cmake.exe in your PATH"
541541
}
542542

0 commit comments

Comments
 (0)