diff --git a/docs/development/upgrading-chrome.md b/docs/development/upgrading-chrome.md index ed00e710183..07e137b97f3 100644 --- a/docs/development/upgrading-chrome.md +++ b/docs/development/upgrading-chrome.md @@ -14,35 +14,29 @@ on each Chromium upgrade in Electron. ### Steps ### 1. Get the code and initialize the project: - ```sh - $ git clone git@github.com:electron/libchromiumcontent.git - $ cd libchromiumcontent - $ ./script/bootstrap -v - ``` -### 2. Update the Chromium snapshot - - Choose a version number from [OmahaProxy](https://omahaproxy.appspot.com/) and update the `VERSION` file with it - - This can be done manually by visiting OmahaProxy in a browser, or automatically: - - One-liner for the latest stable mac version: `curl -so- https://omahaproxy.appspot.com/mac > VERSION` - - One-liner for the latest win64 beta version: `curl -so- https://omahaproxy.appspot.com/all | grep "win64,beta" | awk -F, 'NR==1{print $3}' > VERSION` - - run `$ ./script/update` - - Time to brew some tea -- this may run for 30m or more. - - It will probably fail applying patches. - -### 3. Fix `*.patch` files in the `/patches` and `/patches-mas` folders. -### 4. (Optional) Run a separate script to apply patches (`script/update` uses it internally): +```sh +$ git clone git@github.com:electron/libchromiumcontent.git +$ cd libchromiumcontent +$ ./script/bootstrap -v +``` +### 2. Find the new beta/stable Chromium version from [OmahaProxy](https://omahaproxy.appspot.com/). +### 3. Put it into the `libchromiumcontent/VERSION` file, then run `$ ./script/update` + - It will probably fail applying patches. +### 4. Fix `*.patch` files in the `/patches` and `/patches-mas` folders. +### 5. (Optional) Run a separate script to apply patches (`script/update` uses it internally): ```sh $ ./script/apply-patches ``` - There is also another script `/script/patch.py` that could be more useful, check `--help` to learn how it works with `$ ./script/patch.py -h` -### 5. Run the build when all patches can be applied without errors +### 6. Run the build when all patches can be applied without errors ```sh $ ./script/build ``` - If some patches are no longer compatible with the Chromium code, fix compilation errors. -### 6. When build succeeds, create a `dist` for Electron +### 7. When build succeeds, create a `dist` for Electron `$ ./script/create-dist --no_zip` - It will create `dist/main` folder in the root of the libcc repo, you will need it to build Electron. -### 7. (Optional) Update script contents if there are errors resultant of some files being removed or renamed. (`--no_zip` prevents script from create `dist` archives, you don't need them.) +### 8. (Optional) Update script contents if there are errors resultant of some files being removed or renamed. (`--no_zip` prevents script from create `dist` archives, you don't need them.) ## Update Electron Code