Skip to content

Commit

Permalink
Update cppwinrt to build 2.0.210304.5 (flutter#24801)
Browse files Browse the repository at this point in the history
This fixes an issue in CppWinRT related to std::terminate(); the tool
now uses abort() instead.

CppWinRT patch: microsoft/cppwinrt#868

This also fixes a couple bugs in the README.md:
* Uses tmp as the temp dir into which we unpack the nupkg archive rather
  than cppwinrt to avoid confusion with the containing directory, which is
  named cppwinrt.
* Fixes a typo around the directory from which the cipd command should
  be executed.
  • Loading branch information
cbracken authored Mar 5, 2021
1 parent 2d70d5d commit 2b3a194
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ deps = {
'packages': [
{
'package': 'flutter/cppwinrt/win-amd64',
'version': 'build:2.0.210301.1'
'version': 'build:2.0.210304.5'
}
],
'condition': 'download_windows_deps',
Expand Down
2 changes: 1 addition & 1 deletion tools/cipd/cppwinrt/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Temp directory into which we unpack the .nupkg archive
cppwinrt
tmp

# nupkg archives
*.nupkg
5 changes: 2 additions & 3 deletions tools/cipd/cppwinrt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ To update the CIPD package, follow these steps:
```
unzip microsoft.windows.cppwinrt.<version_number>.nupkg -d tmp
```
4. `cd` into the `tmp` directory.
4. Create the CIPD package:
```
cipd create --pkg-def ../cppwinrt-win-amd64.cipd.yaml`
cipd create --pkg-def cppwinrt-win-amd64.cipd.yaml
```
The tool should output that the package was successfully uploaded and
verified, including the package path and an identifier SHA.
Expand All @@ -42,7 +41,7 @@ To update the CIPD package, follow these steps:
```
6. Verify the package was successfully created and tagged:
```
cipd describe flutter/cppwinrt/win-amd64 <new_version_sha>
cipd describe flutter/cppwinrt/win-amd64 -version <new_version_sha>
```
7. Delete the archive and temp directory:
```
Expand Down
2 changes: 1 addition & 1 deletion tools/cipd/cppwinrt/cppwinrt-win-amd64.cipd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package: flutter/cppwinrt/win-amd64
description: C++/WinRT tool used for building WinRT headers for Windows UWP builds
install_mode: copy
# The temp directory into which the nupkg archive is extracted.
root: cppwinrt
root: tmp
data:
# Contents of the cppwinrt/ directory are at the root of the CIPD package.
- dir: .

0 comments on commit 2b3a194

Please sign in to comment.