Updated SDK scons files to handle new gyp file format in ppapi

native_client_sdk/src/build_tools/build.scons

 #! -*- python -*-
 #
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Build file for running scripts in the build_tools directory
 
 Adapted from scons documentation: http://www.scons.org/wiki/UnitTests
 and from ../project_templates/test.scons
@@ skipping 113 matching lines @@
 
 if env['IS_WINDOWS']:
   AddPythonUnitTest('run_install_nsis_test', 'tests/install_nsis_test.py')
   AddPythonUnitTest('run_nsis_script_test', 'tests/nsis_script_test.py')
 
 
 #------------------------------------------------------------------------------
 # Put together the toolchain
 
 import gyp_extract
+import re
+
+def GypSources(gyp_data, pattern):
+  """Extract a sources from a target matching a given pattern.
+
+  Args:
+    gyp_data: list containing sources from gyp file.
+    pattern: re pattern that sources must match.
+  Returns:
+    A list of strings containing source filenames.
+  """
+  # Extract source files that match.
+  re_compiled = re.compile(pattern)
+  return [source_file for source_file in gyp_data
+          if re_compiled.match(source_file)]
 
 ppapi_base = os.path.join(env['SRC_DIR'], 'ppapi')
 
+# Unfortunately gyp_extract does not handle variables or includes so we must
+# pull the list of sources from ppapi_sources.gypi directly.
+ppapi_sources_gypi = open(os.path.join(ppapi_base,
+                                       'ppapi_sources.gypi'), 'r').read()
+ppapi_sources_map = eval(ppapi_sources_gypi)['variables']
+
 # Load ppapi_cpp.gypi
 ppapi_cpp_gypi = gyp_extract.LoadGypFile(os.path.join(ppapi_base,
                                                       'ppapi_cpp.gypi'))
 
 # Load ppapi_gl.gypi
 ppapi_gl_gypi = gyp_extract.LoadGypFile(os.path.join(ppapi_base,
                                                      'ppapi_gl.gypi'))
 
 # From ppapi_cpp.gypi:ppapi_c:c/[^/]*\.h
-c_headers = gyp_extract.GypTargetSources(
-    ppapi_cpp_gypi, 'ppapi_c', 'c/[^/]*\.h')
+c_headers = GypSources(ppapi_sources_map['c_sources'], 'c/[^/]*\.h')
 
 # From ppapi_cpp.gypi:ppapi_c:c/dev/[^/]*\.h
-c_dev_headers = gyp_extract.GypTargetSources(
-    ppapi_cpp_gypi, 'ppapi_c', 'c/dev/[^/]*\.h')
+c_dev_headers = GypSources(ppapi_sources_map['c_sources'], 'c/dev/[^/]*\.h')
 
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.h
 # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.h
 cpp_headers = (
-    gyp_extract.GypTargetSources(
-        ppapi_cpp_gypi, 'ppapi_cpp_objects', 'cpp/[^/]*\.h') +
+    GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.h') +
     gyp_extract.GypTargetSources(
         ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.h')
 )
 
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/dev/[^/]*\.h
-cpp_dev_headers = gyp_extract.GypTargetSources(
-    ppapi_cpp_gypi, 'ppapi_cpp_objects', 'cpp/dev/[^/]*\.h')
+cpp_dev_headers = GypSources(ppapi_sources_map['cpp_sources'],
+                             'cpp/dev/[^/]*\.h')
 
 # From ppapi_gl.gypi:ppapi_gles2:.*\.h
 gles2_headers = gyp_extract.GypTargetSources(
     ppapi_gl_gypi, 'ppapi_gles2', '.*\.h')
 
 
 c_header_install = env.AddHeaderToSdk(
   [os.path.join(ppapi_base, h) for h in c_headers], os.path.join('ppapi', 'c'))
 c_dev_header_install = env.AddHeaderToSdk(
   [os.path.join(ppapi_base, h) for h in c_dev_headers],
   os.path.join('ppapi', 'c', 'dev'))
 cpp_header_install = env.AddHeaderToSdk(
   [os.path.join(ppapi_base, h) for h in cpp_headers],
   os.path.join('ppapi', 'cpp'))
 cpp_dev_header_install = env.AddHeaderToSdk(
   [os.path.join(ppapi_base, h) for h in cpp_dev_headers],
   os.path.join('ppapi', 'cpp', 'dev'))
 
 # TODO(dspringer): Remove these lines when trusted ppapi builds are no longer
 # needed for debugging.
 # -------- 8< Cut here --------
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.cc
 # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.cc
 cpp_trusted_sources = (
-    gyp_extract.GypTargetSources(
-        ppapi_cpp_gypi, 'ppapi_cpp_objects', 'cpp/[^/]*\.cc') +
+    GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.cc') +
     gyp_extract.GypTargetSources(
         ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.cc')
 )
 
 cpp_trusted_source_install = env.AddHeaderToSdk(
   [os.path.join(ppapi_base, cpp) for cpp in cpp_trusted_sources],
   subdir=os.path.join('ppapi', 'cpp'),
   base_dirs=[os.path.join(env['ROOT_DIR'], 'third_party')])
 # -------- 8< Cut here --------
 
@@ skipping 76 matching lines @@
 for dir in env['NACL_TOOLCHAIN_ROOTS'].values():
   all_tools += [os.path.join(dir, tool) for tool in tools]
 
 nacl_tools_cmd = env.Command(all_tools,
                              ['make_nacl_tools.py',
                               os.path.join(env['SRC_DIR'], 'DEPS')],
                              build_nacl_tools)
 env.Depends(nacl_tools_cmd, env.GetHeadersNode())
 env.Depends(env.GetToolchainNode(), nacl_tools_cmd)
 env.AddCleanAction([], build_nacl_tools, ['toolchain', 'bot'], nacl_tools_cmd)