[NaCl SDK] Build gtest on buildbots, but don't include it in the SDK.

native_client_sdk/src/build_tools/make_rules.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.
 
 
 #
 # Default macros for various platforms.
 #
 NEWLIB_DEFAULTS = """
@@ skipping 38 matching lines @@
 WIN_LDFLAGS=/LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host
 """
 
 #
 # Compile rules for various platforms.
 #
 NACL_CC_RULE = """
 <OBJS>:=$(patsubst %.<ext>, <tc>/%_<ARCH>.o,$(<PROJ>_<EXT>))
 DEPFILES+=$(<OBJS>:.o=.d)
 $(<OBJS>) : <tc>/%_<ARCH>.o : %.<ext> $(THIS_MAKE) | <tc>
-<TAB>$(<CC>) -o $@ $< <MACH> $(<PROJ>_<EXT>FLAGS) -DTCNAME=<tc> $(<TC>_CCFLAGS) <DEFLIST>
+<TAB>$(<CC>) -o $@ $< <MACH> -DTCNAME=<tc> $(<TC>_CCFLAGS) $(<PROJ>_<EXT>FLAGS) <DEFLIST> <INCLUDELIST>
 """
 
 SO_CC_RULE = """
 <OBJS>:=$(patsubst %.<ext>, <tc>/%_<ARCH>.o,$(<PROJ>_<EXT>))
 DEPFILES+=$(<OBJS>:.o=.d)
 $(<OBJS>) : <tc>/%_<ARCH>.o : %.<ext> $(THIS_MAKE) | <tc>
-<TAB>$(<CC>) -o $@ $< <MACH> -fPIC $(<PROJ>_<EXT>FLAGS) -DTCNAME=<tc> $(<TC>_CCFLAGS) <DEFLIST>
+<TAB>$(<CC>) -o $@ $< <MACH> -fPIC -DTCNAME=<tc> $(<TC>_CCFLAGS) $(<PROJ>_<EXT>FLAGS) <DEFLIST> <INCLUDELIST>
 """
 
 WIN_CC_RULE = """
 <OBJS>:=$(patsubst %.<ext>, <tc>/%.obj,$(<PROJ>_<EXT>))
 $(<OBJS>) : <tc>/%.obj : %.<ext> $(THIS_MAKE) | <tc>
-<TAB>$(<CC>) /Fo$@ /c $< -DTCNAME=host $(WIN_CCFLAGS) <DEFLIST>
+<TAB>$(<CC>) /Fo$@ /c $< -DTCNAME=host $(WIN_CCFLAGS) <DEFLIST> <INCLUDELIST>
 """
 
 #
 # Link rules for various platforms.
 #
 NEXE_LINK_RULE = """
 <tc>/<proj>_<ARCH>.nexe : <OBJS>
 <TAB>$(<LINK>) -o $@ $^ <MACH> $(<PROJ>_LDFLAGS) $(<TC>_LDFLAGS) <LIBLIST>
 <TC>_NMF+=<tc>/<proj>_<ARCH>.nexe
 """
@@ skipping 62 matching lines @@
 """
 
 
 EXT_MAP = {
   'c': 'CC',
   'cc': 'CXX'
 }
 
 WIN_TOOL = {
   'DEFINE': '-D%s',
+  'INCLUDE': '/I%s',
   'LIBRARY': '%s.lib',
   'main': '<tc>/<proj>.dll',
   'nmf': '<tc>/<proj>.nmf',
   'so': None,
   'lib': '$(NACL_SDK_ROOT)/lib/win_<ARCH>_host/<proj>.lib',
 }
 
 NACL_TOOL = {
   'DEFINE': '-D%s',
+  'INCLUDE': '-I%s',
   'LIBRARY': '-l%s',
   'main': '<tc>/<proj>_<ARCH>.nexe',
   'nmf': '<tc>/<proj>.nmf',
   'so': '<tc>/<proj>_<ARCH>.so',
   'lib': '$(NACL_SDK_ROOT)/lib/$(OSNAME)_<ARCH>_<tc>/lib<proj>.a',
 }
 
 
 #
 # Various Architectures
@@ skipping 65 matching lines @@
     'SO': None,
     'TOOL': WIN_TOOL
   }
 }
 
 
 def GetBuildRule(tool, ext):
   return BUILD_RULES[tool][ext]
 
 
+def BuildList(tool, key, items):
+  pattern = BUILD_RULES[tool]['TOOL'][key]
+  items = [(pattern % name) for name in items]
+  return ' '.join(items)
+

[noelallen1, 2012/07/31 20:37:21]

Missing LF

 def BuildDefineList(tool, defs):
-  pattern = BUILD_RULES[tool]['TOOL']['DEFINE']
-  defines = [(pattern % name) for name in defs]
-  return ' '.join(defines)
+  return BuildList(tool, 'DEFINE', defs)
+
+
+def BuildIncludeList(tool, includes):
+  return BuildList(tool, 'INCLUDE', includes)
 
 
 def BuildLibList(tool, libs):
-  pattern = BUILD_RULES[tool]['TOOL']['LIBRARY']
-  libraries = [(pattern % name) for name in libs]
-  return ' '.join(libraries)
+  return BuildList(tool, 'LIBRARY', libs)
 
 
 def BuildToolDict(toolchain, project, arch = {}, ext='nexe', **kwargs):
   tc = toolchain
   TC = toolchain.upper()
   proj = project
   PROJ = proj.upper()
   EXT = EXT_MAP.get(ext, ext.upper())
 
   replace = {
@@ skipping 18 matching lines @@
   for key in kwargs:
     replace['<%s>' % key] = kwargs[key]
 
   if '<OBJS>' not in replace:
     if replace.get('<ARCH>', ''):
       replace['<OBJS>'] = '%s_%s_%s_%s_O' % (TC, PROJ, replace['<ARCH>'], EXT)
     else:
       replace['<OBJS>'] = '%s_%s_%s_O' % (TC, PROJ, EXT)
   return replace