oops, the upgrading-chrome.md changes belonged in a separate PR

This commit is contained in:
Charles Kerr 2017-11-24 11:19:53 +01:00
parent 3e3cac6f1b
commit b59557569c

View file

@ -19,30 +19,24 @@ on each Chromium upgrade in Electron.
$ cd libchromiumcontent $ cd libchromiumcontent
$ ./script/bootstrap -v $ ./script/bootstrap -v
``` ```
### 2. Update the Chromium snapshot ### 2. Find the new beta/stable Chromium version from [OmahaProxy](https://omahaproxy.appspot.com/).
- Choose a version number from [OmahaProxy](https://omahaproxy.appspot.com/) and update the `VERSION` file with it ### 3. Put it into the `libchromiumcontent/VERSION` file, then run `$ ./script/update`
- 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. - It will probably fail applying patches.
### 4. Fix `*.patch` files in the `/patches` and `/patches-mas` folders.
### 3. Fix `*.patch` files in the `/patches` and `/patches-mas` folders. ### 5. (Optional) Run a separate script to apply patches (`script/update` uses it internally):
### 4. (Optional) Run a separate script to apply patches (`script/update` uses it internally):
```sh ```sh
$ ./script/apply-patches $ ./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` - 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 ```sh
$ ./script/build $ ./script/build
``` ```
- If some patches are no longer compatible with the Chromium code, fix compilation errors. - 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` `$ ./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. - 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 ## Update Electron Code