copyediting

This commit is contained in:
Charles Kerr 2017-11-26 08:44:37 +01:00
parent 81bc0efc75
commit 295945b806

View file

@ -23,25 +23,25 @@ This is an overview of the steps needed to upgrade Chromium in Electron.
- One-liner for the latest stable mac version: `curl -so- https://omahaproxy.appspot.com/mac > VERSION` - 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` - 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` - run `$ ./script/update`
- Time to brew some tea -- this may run for 30m or more. - Brew some tea -- this may run for 30m or more.
- It will probably fail applying patches. - It will probably fail applying patches.
3. Fix `*.patch` files in the `patches/` and `patches-mas/` folders. 3. Fix `*.patch` files in the `patches/` and `patches-mas/` folders.
4. (Optional) Run a separate script to apply patches 4. (Optional) `script/update` applies patches, but if multiple tries are needed
(`script/update` uses it internally): you can manually run the same script that `update` calls:
- `$ ./script/apply-patches` `$ ./script/apply-patches`
- There is also another script `/script/patch.py` that could be more useful - There is a second script, `script/patch.py` that may be useful.
- Check `--help` to learn how it works with `$ ./script/patch.py -h` Read `./script/patch.py -h` for more information.
5. Run the build when all patches can be applied without errors 5. Run the build when all patches can be applied without errors
- `$ ./script/build` - `$ ./script/build`
- If some patches are no longer compatible with the Chromium code, - If some patches are no longer compatible with the Chromium code,
fix compilation errors. fix compilation errors.
6. When build succeeds, create a `dist` for Electron 6. When the 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 - It will create a `dist/main` folder in the libcc repo's root.
- You will need it to build Electron. You will need this to build Electron.
7. (Optional) Update script contents if there are errors resulting from files 7. (Optional) Update script contents if there are errors resulting from files
being removed or renamed. (`--no_zip` prevents script from create `dist` that were removed or renamed. (`--no_zip` prevents script from create `dist`
archives, you don't need them.) archives. You don't need them.)
## Update Electron's code ## Update Electron's code