diff options
author | David Benjamin <davidben@google.com> | 2016-04-22 15:02:23 -0400 |
---|---|---|
committer | David Benjamin <davidben@google.com> | 2016-04-29 16:36:16 -0400 |
commit | 4969cc9b0ab2905ec478277f50ed3849b37a6c6b (patch) | |
tree | 552fde383dce1efd213ae145fff808806d76a225 /src/util/bot | |
parent | 09f2501f7faf115dc26e0c2310b3ea8c97f66007 (diff) | |
download | boringssl-4969cc9b0ab2905ec478277f50ed3849b37a6c6b.tar.gz |
external/boringssl: Sync to d18cb77.
This includes the following changes which are far too many to list here:
https://boringssl.googlesource.com/boringssl/+log/7b8b9c17db93ea5287575b437c77fb36eeb81b31..d18cb77864dcc4b5c7cb08c2331008c01165f34f
This also retires one function from android_compat_hacks.c which is no longer
necessary.
Change-Id: Ie00536d7ad815464b2b031f7bcd1b683e12c1623
Diffstat (limited to 'src/util/bot')
-rw-r--r-- | src/util/bot/DEPS | 2 | ||||
-rw-r--r-- | src/util/bot/UPDATING | 46 | ||||
-rw-r--r-- | src/util/bot/cmake-linux64.tar.gz.sha1 | 2 | ||||
-rw-r--r-- | src/util/bot/cmake-mac.tar.gz.sha1 | 2 | ||||
-rw-r--r-- | src/util/bot/cmake-win32.zip.sha1 | 2 | ||||
-rwxr-xr-x | src/util/bot/go/bootstrap.py | 2 | ||||
-rw-r--r-- | src/util/bot/perl-win32.zip.sha1 | 2 | ||||
-rw-r--r-- | src/util/bot/update_clang.py | 2 | ||||
-rw-r--r-- | src/util/bot/vs_toolchain.py | 2 |
9 files changed, 54 insertions, 8 deletions
diff --git a/src/util/bot/DEPS b/src/util/bot/DEPS index 738fbd3d..0a4de211 100644 --- a/src/util/bot/DEPS +++ b/src/util/bot/DEPS @@ -18,7 +18,7 @@ vars = { deps = { 'boringssl/util/bot/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + '4a9b712d5cb4a5ba7a9950128a7219569caf7263', + Var('chromium_git') + '/external/gyp.git' + '@' + '61259d585ce99d9de8b35188cd0025bdbcb58411', } hooks = [ diff --git a/src/util/bot/UPDATING b/src/util/bot/UPDATING new file mode 100644 index 00000000..4e16c6dd --- /dev/null +++ b/src/util/bot/UPDATING @@ -0,0 +1,46 @@ +This directory consumes tools from other repositories for use on the +bots. To update to newer revisions, follow these instructions: + +DEPS: Set the external/gyp.git revision to the revision used in Chromium, found at + https://chromium.googlesource.com/chromium/src/+/master/DEPS + (Search for 'gyp.git'.) + +go/bootstrap.py: Set TOOLSET_VERSION to the latest release of Go, found at + https://golang.org/dl/. + +update_clang.py: Set CLANG_REVISION and CLANG_SUB_REVISION to the values used in + Chromium, found at + https://chromium.googlesource.com/chromium/src/+/master/tools/clang/scripts/update.py + +vs_toolchain.py: Set the hash in _GetDesiredVsToolchainHashes to the toolchain + used in Chromium, found at + https://chromium.googlesource.com/chromium/src/+/master/build/vs_toolchain.py + This may require taking other updates to that file. + +The .sha1 files correspond to files downloaded from Google Cloud Storage. To +update, place the updated files in their intended location and run: + + upload_to_google_storage.py -b chromium-tools FILE + +cmake-linux64.tar.gz: Download the latest CMake source tarball, found at + https://cmake.org/download/. Build it with: + + ./bootstrap --prefix=$PWD/cmake-linux64 && make && make install + tar -czf cmake-linux64.tar.gz cmake-linux64/ + +cmake-mac.tar.gz: Follow the same instructions as above on a Mac, but replace + cmake-linux64 with cmake-mac. + +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. + +perl-win32.zip: Update to the latest 32-bit prebuilt "PortableZip" edition of + Strawberry Perl, found at http://strawberryperl.com/releases.html. The + download will be named strawberry-perl-VERSION-32bit-portable.zip. + +yasm-win32.exe: Update to the appropriate release of Yasm. Use the same version + as Chromium, found at + https://chromium.googlesource.com/chromium/src/+/master/third_party/yasm/README.chromium + Use the release at http://yasm.tortall.net/Download.html labeled + "Win32 .exe". The download will be named yasm-VERSION-win32.exe. diff --git a/src/util/bot/cmake-linux64.tar.gz.sha1 b/src/util/bot/cmake-linux64.tar.gz.sha1 index 6a8aa1c9..404570f6 100644 --- a/src/util/bot/cmake-linux64.tar.gz.sha1 +++ b/src/util/bot/cmake-linux64.tar.gz.sha1 @@ -1 +1 @@ -32cd1d5fe84ae569dbb36f5767650d62efb8be38
\ No newline at end of file +6ea4ad07a4bab113ea74c45fafb14b8d0b0feab5
\ No newline at end of file diff --git a/src/util/bot/cmake-mac.tar.gz.sha1 b/src/util/bot/cmake-mac.tar.gz.sha1 index cb7251ba..19c9b61f 100644 --- a/src/util/bot/cmake-mac.tar.gz.sha1 +++ b/src/util/bot/cmake-mac.tar.gz.sha1 @@ -1 +1 @@ -310df6945ae7f8c9da559d22f5794ee8e578a663
\ No newline at end of file +f3166dab96234c9516ece56dc2851bf4c8e70fe8
\ No newline at end of file diff --git a/src/util/bot/cmake-win32.zip.sha1 b/src/util/bot/cmake-win32.zip.sha1 index 9196b58c..6bb460eb 100644 --- a/src/util/bot/cmake-win32.zip.sha1 +++ b/src/util/bot/cmake-win32.zip.sha1 @@ -1 +1 @@ -e9493171de0edd8879755aa7229a701010a19561
\ No newline at end of file +ed4e1939d246374b0bae724a1a4200fd60e7efe8
\ No newline at end of file diff --git a/src/util/bot/go/bootstrap.py b/src/util/bot/go/bootstrap.py index 4a52d9eb..28aa13da 100755 --- a/src/util/bot/go/bootstrap.py +++ b/src/util/bot/go/bootstrap.py @@ -45,7 +45,7 @@ WORKSPACE = os.path.join(ROOT, 'go') EXE_SFX = '.exe' if sys.platform == 'win32' else '' # Pinned version of Go toolset to download. -TOOLSET_VERSION = 'go1.5.1' +TOOLSET_VERSION = 'go1.6' # Platform dependent portion of a download URL. See http://golang.org/dl/. TOOLSET_VARIANTS = { diff --git a/src/util/bot/perl-win32.zip.sha1 b/src/util/bot/perl-win32.zip.sha1 index a5559d8a..8874fbbb 100644 --- a/src/util/bot/perl-win32.zip.sha1 +++ b/src/util/bot/perl-win32.zip.sha1 @@ -1 +1 @@ -ab6e7aee6a915c4d820b86f5227094763b649fce
\ No newline at end of file +3db2b4964d56f6e23cc48ced40a6cee05419a0af
\ No newline at end of file diff --git a/src/util/bot/update_clang.py b/src/util/bot/update_clang.py index 18243934..48d0d9bb 100644 --- a/src/util/bot/update_clang.py +++ b/src/util/bot/update_clang.py @@ -22,7 +22,7 @@ import urllib # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang # to use. These should be synced with tools/clang/scripts/update.py in # Chromium. -CLANG_REVISION = "233105" +CLANG_REVISION = "261368" CLANG_SUB_REVISION = "1" PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION) diff --git a/src/util/bot/vs_toolchain.py b/src/util/bot/vs_toolchain.py index 2a54b9e5..175502e7 100644 --- a/src/util/bot/vs_toolchain.py +++ b/src/util/bot/vs_toolchain.py @@ -65,7 +65,7 @@ def _GetDesiredVsToolchainHashes(): """Load a list of SHA1s corresponding to the toolchains that we want installed to build with.""" # Use Chromium's VS2013. - return ['ee7d718ec60c2dc5d255bbe325909c2021a7efef'] + return ['4087e065abebdca6dbd0caca2910c6718d2ec67f'] def FindDepotTools(): |