diff --git a/DEPS b/DEPS index cc0c9f67e..e4da8735a 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { "chromium_trunk" : "http://src.chromium.org/svn/trunk", # chrome://version/ for revision of canary Chrome. # http://chromium-status.appspot.com/lkgr is a last known good revision. - "chromium_revision": "260824", + "chromium_revision": "262938", } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than @@ -58,6 +58,9 @@ deps = { "tools/win/supalink": Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"), + "third_party/binutils": + Var("chromium_trunk") + "/src/third_party/binutils@" + Var("chromium_revision"), + "third_party/libjpeg_turbo": From("chromium_deps", "src/third_party/libjpeg_turbo"), @@ -84,10 +87,6 @@ deps_os = { "tools/find_depot_tools": File(Var("chromium_trunk") + "/src/tools/find_depot_tools.py@" + Var("chromium_revision")), }, - "unix": { - "third_party/binutils": - From("chromium_deps", "src/third_party/binutils@" + Var("chromium_revision")), - }, "android": { "third_party/android_tools": From("chromium_deps", "src/third_party/android_tools"), @@ -174,12 +173,19 @@ hooks = [ "action": ["python", Var("root_dir") + "/tools/clang/scripts/update.py", "--if-needed"], }, + { + # Update the Windows toolchain if necessary. + "name": "win_toolchain", + "pattern": ".", + "action": ["python", Var("root_dir") + "/download_vs_toolchain.py", + "update"], + }, { # Pull binutils for gold. "name": "binutils", "pattern": ".", "action": ["python", Var("root_dir") + "/third_party/binutils/download.py"], - }, + }, { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "pattern": ".", diff --git a/README.chromium b/README.chromium index 924cb360f..d0363f5bc 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 999 +Version: 1000 License: BSD License File: LICENSE diff --git a/download_vs_toolchain.py b/download_vs_toolchain.py new file mode 100644 index 000000000..4b3457899 --- /dev/null +++ b/download_vs_toolchain.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# +# Copyright 2014 The LibYuv Project Authors. All rights reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +# This script is used to run the vs_toolchain.py script to download the +# Visual Studio toolchain. It's just a temporary measure while waiting for the +# Chrome team to move find_depot_tools into src/build to get rid of these +# workarounds (similar one in gyp_libyuv). + +import os +import sys + + +checkout_root = os.path.dirname(os.path.realpath(__file__)) +sys.path.insert(0, os.path.join(checkout_root, 'build')) +sys.path.insert(0, os.path.join(checkout_root, 'tools', 'find_depot_tools')) + + +import vs_toolchain + + +if __name__ == '__main__': + sys.exit(vs_toolchain.main()) diff --git a/gyp_libyuv b/gyp_libyuv index 9bd23f199..64d426ec0 100755 --- a/gyp_libyuv +++ b/gyp_libyuv @@ -50,7 +50,7 @@ if __name__ == '__main__': if not os.environ.get('GYP_GENERATORS'): os.environ['GYP_GENERATORS'] = 'ninja' - vs2013_runtime_dll_dirs = vs_toolchain.DownloadVsToolchain() + vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() # Enforce gyp syntax checking. This adds about 20% execution time. args.append('--check') diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 005918fff..a61c45fc0 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 999 +#define LIBYUV_VERSION 1000 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT