mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Force using VS2013 for building

Browse source
This commit is contained in:
Cheng Zhao 2015-07-03 10:01:44 +08:00
parent b3c76f3904
commit 25e15869ec
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
script/bootstrap.py
View file

@ -2,6 +2,7 @@
import argparse import argparse
import os import os
import subprocess
import sys import sys
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \ 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'): if os.environ.has_key('CI'):
try: try:
execute_stdout(args, env) execute_stdout(args, env)
except: except subprocess.CalledProcessError:
pass pass
else: else:
execute_stdout(args, env) execute_stdout(args, env)

2
script/update.py
View file

@ -44,6 +44,8 @@ def run_gyp(target_arch, component):
env = os.environ.copy() env = os.environ.copy()
if PLATFORM == 'linux' and target_arch != get_host_arch(): if PLATFORM == 'linux' and target_arch != get_host_arch():
env['GYP_CROSSCOMPILE'] = '1' env['GYP_CROSSCOMPILE'] = '1'
elif PLATFORM == 'win32':
env['GYP_MSVS_VERSION'] = '2013'
python = sys.executable python = sys.executable
if sys.platform == 'cygwin': if sys.platform == 'cygwin':
# Force using win32 python on cygwin. # Force using win32 python on cygwin.