Make blink_trybot recipe work on windows

scripts/slave/recipe_modules/chromium/config.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from slave.recipe_configs_util import config_item_context, ConfigGroup
 from slave.recipe_configs_util import DictConfig, SimpleConfig, StaticConfig
 from slave.recipe_configs_util import SetConfig, BadConf
 
 # Because of the way that we use decorators, pylint can't figure out the proper
 # type signature of functions annotated with the @config_ctx decorator.
@@ skipping 44 matching lines @@
   return 'Debug' if build_config == 'Debug' else 'Release'
 
 # Because bits and arch actually accept None as a valid parameter,
 # give them a means of distinguishing when they've been passed a default
 # argument v. None
 HostPlatformValue = object()
 
 # Schema for config items in this module.
 def BaseConfig(HOST_PLATFORM=None, HOST_ARCH=None, HOST_BITS=None,
                TARGET_PLATFORM=None, TARGET_ARCH=HostPlatformValue,
-               TARGET_BITS=HostPlatformValue, BUILD_CONFIG=norm_build_config()):
+               TARGET_BITS=HostPlatformValue, BUILD_CONFIG=norm_build_config(),
+               **_kwargs):

[agable, 2013/06/25 15:55:28]

why?

[iannucci, 2013/06/25 21:22:09]

Because when you set_config(..., SOME_OPTION=Data), SOME_OPTION is passed to all
the schema functions.

   assert HOST_PLATFORM and HOST_ARCH and HOST_BITS
   TARGET_PLATFORM = TARGET_PLATFORM or HOST_PLATFORM
   TARGET_ARCH = HOST_ARCH if TARGET_ARCH is HostPlatformValue else TARGET_ARCH
   TARGET_BITS = HOST_BITS if TARGET_BITS is HostPlatformValue else TARGET_BITS
 
   return ConfigGroup(
     compile_py = ConfigGroup(
       default_targets = SetConfig(str),
       build_tool = SimpleConfig(str),
       compiler = SimpleConfig(str, required=False),
     ),
     gyp_env = ConfigGroup(
       GYP_DEFINES = DictConfig(lambda i: ('%s=%s' % i), ' '.join, (str,int)),
       GYP_GENERATORS = SetConfig(str, ','.join),
       GYP_GENERATOR_FLAGS = DictConfig(
         lambda i: ('%s=%s' % i), ' '.join, (str,int)),
-      GYP_MSVS_VERSION = SimpleConfig(str, empty_val="", required=False),
+      GYP_MSVS_VERSION = SimpleConfig(str, required=False),
     ),
     build_dir = SimpleConfig(str),
 
     BUILD_CONFIG = StaticConfig(norm_build_config(BUILD_CONFIG)),
 
     HOST_PLATFORM = StaticConfig(norm_host_platform(HOST_PLATFORM)),
     HOST_ARCH = StaticConfig(norm_arch(HOST_ARCH)),
     HOST_BITS = StaticConfig(norm_bits(HOST_BITS)),
 
     TARGET_PLATFORM = StaticConfig(norm_targ_platform(TARGET_PLATFORM)),
@@ skipping 136 matching lines @@
   dcheck(c, optional=True)
 
 #### 'Full' configurations
 @config_ctx(includes=['ninja', 'default_compiler', 'goma'])
 def chromium(c):
   c.compile_py.default_targets = ['All', 'chromium_builder_tests']
 
 @config_ctx(includes=['chromium'])
 def blink(c):
   c.compile_py.default_targets = ['all_webkit', 'content_shell']