Commit c6d904ca authored by Hans Wennborg's avatar Hans Wennborg Committed by Commit Bot

win_cross.md: Tweak the wording about creating one's own sdk package

The previous wording about 'you can obtain the Windows SDK' made it
sound like this is a way to obtain the SDK, but it's really about how
to package up an existing installation.

Also do some other minor tweaks.

Bug: none
Change-Id: I1b835cdfe951c7b32ec71bc5dd8f249c9fec0b0d
Reviewed-on: https://chromium-review.googlesource.com/1113455
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570027}
parent 2f131cfd
...@@ -35,29 +35,32 @@ cross builds ([.asm bug](https://crbug.com/762167)). ...@@ -35,29 +35,32 @@ cross builds ([.asm bug](https://crbug.com/762167)).
1. `gclient sync`, follow instructions on screen. 1. `gclient sync`, follow instructions on screen.
If you're at Google, this will automatically download the Windows SDK for you. If you're at Google, this will automatically download the Windows SDK for you.
If this fails with an error: Please follow the instructions at If this fails with an error:
https://www.chromium.org/developers/how-tos/build-instructions-windows
Please follow the instructions at
https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md
then you may need to re-authenticate via: then you may need to re-authenticate via:
cd path/to/chrome/src cd path/to/chrome/src
# Follow instructions, enter 0 as project id. # Follow instructions, enter 0 as project id.
download_from_google_storage --config download_from_google_storage --config
If you are not at Google, you can obtain the Windows SDK packaged in a zip If you are not at Google, you can package your Windows SDK installation
file by running the following in a Windows machine: into a zip file by running the following on a Windows machine:
cd path/to/depot_tools/win_toolchain cd path/to/depot_tools/win_toolchain
# customize the Windows SDK version numbers # customize the Windows SDK version numbers
python package_from_installed.py 2017 -w 10.0.17134.0 python package_from_installed.py 2017 -w 10.0.17134.0
These commands create a zip file named '<hash value>.zip'. Then, to use the These commands create a zip file named `<hash value>.zip`. Then, to use the
generated file in a Linux or Mac host, the following environment variables generated file in a Linux or Mac host, the following environment variables
need to be set: need to be set:
export DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL=<path/to/sdk/zip/file> export DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL=<path/to/sdk/zip/file>
export GYP_MSVS_<toolchain hash>=<hash value> export GYP_MSVS_<toolchain hash>=<hash value>
`toolchain_hash` is hardcoded in src/build/vs_toolchain.py and can be found by `toolchain_hash` is hardcoded in `src/build/vs_toolchain.py` and can be found by
setting `DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL` and running `gclient sync`: setting `DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL` and running `gclient sync`:
gclient sync gclient sync
...@@ -88,7 +91,7 @@ You can run the Windows binaries you built on swarming, like so: ...@@ -88,7 +91,7 @@ You can run the Windows binaries you built on swarming, like so:
See the contents of run-swarmed.py for how to do this manually. See the contents of run-swarmed.py for how to do this manually.
There's a bot doing 64-bit release cross builds at The
https://ci.chromium.org/buildbot/chromium.clang/linux-win_cross-rel/ [linux-win_cross-rel](https://ci.chromium.org/buildbot/chromium.clang/linux-win_cross-rel/)
which also runs tests. You can look at it to get an idea of which tests pass in buildbot does 64-bit release cross builds, and also runs tests. You can look at
the cross build. it to get an idea of which tests pass in the cross build.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment