From 25e15869ec7b7bbbd0fc2394562174b2962dd07a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 3 Jul 2015 10:01:44 +0800
Subject: [PATCH] Force using VS2013 for building

---
 script/bootstrap.py | 3 ++-
 script/update.py    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/script/bootstrap.py b/script/bootstrap.py
index 60b7a83af66..fd9958d9ca1 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import subprocess
 import sys
 
 from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
@@ -113,7 +114,7 @@ def update_node_modules(dirname, env=None):
     if os.environ.has_key('CI'):
       try:
         execute_stdout(args, env)
-      except:
+      except subprocess.CalledProcessError:
         pass
     else:
       execute_stdout(args, env)
diff --git a/script/update.py b/script/update.py
index a03eb44f0d6..2cbfa706e6e 100755
--- a/script/update.py
+++ b/script/update.py
@@ -44,6 +44,8 @@ def run_gyp(target_arch, component):
   env = os.environ.copy()
   if PLATFORM == 'linux' and target_arch != get_host_arch():
     env['GYP_CROSSCOMPILE'] = '1'
+  elif PLATFORM == 'win32':
+    env['GYP_MSVS_VERSION'] = '2013'
   python = sys.executable
   if sys.platform == 'cygwin':
     # Force using win32 python on cygwin.