Skip to content

Commit

Permalink
servo: Merge #20320 - feat(capture_webrender): write webrender revisi…
Browse files Browse the repository at this point in the history
…on into text (from kwonoj:feat-wr-revision); r=jdm

<!-- Please describe your changes on the following line: -->
Relates to servo/servo#20315 (comment).

This PR try to generate `wr.txt` when trigger webrender capture. By reading gecko's implementation at [here](https://github.com/mozilla/gecko-dev/blob/3b8e63c66ae1989cfc2c7fb48ca9e025a3828e74/gfx/doc/README.webrender#L53), it seems gecko's build script generates txt file for containing revision of webrender and read it each time trigger capturing.

In this PR tries to similar in cruxwise with small differences:
- `cargo build` reads `cargo.lock`, export it into `${OUT_DIR}/`, included via macro in build time.
- when capturing triggered, those revision will be written as `wr.txt`.

Probably point of discussion & need to be updated in PR if necessary:
~- Is it acceptable `mach` generates module file on build bootstrapping? Should there be other recommendation?~ Now cargo build takes care of generation.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20295 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

- This PR manually verified on local mac OS machine.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 91398cf559ddeec8974e04b0a92e464669436177

UltraBlame original commit: cf3b8e9c9c2a290b09376c5e2b720fe1124eeacb
  • Loading branch information
marco-c committed Oct 2, 2019
1 parent 93162ef commit d228d37
Show file tree
Hide file tree
Showing 4 changed files with 729 additions and 3 deletions.
29 changes: 29 additions & 0 deletions servo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions servo/components/compositing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ MPL
publish
=
false
build
=
"
build
.
rs
"
[
lib
]
Expand Down Expand Up @@ -282,3 +289,17 @@ ipc
"
]
}
[
build
-
dependencies
]
toml
=
"
0
.
4
.
5
"

0 comments on commit d228d37

Please sign in to comment.