From 9981fd51da73e4cabd67f8b92d37be0a843248b9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 19 Nov 2013 20:43:30 +0800 Subject: [PATCH] win: Fix error when bootstraping. --- common.gypi | 11 +++++++++++ script/bootstrap.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 9861a1b..d153c79 100644 --- a/common.gypi +++ b/common.gypi @@ -186,5 +186,16 @@ ], }, }], # msvs_express==1 + # The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations. + ['OS=="win"', { + 'target_defaults': { + 'configurations': { + 'Debug_x64': { + }, + 'Release_x64': { + }, + }, + }, + }], # OS=="win" ], } diff --git a/script/bootstrap.py b/script/bootstrap.py index 4ee4778..10dfde5 100755 --- a/script/bootstrap.py +++ b/script/bootstrap.py @@ -58,7 +58,7 @@ def bootstrap_brightray(url): def update_apm(): ## NB: Without this, subprocess incorrectly searches for npm.exe npm_cmd = 'npm' - if sys.platform == 'win32': + if sys.platform in ['win32', 'cygwin']: npm_cmd += '.cmd' with scoped_cwd(os.path.join('vendor', 'apm')): -- 2.7.4