Add Paths as first-class types in configs.

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_config import config_item_context, ConfigGroup
 from slave.recipe_config import Dict, Single, Static, Set, BadConf
 
+from slave.recipe_config_types import Path

[agable, 2013/09/26 21:46:02]

No empty line above this.

[iannucci, 2013/09/27 02:08:20]

Done.

+
 # 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.
 # pylint: disable=E1123
 
 HOST_PLATFORMS = ('linux', 'win', 'mac')
 TARGET_PLATFORMS = HOST_PLATFORMS + ('ios', 'android', 'chromeos')
 HOST_TARGET_BITS = (32, 64)
 HOST_ARCHS = ('intel',)
 TARGET_ARCHS = HOST_ARCHS + ('arm', 'mips')
 BUILD_CONFIGS = ('Release', 'Debug')
 
 def check(val, potentials):
   assert val in potentials
   return val
 
 # Schema for config items in this module.
 def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
                TARGET_PLATFORM, TARGET_ARCH, TARGET_BITS,
                BUILD_CONFIG, **_kwargs):
   equal_fn = lambda tup: ('%s=%s' % tup)
   return ConfigGroup(
     compile_py = ConfigGroup(
       default_targets = Set(basestring),
       build_tool = Single(basestring),
       compiler = Single(basestring, required=False),
     ),
     gyp_env = ConfigGroup(
       GYP_CROSSCOMPILE = Single(int, jsonish_fn=str, required=False),
-      GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,list)),
+      GYP_DEFINES = Dict(equal_fn, ' '.join, (basestring,int,Path)),

[agable, 2013/09/26 21:46:02]

Realizing that these are a bit obtuse and it might be nice to pass both
functions as keyword arguments to reduce potential confusion while reading this
file (and other configs).

[iannucci, 2013/09/27 02:08:20]

Yes, I agree :). Another CL?

[agable, 2013/09/27 17:48:16]

SG.

       GYP_GENERATORS = Set(basestring, ','.join),
       GYP_GENERATOR_FLAGS = Dict(equal_fn, ' '.join, (basestring,int)),
       GYP_MSVS_VERSION = Single(basestring, required=False),
     ),
-    build_dir = Single(basestring),
+    build_dir = Single(Path),
 
     # Some platforms do not have a 1:1 correlation of BUILD_CONFIG to what is
     # passed as --target on the command line.
     build_config_fs = Single(basestring),
 
     BUILD_CONFIG = Static(check(BUILD_CONFIG, BUILD_CONFIGS)),
 
     HOST_PLATFORM = Static(check(HOST_PLATFORM, HOST_PLATFORMS)),
     HOST_ARCH = Static(check(HOST_ARCH, HOST_ARCHS)),
     HOST_BITS = Static(check(HOST_BITS, HOST_TARGET_BITS)),
@@ skipping 57 matching lines @@
     raise BadConf('Can not compile "%s" on "%s"' %
                   (c.TARGET_PLATFORM, c.HOST_PLATFORM))
 
   if c.HOST_BITS < c.TARGET_BITS:
     raise BadConf('host bits < targ bits')
 
   c.build_config_fs = c.BUILD_CONFIG
   if c.HOST_PLATFORM == 'win':
     if c.TARGET_BITS == 64:
       # Windows requires 64-bit builds to be in <dir>_x64.
-      c.build_config_fs += '_x64'
+      c.build_config_fs = c.BUILD_CONFIG + '_x64'
       c.gyp_env.GYP_MSVS_VERSION = '2012'
       c.gyp_env.GYP_DEFINES['target_arch'] = 'x64'
     else:
       c.gyp_env.GYP_MSVS_VERSION = '2010'
 
   if c.BUILD_CONFIG == 'Release':
     static_library(c, final=False)
   elif c.BUILD_CONFIG == 'Debug':
     shared_library(c, final=False)
   else:  # pragma: no cover
     raise BadConf('Unknown build config "%s"' % c.BUILD_CONFIG)
 
 @config_ctx()
 def disable_aura(c):
   if c.TARGET_PLATFORM == 'win':
     c.gyp_env.GYP_DEFINES['use_aura'] = 0
 
 @config_ctx(group='builder')
 def ninja(c):
   c.gyp_env.GYP_GENERATORS.add('ninja')
   c.compile_py.build_tool = 'ninja'
-  c.build_dir = 'out'
+  c.build_dir = Path('checkout', 'out')

[agable, 2013/09/26 21:46:02]

This just looks so much like it's going to construct "checkout/out", not
"[CHECKOUT]/out". Can we come up with a better way of indicating that the first
element is a late-binding alias?

[iannucci, 2013/09/27 02:08:20]

All caps? I could also make the pieces argument explicitly a tuple. I'll do
that. Done.

[agable, 2013/09/27 17:48:16]

See comments in recipe_config_types.

 
 @config_ctx(group='builder')
 def msvs(c):
   if c.HOST_PLATFORM != 'win':
     raise BadConf('can not use msvs on "%s"' % c.HOST_PLATFORM)
   c.gyp_env.GYP_GENERATORS.add('msvs')
   c.gyp_env.GYP_GENERATOR_FLAGS['msvs_error_on_missing_sources'] = 1
   c.compile_py.build_tool = 'msvs'
-  c.build_dir = 'out'
+  c.build_dir = Path('checkout', 'build')
 
 @config_ctx(group='builder')
 def xcodebuild(c):
   if c.HOST_PLATFORM != 'mac':
     raise BadConf('can not use xcodebuild on "%s"' % c.HOST_PLATFORM)
   c.gyp_env.GYP_GENERATORS.add('xcodebuild')
 
 @config_ctx(group='compiler')
 def clang(c):
   c.compile_py.compiler = 'clang'
@@ skipping 50 matching lines @@
 @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']
   if c.TARGET_PLATFORM == 'win':
     c.gyp_env.GYP_DEFINES['use_ash'] = 0
     c.gyp_env.GYP_DEFINES['use_aura'] = 0