[NaCl SDK] Don't copy .h files to src in SDK.

native_client_sdk/src/build_tools/generate_make.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.
 
 import buildbot_common
 import make_rules
 import optparse
 import os
 import sys
@@ skipping 45 matching lines @@
       out += line[:-1] + '\n'
       line = '%s+=%s ' % (varname, value)
     else:
       line += value + ' '
 
   if line:
     out += line[:-1] + '\n'
   return out
 
 
-def GenerateCopyList(desc):
+def GenerateSourceCopyList(desc):
   sources = []
   # Add sources for each target
   for target in desc['TARGETS']:
     sources.extend(target['SOURCES'])
 
   # And HTML and data files
   sources.extend(desc.get('DATA', []))
 
   if desc['DEST'] == 'examples':
     sources.append('common.js')
@@ skipping 187 matching lines @@
     'PREREQ' : (list, '', False),
     'TARGETS' : (list, {
         'NAME': (str, '', True),
         'TYPE': (str, ['main', 'nexe', 'lib', 'so'], True),
         'SOURCES': (list, '', True),
         'CCFLAGS': (list, '', False),
         'CXXFLAGS': (list, '', False),
         'LDFLAGS': (list, '', False),
         'LIBS' : (list, '', False)
     }, True),
+    'HEADERS': (list, {
+        'FILES': (list, '', True),
+        'DEST': (str, '', True),
+    }, False),
     'SEARCH': (list, '', False),
     'POST': (str, '', False),
     'PRE': (str, '', False),
     'DEST': (str, ['examples', 'src'], True),
     'NAME': (str, '', False),
     'DATA': (list, '', False),
     'TITLE': (str, '', False),
     'DESC': (str, '', False),
     'INFO': (str, '', False)
 }
@@ skipping 160 matching lines @@
   match = False
   for toolchain in toolchains:
     if toolchain in desc['TOOLS']:
       match = True
       break
   if not match:
     return None
   return desc
 
 
+def FindAndCopyFiles(src_files, root, search_dirs, dst_dir):
+  buildbot_common.MakeDir(dst_dir)
+  for src_name in src_files:
+    src_file = FindFile(src_name, root, search_dirs)
+    if not src_file:
+      ErrorMsgFunc('Failed to find: ' + src_name)
+      return None
+    dst_file = os.path.join(dst_dir, src_name)
+    buildbot_common.CopyFile(src_file, dst_file)
+
+
 def ProcessProject(srcroot, dstroot, desc, toolchains):
   name = desc['NAME']
   out_dir = os.path.join(dstroot, desc['DEST'], name)
   buildbot_common.MakeDir(out_dir)
   srcdirs = desc.get('SEARCH', ['.', '..'])
 
   # Copy sources to example directory
-  sources = GenerateCopyList(desc)
-  for src_name in sources:
-    src_file = FindFile(src_name, srcroot, srcdirs)
-    if not src_file:
-      ErrorMsgFunc('Failed to find: ' + src_name)
-      return None
-    dst_file = os.path.join(out_dir, src_name)
-    buildbot_common.CopyFile(src_file, dst_file)
+  sources = GenerateSourceCopyList(desc)
+  FindAndCopyFiles(sources, srcroot, srcdirs, out_dir)
+
+  # Copy public headers to the include directory.
+  for headers_set in desc.get('HEADERS', []):
+    headers = headers_set['FILES']
+    header_out_dir = os.path.join(dstroot, headers_set['DEST'])
+    FindAndCopyFiles(headers, srcroot, srcdirs, header_out_dir)
 
   if IsNexe(desc):
     template=os.path.join(SCRIPT_DIR, 'template.mk')
   else:
     template=os.path.join(SCRIPT_DIR, 'library.mk')
 
   tools = []
   for tool in desc['TOOLS']:
     if tool in toolchains:
       tools.append(tool)
@@ skipping 77 matching lines @@
     master_in = os.path.join(SDK_EXAMPLE_DIR, 'Makefile')
     master_out = os.path.join(options.dstroot, 'examples', 'Makefile')
     GenerateMasterMakefile(master_in, master_out, examples)
     master_out = os.path.join(options.dstroot, 'src', 'Makefile')
     GenerateMasterMakefile(master_in, master_out, libs)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))