Sfoglia il codice sorgente

Switch to 64-bit tools on Windows.

It's 2018. I'm not sure why I added the 32-bit ones; even the 32-bit
bots build and run on 64-bit Windows. ninja.exe in depot_tools is also a
64-bit binary. I suspect this is because some of the depot_tools bits
use --platform=win32, but that's just the sys.platform string.

Alas, I stupidly named these "win32" way back. Dealing with the rename
is probably more trouble than worth it right now since the build recipes
refer to the name. Something to deal with later. (Regardless we'll want
"win32" to point to 64-bit binaries so that try jobs can test it.)

Also add the missing nasm-win32.exe to .gitignore.

For some reason the 64-bit Yasm binary does not work on the vs2017 CQ
bots, so I've left it alone. Hopefully it should be replaced by NASM
later anyway.

Change-Id: If65ececddbc6526ceebaafbef56eddea8ece58ba
Reviewed-on: https://boringssl-review.googlesource.com/29384
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
kris/onging/CECPQ3_patch15
David Benjamin 6 anni fa
committed by CQ bot account: commit-bot@chromium.org
parent
commit
26f8297177
5 ha cambiato i file con 14 aggiunte e 11 eliminazioni
  1. +1
    -0
      .gitignore
  2. +10
    -8
      util/bot/UPDATING
  3. +1
    -1
      util/bot/cmake-win32.zip.sha1
  4. +1
    -1
      util/bot/nasm-win32.exe.sha1
  5. +1
    -1
      util/bot/perl-win32.zip.sha1

+ 1
- 0
.gitignore Vedi File

@@ -17,6 +17,7 @@ util/bot/golang
util/bot/gyp
util/bot/libFuzzer
util/bot/llvm-build
util/bot/nasm-win32.exe
util/bot/perl-win32
util/bot/perl-win32.zip
util/bot/sde-linux64


+ 10
- 8
util/bot/UPDATING Vedi File

@@ -36,26 +36,26 @@ cmake-mac.tar.gz: Follow the same instructions as above on a Mac, but replace
The current revision was built against cmake-3.10.0.tar.gz.

cmake-win32.zip: Update to the latest prebuilt release of CMake, found at
https://cmake.org/download/. Use the file labeled "Windows ZIP". The
download will be named cmake-VERSION-win32-x86.zip.
https://cmake.org/download/. Use the file labeled "Windows win64-x64
ZIP". The download will be named cmake-VERSION-win64-x64.zip.

The current revision is cmake-3.10.1-win32-x86.zip.
The current revision is cmake-3.11.4-win64-x64.zip

nasm-win32.exe: Update to the appropriate release of NASM, found at
https://www.nasm.us/. Use the same version as Chromium, found at
https://chromium.googlesource.com/chromium/src/+/master/third_party/nasm/README.chromium
Extract nasm.exe from the download named nasm-VERSION-win32.zip.
Extract nasm.exe from the download named nasm-VERSION-win64.zip.

The current revision is nasm-2.13.03-win32.zip.
The current revision is nasm-2.13.03-win64.zip.

TODO(davidben): The Chromium link currently does not work. It will get
filled in in the future. See https://crbug.com/766721.

perl-win32.zip: Update to the latest 32-bit prebuilt "Portable" edition of
perl-win32.zip: Update to the latest 64-bit prebuilt "Portable" edition of
Strawberry Perl, found at http://strawberryperl.com/releases.html. The
download will be named strawberry-perl-VERSION-32bit-portable.zip.
download will be named strawberry-perl-VERSION-64bit-portable.zip.

The current revision is strawberry-perl-5.26.1.1-32bit-portable.zip.
The current revision is strawberry-perl-5.26.2.1-64bit-portable.zip.

yasm-win32.exe: Update to the appropriate release of Yasm. Use the same version
as Chromium, found at
@@ -73,3 +73,5 @@ but upload it with the following command. (Note the bucket is different.)
upload_to_google_storage.py -b chrome-boringssl-sde sde-linux64.tar.bz2

The current revision is sde-external-8.9.0-2017-08-06-lin.tar.bz2.

When adding new files, remember to update .gitignore.

+ 1
- 1
util/bot/cmake-win32.zip.sha1 Vedi File

@@ -1 +1 @@
f3ba5a7d4be36d6eba1795011ba0926bb651f35f
f4fac544e5d8392b3f2fcc967e22b473d7cf8e79

+ 1
- 1
util/bot/nasm-win32.exe.sha1 Vedi File

@@ -1 +1 @@
41438548185ed402ad713b4d5b90187737585d4a
fe003e1128188bba6f54307802051f2eddfdee85

+ 1
- 1
util/bot/perl-win32.zip.sha1 Vedi File

@@ -1 +1 @@
1245124da188c699fb41c4b5a60622bd0d363106
10a112b4d5f4efbbba4e45ccbe1fa50943e106c6

Caricamento…
Annulla
Salva