|
14 | 14 | [string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/", |
15 | 15 |
|
16 | 16 | [Parameter(Position = 3)] |
17 | | - $CefVersion = "3.3578.1860.g36610bd", |
| 17 | + $CefVersion = "73.1.12+gee4b49f+chromium-73.0.3683.75", |
18 | 18 |
|
19 | 19 | [ValidateSet("tar.bz2","zip","7z")] |
20 | 20 | [Parameter()] |
|
47 | 47 | $CefVersion = ($name -replace "cef_binary_", "") -replace "_windows64.$Extension"; |
48 | 48 | } |
49 | 49 |
|
50 | | - |
51 | 50 | $Cef = Join-Path $WorkingDir 'cef' |
52 | 51 | $CefInclude = Join-Path $Cef 'include' |
53 | 52 | $Cef32 = Join-Path $WorkingDir 'cef_binary_3.y.z_windows32' |
|
73 | 72 | $CefVersion = "$env:APPVEYOR_REPO_TAG_NAME".Substring(1) # trim leading "v" |
74 | 73 | Write-Diagnostic "Setting version based on tag to $CefVersion" |
75 | 74 | } |
76 | | - |
77 | | - # Take the cef version and strip the commit hash |
78 | | - $CefPackageVersion = $CefVersion.SubString(0, $CefVersion.LastIndexOf('.')) |
| 75 | + |
| 76 | + if($CefVersion.StartsWith('3.')) |
| 77 | + { |
| 78 | + # Take the cef version and strip the commit hash |
| 79 | + $CefPackageVersion = $CefVersion.SubString(0, $CefVersion.LastIndexOf('.')) |
| 80 | + } |
| 81 | + else |
| 82 | + { |
| 83 | + # Take the cef version and strip the commit hash, chromium version |
| 84 | + # we should end up with something like 73.1.12 |
| 85 | + $CefPackageVersion = $CefVersion.SubString(0, $CefVersion.IndexOf('+')) |
| 86 | + } |
79 | 87 |
|
80 | 88 | # https://github.com/jbake/Powershell_scripts/blob/master/Invoke-BatchFile.ps1 |
81 | 89 | function Invoke-BatchFile |
|
531 | 539 | if (-not (Test-Path $LocalFile)) |
532 | 540 | { |
533 | 541 | Write-Diagnostic "Downloading $Cef32FileName; this will take a while as the file is $Cef32FileSize MB." |
534 | | - $Client.DownloadFile($CefBuildServerUrl + $Cef32FileName, $LocalFile); |
| 542 | + $Client.DownloadFile($CefBuildServerUrl + [System.Web.HttpUtility]::UrlEncode($Cef32FileName), $LocalFile); |
535 | 543 |
|
536 | 544 | $Cef32LocalFileHash = (Get-FileHash -Path $LocalFile -Algorithm SHA1).Hash |
537 | 545 |
|
|
570 | 578 | if (-not (Test-Path $LocalFile)) |
571 | 579 | { |
572 | 580 | Write-Diagnostic "Downloading $Cef64FileName; this will take a while as the file is $Cef64FileSize MB." |
573 | | - $Client.DownloadFile($CefBuildServerUrl + $Cef64FileName, $LocalFile); |
| 581 | + $Client.DownloadFile($CefBuildServerUrl + [System.Web.HttpUtility]::UrlEncode($Cef64FileName), $LocalFile); |
574 | 582 |
|
575 | 583 | $Cef64LocalFileHash = (Get-FileHash -Path $LocalFile -Algorithm SHA1).Hash |
576 | 584 |
|
|
0 commit comments