Skip to content

Commit

Permalink
builds.ps1 - Major rewrite
Browse files Browse the repository at this point in the history
- Use $BuildArches "win-x86;win-x64;win-arm64" param to specify the desired
  platforms to package. Using win-x64 etc so if we ever add support for packaging
  linux/macosx then they can easily be added. Spaces, semi colons, colons, and commas
  should all work as delimiters. x86 x64 and arm64 without the win- prefix would also
  work.
- Additionally reduce some duplication
- Remove the nuspec template and go back to having a straight nuspec file
  as I have plans to refactor that package shortly.
- When a download fails terminate with a clearer error message

.\build.ps1 -CefVersion 95.7.8+g69b7dc3+chromium-95.0.4638.17 -BuildArches "win-x86,win-x64"
.\build.ps1 -CefVersion 95.7.8+g69b7dc3+chromium-95.0.4638.17 -BuildArches "win-x86 win-x64 win-arm64"
.\build.ps1 -CefVersion 95.7.8+g69b7dc3+chromium-95.0.4638.17 -BuildArches "win-x86;win-x64;win-arm64"
  • Loading branch information
amaitland committed Oct 12, 2021
1 parent 62b46a3 commit 26010a5
Show file tree
Hide file tree
Showing 4 changed files with 607 additions and 546 deletions.
2 changes: 1 addition & 1 deletion NuGet/cef.sdk.props
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.94.0.5</CefSdkVer>
<CefSdkVer>cef.sdk.95.7.8</CefSdkVer>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions NuGet/chromiumembeddedframework.runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"runtimes": {
"win-x64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x64": "94.0.5"
"chromiumembeddedframework.runtime.win-x64": "95.7.8"
}
},
"win-x86": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-x86": "94.0.5"
"chromiumembeddedframework.runtime.win-x86": "95.7.8"
}
},
"win-arm64": {
"chromiumembeddedframework.runtime": {
"chromiumembeddedframework.runtime.win-arm64": "94.0.5"
"chromiumembeddedframework.runtime.win-arm64": "95.7.8"
}
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
<!-- Architecture-specific files folder hierarchy lost (native subfolders) -->
<!-- https://github.com/NuGet/Home/issues/7698#issuecomment-455368655 -->
<!-- We have to copy swiftshader and locales via manually -->
META_REPLACE_DATA
<file src="..\cef_binary_3.y.z_windows32\Resources\locales\*.pak" target="CEF\win-x86\locales"/>
<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\LICENSE.txt" target="LICENSE.txt" />
<file src="chromiumembeddedframework.runtime.json" target="runtime.json" />
<file src="chromiumembeddedframework.runtime.props" target="buildTransitive\" />
<file src="cef128x128.png" target="images\" />
Expand Down
Loading

0 comments on commit 26010a5

Please sign in to comment.