Add Paths as first-class types in configs.

scripts/slave/recipe_modules/chromium/config.py

Index: scripts/slave/recipe_modules/chromium/config.py
diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py
index d2ba74418be19b7ad23861d4a4b18c6bab40fa9f..6951a480682bd9f4b1d3df7c7009842f28ca98e0 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -5,6 +5,8 @@
 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
@@ -33,12 +35,12 @@ def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
     ),
     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.
@@ -116,7 +118,7 @@ def BASE(c):
   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:
@@ -138,7 +140,7 @@ def disable_aura(c):
 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):
@@ -147,7 +149,7 @@ def msvs(c):
   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):