Merge pull request #11379 from TiagoDanin-Forks/upgrading_chromium_doc
Fix formatting in documentation
This commit is contained in:
commit
de1edeea0b
2 changed files with 28 additions and 40 deletions
|
@ -12,10 +12,11 @@ This is an overview of the steps needed to upgrade Chromium in Electron.
|
||||||
## Upgrade `libcc` to a new Chromium version
|
## Upgrade `libcc` to a new Chromium version
|
||||||
|
|
||||||
1. Get the code and initialize the project:
|
1. Get the code and initialize the project:
|
||||||
- ```sh
|
```sh
|
||||||
$ git clone git@github.com:electron/libchromiumcontent.git
|
$ git clone git@github.com:electron/libchromiumcontent.git
|
||||||
$ cd libchromiumcontent
|
$ cd libchromiumcontent
|
||||||
$ ./script/bootstrap -v```
|
$ ./script/bootstrap -v
|
||||||
|
```
|
||||||
2. Update the Chromium snapshot
|
2. Update the Chromium snapshot
|
||||||
- Choose a version number from [OmahaProxy](https://omahaproxy.appspot.com/)
|
- Choose a version number from [OmahaProxy](https://omahaproxy.appspot.com/)
|
||||||
and update the `VERSION` file with it
|
and update the `VERSION` file with it
|
||||||
|
@ -47,18 +48,18 @@ This is an overview of the steps needed to upgrade Chromium in Electron.
|
||||||
## Update Electron's code
|
## Update Electron's code
|
||||||
|
|
||||||
1. Get the code:
|
1. Get the code:
|
||||||
- ```sh
|
```sh
|
||||||
$ git clone git@github.com:electron/electron.git
|
$ git clone git@github.com:electron/electron.git
|
||||||
$ cd electron
|
$ cd electron
|
||||||
```
|
```
|
||||||
2. If you have libcc built on your machine in its own repo,
|
2. If you have libcc built on your machine in its own repo,
|
||||||
tell Electron to use it:
|
tell Electron to use it:
|
||||||
- ```sh
|
```sh
|
||||||
$ ./script/bootstrap.py -v \
|
$ ./script/bootstrap.py -v \
|
||||||
--libcc_source_path <libcc_folder>/src \
|
--libcc_source_path <libcc_folder>/src \
|
||||||
--libcc_shared_library_path <libcc_folder>/shared_library \
|
--libcc_shared_library_path <libcc_folder>/shared_library \
|
||||||
--libcc_static_library_path <libcc_folder>/static_library
|
--libcc_static_library_path <libcc_folder>/static_library
|
||||||
```
|
```
|
||||||
3. If you haven't yet built libcc but it's already supposed to be upgraded
|
3. If you haven't yet built libcc but it's already supposed to be upgraded
|
||||||
to a new Chromium, bootstrap Electron as usual
|
to a new Chromium, bootstrap Electron as usual
|
||||||
`$ ./script/bootstrap.py -v`
|
`$ ./script/bootstrap.py -v`
|
||||||
|
|
|
@ -82,7 +82,7 @@ We need to generate a patch file from each patch applied to V8.
|
||||||
Manually edit the `.patch` file to match upstream V8's directory:
|
Manually edit the `.patch` file to match upstream V8's directory:
|
||||||
- If a diff section has no instances of `deps/V8`, remove it altogether.
|
- If a diff section has no instances of `deps/V8`, remove it altogether.
|
||||||
- We don’t want those patches because we’re only patching V8.
|
- We don’t want those patches because we’re only patching V8.
|
||||||
- Replace instances of `a/deps/v8`/filename.ext` with `a/filename.ext`
|
- Replace instances of `a/deps/v8/filename.ext` with `a/filename.ext`
|
||||||
- This is needed because upstream Node keeps its V8 files in a subdirectory
|
- This is needed because upstream Node keeps its V8 files in a subdirectory
|
||||||
- Ensure that local status is clean: `git status` to make sure there are no unstaged changes.
|
- Ensure that local status is clean: `git status` to make sure there are no unstaged changes.
|
||||||
- Confirm that the patch applies cleanly with
|
- Confirm that the patch applies cleanly with
|
||||||
|
@ -105,20 +105,20 @@ We need to generate a patch file from each patch applied to V8.
|
||||||
- `git commit patches/v8/`
|
- `git commit patches/v8/`
|
||||||
8. Update `patches/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
|
8. Update `patches/v8/README.md` with references to all new patches that have been added so that the next person will know which need to be removed.
|
||||||
9. Update Electron's submodule references:
|
9. Update Electron's submodule references:
|
||||||
- ```sh
|
```sh
|
||||||
cd electron/vendor/node
|
$ cd electron/vendor/node
|
||||||
electron/vendor/node$ git fetch
|
electron/vendor/node$ git fetch
|
||||||
electron/vendor/node$ git checkout electron-node-vA.B.C
|
electron/vendor/node$ git checkout electron-node-vA.B.C
|
||||||
electron/vendor/node$ cd ../libchromiumcontent
|
electron/vendor/node$ cd ../libchromiumcontent
|
||||||
electron/vendor/libchromiumcontent$ git fetch
|
electron/vendor/libchromiumcontent$ git fetch
|
||||||
electron/vendor/libchromiumcontent$ git checkout upgrade-to-chromium-X
|
electron/vendor/libchromiumcontent$ git checkout upgrade-to-chromium-X
|
||||||
electron/vendor/libchromiumcontent$ cd ../..
|
electron/vendor/libchromiumcontent$ cd ../..
|
||||||
electron$ git add vendor
|
electron$ git add vendor
|
||||||
electron$ git commit -m "update submodule referefences for node and libc"
|
electron$ git commit -m "update submodule referefences for node and libc"
|
||||||
electron$ git pso upgrade-to-chromium-62
|
electron$ git pso upgrade-to-chromium-62
|
||||||
electron$ script/bootstrap.py -d
|
electron$ script/bootstrap.py -d
|
||||||
electron$ script/build.py -c -D
|
electron$ script/build.py -c -D
|
||||||
```
|
```
|
||||||
|
|
||||||
## Notes
|
## Notes
|
||||||
|
|
||||||
|
@ -143,16 +143,3 @@ We need to generate a patch file from each patch applied to V8.
|
||||||
- Building node:
|
- Building node:
|
||||||
- There’s a chance we need to change our build configuration
|
- There’s a chance we need to change our build configuration
|
||||||
to match the build flags that node wants in `node/common.gypi`
|
to match the build flags that node wants in `node/common.gypi`
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue