Skip to content

Commit

Permalink
Add support for Windows ARM64 (#90)
Browse files Browse the repository at this point in the history 
* Upgrade to 88.1.2+gac8e5f0+chromium-88.0.4324.27.

* - Add win-arm64 artifacts to package 'chromiumembeddedframework'.
- Build win-arm64 version of libcef_dll_wrapper.lib when using the v141 (VS 2017) or v142 (VS 2019) toolchain.

Issue cefsharp/CefSharp#2944

* Use x64_arm64 instead of amd64_arm64 as argument for vcvarsall.bat for consistency.

* PR feedback: Also build the cef.redist.arm64 package.
  • Loading branch information
@kpreisser
kpreisser authored Jan 15, 2021
1 parent 5809729 commit 91e998c
Show file tree
Hide file tree
Showing 7 changed files with 169 additions and 14 deletions.
15 changes: 15 additions & 0 deletions NuGet/cef.redist.arm64.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Files are no longer copied as part of this targets file.
For projects other than CefSharp define a target to copy the files.
Checkout the CefSharp.Common.targets file for an example
-->

<!--
Using wildcard matching as per https://stackoverflow.com/a/17252671
-->
<ItemGroup>
<CefRedistArm64 Include="$(MSBuildThisFileDirectory)..\CEF\**\*.*" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion NuGet/cef.sdk.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CefSdkVer>cef.sdk.86.0.17</CefSdkVer>
<CefSdkVer>cef.sdk.88.1.2</CefSdkVer>
</PropertyGroup>
</Project>
11 changes: 8 additions & 3 deletions NuGet/chromiumembeddedframework.runtime.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
"runtimes": {
"win-x64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x64": "86.0.20"
"chromiumembeddedframework.runtime.win-x64": "88.1.2"
}
},
"win-x86": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x86": "86.0.20"
"chromiumembeddedframework.runtime.win-x86": "88.1.2"
}
}
},
"win-arm64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-arm64": "88.1.2"
}
},
}
}
2 changes: 2 additions & 0 deletions NuGet/chromiumembeddedframework.runtime.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<file src="..\cef_binary_3.y.z_windows32\$Configuration$\swiftshader\*.dll" target="CEF\win-x86\swiftshader" />
<file src="..\cef_binary_3.y.z_windows64\Resources\locales\*.pak" target="CEF\win-x64\locales"/>
<file src="..\cef_binary_3.y.z_windows64\$Configuration$\swiftshader\*.dll" target="CEF\win-x64\swiftshader" />
<file src="..\cef_binary_3.y.z_windowsarm64\Resources\locales\*.pak" target="CEF\win-arm64\locales"/>
<file src="..\cef_binary_3.y.z_windowsarm64\$Configuration$\swiftshader\*.dll" target="CEF\win-arm64\swiftshader" />
<file src="..\cef_binary_3.y.z_windows32\LICENSE.txt" target="LICENSE.txt" />
<file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
Expand Down
2 changes: 2 additions & 0 deletions NuGet/chromiumembeddedframework.runtime.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@
<CefRuntimeWin32SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\swiftshader\*.*" />
<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
<CefRuntimeWin64SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\swiftshader\*.*" />
<CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
<CefRuntimeWinArm64SwiftShader Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\swiftshader\*.*" />
</ItemGroup>
</Project>
151 changes: 141 additions & 10 deletions build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ param(
[string] $CefBinaryDir = "../cefsource/chromium/src/cef/binary_distrib/",

[Parameter(Position = 3)]
$CefVersion = "86.0.20+gf2039ae+chromium-86.0.4240.111",
$CefVersion = "88.1.2+gac8e5f0+chromium-88.0.4324.27",

[ValidateSet("tar.bz2","zip","7z")]
[Parameter(Position = 4)]
Expand Down Expand Up @@ -58,6 +58,8 @@ try
$Cef32vcx = Join-Path (Join-Path $Cef32 'libcef_dll_wrapper') 'libcef_dll_wrapper.vcxproj'
$Cef64 = Join-Path $WorkingDir 'cef_binary_3.y.z_windows64'
$Cef64vcx = Join-Path (Join-Path $Cef64 'libcef_dll_wrapper') 'libcef_dll_wrapper.vcxproj'
$CefArm64 = Join-Path $WorkingDir 'cef_binary_3.y.z_windowsarm64'
$CefArm64vcx = Join-Path (Join-Path $CefArm64 'libcef_dll_wrapper') 'libcef_dll_wrapper.vcxproj'

function Write-Diagnostic
{
Expand Down Expand Up @@ -218,6 +220,13 @@ try
md 'cef\x64\release\VS2015' | Out-Null
md 'cef\x64\release\VS2017' | Out-Null
md 'cef\x64\release\VS2019' | Out-Null
md 'cef\arm64' | Out-Null
md 'cef\arm64\debug' | Out-Null
md 'cef\arm64\debug\VS2017' | Out-Null
md 'cef\arm64\debug\VS2019' | Out-Null
md 'cef\arm64\release' | Out-Null
md 'cef\arm64\release\VS2017' | Out-Null
md 'cef\arm64\release\VS2019' | Out-Null
}

function Msvs
Expand All @@ -232,7 +241,7 @@ try
[string] $Configuration,

[Parameter(Position = 2, ValueFromPipeline = $true)]
[ValidateSet('x86', 'x64')]
[ValidateSet('x86', 'x64', 'arm64')]
[string] $Platform
)

Expand Down Expand Up @@ -327,10 +336,21 @@ try
Die 'Error unable to find any visual studio environment'
}

$CefProject = TernaryReturn ($Platform -eq 'x86') $Cef32vcx $Cef64vcx
$CefDir = TernaryReturn ($Platform -eq 'x86') $Cef32 $Cef64

$Arch = TernaryReturn ($Platform -eq 'x64') 'x64' 'win32'
$CefProject = $Cef32vcx
$CefDir = $Cef32
$Arch = 'win32'
if ($Platform -eq 'x64')
{
$CefProject = $Cef64vcx
$CefDir = $Cef64
$Arch = 'x64'
}
elseif ($Platform -eq 'arm64')
{
$CefProject = $CefArm64vcx
$CefDir = $CefArm64
$Arch = 'arm64'
}

$VCVarsAll = Join-Path $VXXCommonTools vcvarsall.bat
if (-not (Test-Path $VCVarsAll))
Expand All @@ -340,15 +360,22 @@ try
}

$VCXProj = $Cef32vcx
$VCVarsAllArch = 'x86'
if ($Platform -eq 'x64')
{
$VCXProj = $Cef64vcx
$VCVarsAllArch = 'x64'
}
elseif ($Platform -eq 'arm64')
{
$VCXProj = $CefArm64vcx
$VCVarsAllArch = 'x64_arm64'
}

# Only configure build environment once
if ($env:CEFSHARP_BUILD_IS_BOOTSTRAPPED -ne "$Toolchain$Platform")
{
Invoke-BatchFile $VCVarsAll $Platform
Invoke-BatchFile $VCVarsAll $VCVarsAllArch
Write-Diagnostic "pushd $CefDir"
pushd $CefDir
# Remove previously generated CMake data for the different platform/toolchain
Expand Down Expand Up @@ -433,6 +460,15 @@ try
}
Msvs "$Toolchain" 'Release' 'x64'

if ($Toolchain -eq 'v141' -or $Toolchain -eq 'v142')
{
if (! $NoDebugBuild)
{
Msvs "$Toolchain" 'Debug' 'arm64'
}
Msvs "$Toolchain" 'Release' 'arm64'
}

Write-Diagnostic "Finished build targeting toolchain $Toolchain"
}

Expand All @@ -448,7 +484,7 @@ try
[string] $Configuration,

[Parameter(Position = 2, ValueFromPipeline = $true)]
[ValidateSet('x86', 'x64')]
[ValidateSet('x86', 'x64', 'arm64')]
[string] $Platform
)

Expand Down Expand Up @@ -476,8 +512,18 @@ try
$VisualStudioVersion = "VS2013"
}

$Arch = TernaryReturn ($Platform -eq 'x64') 'x64' 'win32'
$CefArchDir = TernaryReturn ($Platform -eq 'x64') $Cef64 $Cef32
$Arch = 'win32'
$CefArchDir = $Cef32
if ($Platform -eq 'x64')
{
$Arch = 'x64'
$CefArchDir = $Cef64
}
elseif ($Platform -eq 'arm64')
{
$Arch = 'arm64'
$CefArchDir = $CefArm64
}

# cef_binary_3.y.z_windows32\out\debug\lib -> cef\win32\debug\vs2013
Copy-Item $CefArchDir\libcef_dll_wrapper\$Configuration\libcef_dll_wrapper.lib $Cef\$Arch\$Configuration\$VisualStudioVersion | Out-Null
Expand All @@ -504,6 +550,10 @@ try
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget
. $Nuget pack nuget\chromiumembeddedframework.runtime.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=x64;CPlatform=windows64;' -OutputDirectory nuget

# Build arm64 packages
. $Nuget pack nuget\cef.redist.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=arm64;CPlatform=windowsarm64;' -OutputDirectory nuget
. $Nuget pack nuget\chromiumembeddedframework.runtime.win.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;Platform=arm64;CPlatform=windowsarm64;' -OutputDirectory nuget

# Meta Package
. $Nuget pack nuget\chromiumembeddedframework.runtime.nuspec -NoPackageAnalysis -Version $CefPackageVersion -Properties 'Configuration=Release;' -OutputDirectory nuget

Expand All @@ -518,8 +568,10 @@ try
{
appveyor PushArtifact "nuget\cef.redist.x86.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\cef.redist.x64.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\cef.redist.arm64.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.win-x86.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.win-x64.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.win-arm64.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\chromiumembeddedframework.runtime.$CefPackageVersion.nupkg"
appveyor PushArtifact "nuget\cef.sdk.$CefPackageVersion.nupkg"
}
Expand Down Expand Up @@ -551,19 +603,27 @@ try
$CefBuildsJson = Invoke-WebRequest -Uri $CefBuildServerJsonPackageList | ConvertFrom-Json
$CefWin32CefVersion = $CefBuildsJson.windows32.versions | Where-Object {$_.cef_version -eq $CefVersion}
$CefWin64CefVersion = $CefBuildsJson.windows64.versions | Where-Object {$_.cef_version -eq $CefVersion}
$CefWinArm64CefVersion = $CefBuildsJson.windowsarm64.versions | Where-Object {$_.cef_version -eq $CefVersion}

$Cef32FileName = ($CefWin32CefVersion.files | Where-Object {$_.type -eq "standard"}).name
$Cef32FileHash = ($CefWin32CefVersion.files | Where-Object {$_.type -eq "standard"}).sha1
$Cef32FileSize = (($CefWin32CefVersion.files | Where-Object {$_.type -eq "standard"}).size /1MB)
$Cef64FileName = ($CefWin64CefVersion.files | Where-Object {$_.type -eq "standard"}).name
$Cef64FileHash = ($CefWin64CefVersion.files | Where-Object {$_.type -eq "standard"}).sha1
$Cef64FileSize = (($CefWin64CefVersion.files | Where-Object {$_.type -eq "standard"}).size /1MB)
$CefArm64FileName = ($CefWinArm64CefVersion.files | Where-Object {$_.type -eq "standard"}).name
$CefArm64FileHash = ($CefWinArm64CefVersion.files | Where-Object {$_.type -eq "standard"}).sha1
$CefArm64FileSize = (($CefWinArm64CefVersion.files | Where-Object {$_.type -eq "standard"}).size /1MB)

# Make sure there is a 32bit and 64bit version for the specified build
if ($CefWin32CefVersion.cef_version -ne $CefWin64CefVersion.cef_version)
{
Die 'Win32 version is $CefWin32CefVersion.cef_version and Win64 version is $CefWin64CefVersion.cef_version - both must be the same'
}
if ($CefWin32CefVersion.cef_version -ne $CefWinArm64CefVersion.cef_version)
{
Die 'Win32 version is $CefWin32CefVersion.cef_version and WinArm64 version is $CefWinArm64CefVersion.cef_version - both must be the same'
}

set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"

Expand Down Expand Up @@ -644,6 +704,45 @@ try
Move-Item ($Folder + '\*') $Cef64 -force
Remove-Item $Folder
}

$LocalFile = Join-Path $WorkingDir $CefArm64FileName

if (-not (Test-Path $LocalFile))
{
Write-Diagnostic "Downloading $CefArm64FileName; this will take a while as the file is $CefArm64FileSize MB."
$Client.DownloadFile($CefBuildServerUrl + [System.Web.HttpUtility]::UrlEncode($CefArm64FileName), $LocalFile);

$CefArm64LocalFileHash = (Get-FileHash -Path $LocalFile -Algorithm SHA1).Hash

Write-Diagnostic "Download $CefArm64FileName complete"
Write-Diagnostic "Expected SHA1 for $CefArm64FileName $CefArm64FileHash"
Write-Diagnostic "Actual SHA1 for $CefArm64FileName $CefArm64LocalFileHash"

if($CefArm64LocalFileHash -ne $CefArm64FileHash)
{
Die "SHA1 hash did not match"
}
}

if (-not (Test-Path (Join-Path $CefArm64 '\include\cef_version.h')))
{
# Extract bzip file
sz e $LocalFile

# Extract tar file
$TarFile = ($LocalFile).Substring(0, $LocalFile.length - 4)
sz x $TarFile

# Sleep for a short period to allow 7z to release it's file handles
sleep -m 2000

# Remove tar file
Remove-Item $TarFile

$Folder = Join-Path $WorkingDir ($CefArm64FileName.Substring(0, $CefArm64FileName.length - 8))
Move-Item ($Folder + '\*') $CefArm64 -force
Remove-Item $Folder
}
}

function CopyFromLocalCefBuild()
Expand All @@ -656,6 +755,7 @@ try

$Cef32FileName = "cef_binary_$($CefVersion)_windows32." + $Extension;
$Cef64FileName = "cef_binary_$($CefVersion)_windows64." + $Extension;
$CefArm64FileName = "cef_binary_$($CefVersion)_windowsarm64." + $Extension;

set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"

Expand Down Expand Up @@ -730,6 +830,37 @@ try
Move-Item ($Folder + '\*') $Cef64 -force
Remove-Item $Folder
}

$LocalFile = Join-Path $WorkingDir $CefArm64FileName

if (-not (Test-Path $LocalFile))
{
Write-Diagnostic "Copy $CefArm64FileName (approx 200mb)"
Copy-Item ($CefBuildDir+$CefArm64FileName) $LocalFile;
Write-Diagnostic "Copy of $CefArm64FileName complete"
}

if (-not (Test-Path (Join-Path $CefArm64 '\include\cef_version.h')))
{
# Extract bzip file
sz x $LocalFile;

if ($Extension -eq "tar.bz2")
{
# Extract tar file
$TarFile = ($LocalFile).Substring(0, $LocalFile.length - 4)
sz x $TarFile

# Sleep for a short period to allow 7z to release it's file handles
sleep -m 2000

# Remove tar file
Remove-Item $TarFile
}
$Folder = Join-Path $WorkingDir ($CefArm64FileName.Substring(0, $CefArm64FileName.length - ($Extension.Length+1)))
Move-Item ($Folder + '\*') $CefArm64 -force
Remove-Item $Folder
}
}

function WriteVersionToRuntimeJson
Expand Down
Empty file added cef_binary_3.y.z_windowsarm64/.empty
View file
Empty file.

0 comments on commit 91e998c

Please sign in to comment.