Set target platform on root node earlier.

grit/node/base.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 '''Base types for nodes in a GRIT resource tree.
 '''
 
 import collections
 import os
@@ skipping 424 matching lines @@
     return [child for child in self if isinstance(child, type)]
 
   def GetTextualIds(self):
     '''Returns a list of the textual ids of this node.
     '''
     if 'name' in self.attrs:
       return [self.attrs['name']]
     return []
 
   @classmethod
+  def GetPlatformAssertion(cls, target_platform):
+    '''If the platform is a specific well-known platform, this returns
+    the is_xyz string representing that platform (e.g. is_linux),
+    otherwise the empty string.
+    '''
+    platform = ''
+    if target_platform == 'darwin':
+      platform = 'is_macosx'
+    elif target_platform.startswith('linux'):
+      platform = 'is_linux'
+    elif target_platform in ('cygwin', 'win32'):
+      platform = 'is_win'
+    elif target_platform in ('android', 'ios'):
+      platform = 'is_%s' % target_platform
+    return platform
+
+  @classmethod
   def EvaluateExpression(cls, expr, defs, target_platform, extra_variables=None):
     '''Worker for EvaluateCondition (below) and conditions in XTB files.'''
     cache_dict = cls.eval_expr_cache[
         (tuple(defs.iteritems()), target_platform, extra_variables)]
     if expr in cache_dict:
       return cache_dict[expr]
     def pp_ifdef(symbol):
       return symbol in defs
     def pp_if(symbol):
       return defs.get(symbol, False)
+    platform_assertion = Node.GetPlatformAssertion(target_platform)
     variable_map = {
         'defs' : defs,
         'os': target_platform,
-        'is_linux': target_platform.startswith('linux'),
-        'is_macosx': target_platform == 'darwin',
-        'is_win': target_platform in ('cygwin', 'win32'),
-        'is_android': target_platform == 'android',
-        'is_ios': target_platform == 'ios',
-        'is_posix': (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5',
-                                         'android', 'ios')
-                    or 'bsd' in target_platform),
+        'is_linux': platform_assertion == 'is_linux',
+        'is_macosx': platform_assertion == 'is_macosx',
+        'is_win': platform_assertion == 'is_win',
+        'is_android': platform_assertion == 'is_android',
+        'is_ios': platform_assertion == 'is_ios',

[Nico, 2013/12/27 16:55:24]

nit (optional, and since this is already landed best ignore): You could set them
all to 0 here and then do

  variable_map[platform_assertion] = 1

right after the dict definition is done

+        # is_posix is not mutually exclusive of the others
+        'is_posix': (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5')
+                     or 'bsd' in sys.platform),

[Nico, 2014/01/28 20:48:35]

Hey, it looks like you dropped 'ios' and 'android' from is_posix in this change.
I guess that wasn't intentional?

[Jói, 2014/01/29 13:41:39]

Whoops, that looks like a bad merge maybe. Not intentional, will fix.

         'pp_ifdef' : pp_ifdef,
         'pp_if' : pp_if,
     }
     if extra_variables:
       variable_map.update(extra_variables)
     eval_result = cache_dict[expr] = eval(expr, {}, variable_map)
     return eval_result
 
   def EvaluateCondition(self, expr):
     '''Returns true if and only if the Python expression 'expr' evaluates
@@ skipping 82 matching lines @@
   def ExpandVariables(self):
     '''Whether we need to expand variables on a given node.'''
     return False
 
 
 class ContentNode(Node):
   '''Convenience baseclass for nodes that can have content.'''
   def _ContentType(self):
     return self._CONTENT_TYPE_MIXED