Move headers

native_client_sdk/src/build_tools/build_sdk.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.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 256 matching lines @@
   'glibc': {
       'nacl/dynamic_annotations.h':
           'src/untrusted/valgrind/dynamic_annotations.h',
       'nacl/nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
       'nacl/nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
       'nacl/nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
       'pnacl.h': 'src/untrusted/nacl/pnacl.h',
       'irt.h': 'src/untrusted/irt/irt.h',
       'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h',
   },
-  'libs': {
+  'host': {
   },
 }
 
-
-def InstallHeaders(tc_dst_inc, pepper_ver, tc_name):
-  """Copies NaCl headers to expected locations in the toolchain."""
-  if tc_name == 'arm':
-    # arm toolchain header should be the same as the x86 newlib
-    # ones
-    tc_name = 'newlib'
-  tc_map = HEADER_MAP[tc_name]
-  for filename in tc_map:
-    src = os.path.join(NACL_DIR, tc_map[filename])
-    dst = os.path.join(tc_dst_inc, filename)
-    buildbot_common.MakeDir(os.path.dirname(dst))
-    buildbot_common.CopyFile(src, dst)
-
+def InstallCommonHeaders(inc_path):
   # Clean out per toolchain ppapi directory
-  ppapi = os.path.join(tc_dst_inc, 'ppapi')
+  ppapi = os.path.join(inc_path, 'ppapi')
   buildbot_common.RemoveDir(ppapi)
 
   # Copy in c and c/dev headers
   buildbot_common.MakeDir(os.path.join(ppapi, 'c', 'dev'))
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'c', '*.h'),
           os.path.join(ppapi, 'c'))
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'c', 'dev', '*.h'),
           os.path.join(ppapi, 'c', 'dev'))
 
-  # Run the generator to overwrite IDL files

[binji, 2013/01/08 21:51:25]

not needed/desired anymore?

[noelallen1, 2013/01/08 23:28:22]

We never use the single version forms of the headers.

On 2013/01/08 21:51:25, binji wrote:

-  generator_args = [sys.executable, 'generator.py', '--wnone', '--cgen',
-      '--verbose', '--dstroot=%s/c' % ppapi]
-  if pepper_ver:
-    generator_args.append('--release=M' + pepper_ver)
-  buildbot_common.Run(generator_args,
-                      cwd=os.path.join(PPAPI_DIR, 'generators'))
-
   # Remove private and trusted interfaces
   buildbot_common.RemoveDir(os.path.join(ppapi, 'c', 'private'))
   buildbot_common.RemoveDir(os.path.join(ppapi, 'c', 'trusted'))
 
   # Copy in the C++ headers
   buildbot_common.MakeDir(os.path.join(ppapi, 'cpp', 'dev'))
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'cpp', '*.h'),
           os.path.join(ppapi, 'cpp'))
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'cpp', 'dev', '*.h'),
           os.path.join(ppapi, 'cpp', 'dev'))
@@ skipping 10 matching lines @@
   buildbot_common.CopyDir(
           os.path.join(PPAPI_DIR, 'utility', 'websocket', '*.h'),
           os.path.join(ppapi, 'utility', 'websocket'))
 
   # Copy in the gles2 headers
   buildbot_common.MakeDir(os.path.join(ppapi, 'gles2'))
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'lib', 'gl', 'gles2', '*.h'),
           os.path.join(ppapi, 'gles2'))
 
   # Copy the EGL headers
-  buildbot_common.MakeDir(os.path.join(tc_dst_inc, 'EGL'))
+  buildbot_common.MakeDir(os.path.join(inc_path, 'EGL'))
   buildbot_common.CopyDir(
           os.path.join(PPAPI_DIR, 'lib', 'gl', 'include', 'EGL', '*.h'),
-          os.path.join(tc_dst_inc, 'EGL'))
+          os.path.join(inc_path, 'EGL'))
 
   # Copy the GLES2 headers
-  buildbot_common.MakeDir(os.path.join(tc_dst_inc, 'GLES2'))
+  buildbot_common.MakeDir(os.path.join(inc_path, 'GLES2'))
   buildbot_common.CopyDir(
           os.path.join(PPAPI_DIR, 'lib', 'gl', 'include', 'GLES2', '*.h'),
-          os.path.join(tc_dst_inc, 'GLES2'))
+          os.path.join(inc_path, 'GLES2'))
 
   # Copy the KHR headers
-  buildbot_common.MakeDir(os.path.join(tc_dst_inc, 'KHR'))
+  buildbot_common.MakeDir(os.path.join(inc_path, 'KHR'))
   buildbot_common.CopyDir(
           os.path.join(PPAPI_DIR, 'lib', 'gl', 'include', 'KHR', '*.h'),
-          os.path.join(tc_dst_inc, 'KHR'))
+          os.path.join(inc_path, 'KHR'))
 
   # Copy the lib files
   buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'lib'),
-          os.path.join(tc_dst_inc, 'ppapi'))
+          os.path.join(inc_path, 'ppapi'))
+
+
+def InstallNaClHeaders(tc_dst_inc, pepper_ver, tc_name):
+  """Copies NaCl headers to expected locations in the toolchain."""
+  if tc_name == 'arm':
+    # arm toolchain header should be the same as the x86 newlib
+    # ones
+    tc_name = 'newlib'
+  tc_map = HEADER_MAP[tc_name]
+
+  for filename in tc_map:
+    src = os.path.join(NACL_DIR, tc_map[filename])
+    dst = os.path.join(tc_dst_inc, filename)
+    buildbot_common.MakeDir(os.path.dirname(dst))
+    buildbot_common.CopyFile(src, dst)
 
 
 def MakeNinjaRelPath(path):
   return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
 
 
 def GypNinjaInstall(pepperdir, platform, toolchains):
   build_dir = 'gypbuild'
   ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release')
   # src_file, dst_file, is_host_exe?
@@ skipping 165 matching lines @@
   # Run scons TC build steps
   if set(toolchains) & set(['glibc', 'newlib']):
     GypNinjaBuild_Chrome('ia32', 'gypbuild')
 
   if 'arm' in toolchains:
     GypNinjaBuild_Chrome('arm', 'gypbuild-arm')
 
   GypNinjaInstall(pepperdir, platform, toolchains)
 
   if 'newlib' in toolchains:
-    InstallHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'),
-                   pepper_ver,
-                   'newlib')
+    InstallNaClHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'),
+                       pepper_ver,
+                       'newlib')
 
   if 'glibc' in toolchains:
-    InstallHeaders(GetToolchainNaClInclude('glibc', glibcdir, 'x86'),
-                   pepper_ver,
-                   'glibc')
+    InstallNaClHeaders(GetToolchainNaClInclude('glibc', glibcdir, 'x86'),
+                       pepper_ver,
+                       'glibc')
 
   if 'arm' in toolchains:
     tcname = platform + '_arm_newlib'
     armdir = os.path.join(pepperdir, 'toolchain', tcname)
-    InstallHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'),
-                   pepper_ver, 'arm')
+    InstallNaClHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'),
+                       pepper_ver, 'arm')
 
   if 'pnacl' in toolchains:
     shell = platform == 'win'
     buildbot_common.Run(
         GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '32'),
         cwd=NACL_DIR, shell=shell)
     buildbot_common.Run(
         GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '64'),
         cwd=NACL_DIR, shell=shell)
 
     for arch in ('ia32', 'arm'):
       # Fill in the latest native pnacl shim library from the chrome build.
       build_dir = 'gypbuild-pnacl-' + arch
       GypNinjaBuild_Pnacl(build_dir, arch)
       pnacl_libdir_map = { 'ia32': 'x86-64', 'arm': 'arm' }
       release_build_dir = os.path.join(OUT_DIR, build_dir, 'Release',
                                        'gen', 'tc_pnacl_translate',
                                        'lib-' + pnacl_libdir_map[arch])
 
       buildbot_common.CopyFile(
           os.path.join(release_build_dir, 'libpnacl_irt_shim.a'),
           GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch]))
 
-    InstallHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'),
-                   pepper_ver,
-                   'newlib')
+    InstallNaClHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'),
+                       pepper_ver,
+                       'newlib')
 
 
 def BuildStepCopyBuildHelpers(pepperdir, platform):
   buildbot_common.BuildStep('Copy build helpers')
   buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.py'),
       os.path.join(pepperdir, 'tools'))
   if platform == 'win':
     buildbot_common.BuildStep('Add MAKE')
     http_download.HttpDownload(GSTORE + MAKE,
                                os.path.join(pepperdir, 'tools', 'make.exe'))
@@ skipping 322 matching lines @@
 
   BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
   BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
 
   if not options.skip_toolchain:
     BuildStepDownloadToolchains(platform)
     BuildStepUntarToolchains(pepperdir, platform, arch, toolchains)
 
   BuildStepCopyTextFiles(pepperdir, pepper_ver, clnumber)
   BuildStepBuildToolchains(pepperdir, platform, pepper_ver, toolchains)
-  InstallHeaders(os.path.join(pepperdir, 'include'), None, 'libs')
+  InstallCommonHeaders(os.path.join(pepperdir, 'include'))
   BuildStepCopyBuildHelpers(pepperdir, platform)
   BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental, True)
 
   # Ship with libraries prebuilt, so run that first.
   BuildStepBuildLibraries(pepperdir, platform, 'src')
   BuildStepGenerateNotice(pepperdir)
 
   if not options.skip_tar:
     BuildStepTarBundle(pepper_ver, tarfile)
 
   if options.run_tests:
     BuildStepRunTests()
 
   # Archive on non-trybots.
   if options.archive:
     BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))