win: Fix error when bootstraping.
authorCheng Zhao <zcbenz@gmail.com>
Tue, 19 Nov 2013 12:43:30 +0000 (20:43 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 19 Nov 2013 12:43:30 +0000 (20:43 +0800)
common.gypi
script/bootstrap.py

index 9861a1b..d153c79 100644 (file)
         ],
       },
     }],  # 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"
   ],
 }
index 4ee4778..10dfde5 100755 (executable)
@@ -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')):