mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chrome -> chromium and updates to crashpad doc

Browse source
This commit is contained in:
Shelley Vohr 2017-11-24 10:35:57 +01:00
parent f91020a04d
commit 178462b800
No known key found for this signature in database
GPG key ID: F13993A75599653C
3 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/development/upgrading-chrome.md → docs/development/upgrading-chromium.md
View file

@ -1,4 +1,4 @@
# Upgrading Chromium Workflow # Upgrading Chromium
This document is meant to serve as an overview of what steps are needed This document is meant to serve as an overview of what steps are needed
on each Chromium upgrade in Electron. on each Chromium upgrade in Electron.

54
docs/development/upgrading-crashpad.md
View file

@ -1,35 +1,41 @@
- Get the version of crashpad that we're going to use. # Upgrading Crashpad
- `libcc/src/third_party/crashpad/README.chromium` will have a line `Revision:` with a checksum.
- clone [Electron's Crashpad fork](https://github.com/electron/crashpad) and create a new branch 1. Get the version of crashpad that we're going to use.
- `git clone https://chromium.googlesource.com/crashpad/crashpad` - `libcc/src/third_party/crashpad/README.chromium` will have a line `Revision:` with a checksum
- `git checkout 01110c0a3b` - We need to check out the correponding branch.
- `git remote add electron https://github.com/electron/crashpad` - Clone Google's crashpad (https://chromium.googlesource.com/crashpad/crashpad)
- `git checkout -b electron-crashpad-vA.B.C.D` - `git clone https://chromium.googlesource.com/crashpad/crashpad`
- `A.B.C.D` is the Chromium version found in `libcc/VERSION` - Check out the branch with the revision checksum:
- `git checkout <revision checksum>`
- Add electron's crashpad fork as a remote
- `git remote add electron https://github.com/electron/crashpad`
- Check out a new branch for the update
- `git checkout -b electron-crashpad-vA.B.C.D`
- `A.B.C.D` is the Chromium version found in `libcc/VERSION`
and will be something like `62.0.3202.94` and will be something like `62.0.3202.94`
- Make a checklist of the Electron patches we need to apply 2. Make a checklist of the Electron patches that need to be applied
e.g. `git log --oneline` with `git log --oneline`
or view http://github.com/electron/crashpad/commits/previous-branch-name - Or view http://github.com/electron/crashpad/commits/previous-branch-name
- Foreach patch:
- (in new branch) `git cherry-pick checksum`
- resolve any conflicts
- make sure it builds
- add && commit
- Push your work:
`git push electron electorn-crashpad-v62.0.3202.94`
- Update Electron to build the new crashpad: 3. For each patch:
- In `electron-crashpad-vA.B.C.D`, cherry-pick the patch's checksum
- `git cherry-pick <checksum>`
- Resolve any conflicts
- Make sure it builds then add, commit, and push work to electron's crashpad fork
- `git push electron electron-crashpad-vA.B.C.D`
4. Update Electron to build the new crashpad:
- `cd vendor/crashpad` - `cd vendor/crashpad`
- `git fetch` - `git fetch`
- `git checkout electron-crashpad-v62.0.3202.94` - `git checkout electron-crashpad-v62.0.3202.94`
- Regenerate Ninja files 5. Regenerate Ninja files against both targets
- from Electron root's root, run `script/update.py` - From Electron root's root, run `script/update.py`
- `script/build.py -c D --target=crashpad_client` - `script/build.py -c D --target=crashpad_client`
- `script/build.py -c D --target=crashpad_handler` - `script/build.py -c D --target=crashpad_handler`
- If both of these work, it's probably good. - Both should build with no errors
- Push changes to submodule reference 6. Push changes to submodule reference
- (from electron root) `git add vendor/crashpad` - (From electron root) `git add vendor/crashpad`
- `git push origin upgrade-to-chromium-62` - `git push origin upgrade-to-chromium-62`