[NaCl SDK] Add nacl_mounts to NaCl SDK build. Experimental for now.

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 410 matching lines @@
   'multithreaded_input_events',
   'pi_generator',
   'pong',
   'sine_synth',
   'tumbler',
   'websocket',
   'dlopen',
 ]
 
 LIBRARY_LIST = [
-  'pthread',
+  'nacl_mounts',

[noelallen1, 2012/07/27 00:29:40]

The LIBRARY_LIST specifies the build order.  Since libraries don't currently
include libraries I think this is okay....

[binji, 2012/07/27 18:16:39]

Ah, I see now. I thought it just looked nicer sorted ... :-)
Well, if/when I add a util library it will need to precede nacl_mounts.

   'ppapi',
   'ppapi_cpp',
   'ppapi_gles2',
+  'pthread',
 ]
 
 LIB_DICT = {
   'linux': [],
   'mac': [],
   'win': ['x86_32']
 }
 
-def BuildStepCopyExamples(pepperdir, toolchains):
+def BuildStepCopyExamples(pepperdir, toolchains, build_experimental):
   buildbot_common.BuildStep('Copy examples')
 
   if not os.path.exists(os.path.join(pepperdir, 'tools')):
     buildbot_common.ErrorExit('Examples depend on missing tools.')
   if not os.path.exists(os.path.join(pepperdir, 'toolchain')):
     buildbot_common.ErrorExit('Examples depend on missing toolchains.')
 
   exampledir = os.path.join(pepperdir, 'examples')
   buildbot_common.RemoveDir(exampledir)
   buildbot_common.MakeDir(exampledir)
@@ skipping 21 matching lines @@
     args.append('--' + toolchain)
 
   for example in EXAMPLE_LIST:
     dsc = os.path.join(SDK_EXAMPLE_DIR, example, 'example.dsc')
     args.append(dsc)
 
   for library in LIBRARY_LIST:
     dsc = os.path.join(SDK_LIBRARY_DIR, library, 'library.dsc')
     args.append(dsc)
 
+  if build_experimental:
+    args.append('--experimental')
+
   if generate_make.main(args):
     buildbot_common.ErrorExit('Failed to build examples.')
 
 
 def GetWindowsEnvironment():
   sys.path.append(os.path.join(NACL_DIR, 'buildbot'))
   import buildbot_standard
 
   # buildbot_standard.SetupWindowsEnvironment expects a "context" object. We'll
   # fake enough of that here to work.
@@ skipping 38 matching lines @@
   src_dir = os.path.join(pepperdir, 'src')
   makefile = os.path.join(src_dir, 'Makefile')
   if os.path.isfile(makefile):
     print "\n\nMake: " + src_dir
     if platform == 'win':
       # We need to modify the environment to build host on Windows.
       env = GetWindowsEnvironment()
     else:
       env = os.environ
 
-    buildbot_common.Run(['make', '-j8'],
+    #buildbot_common.Run(['make', '-j8'],

[noelallen1, 2012/07/27 00:29:40]

Is this a left over?  Or do you want to keep it to make the logs more sane?

[binji, 2012/07/27 18:16:39]

Whoops, left over. I was using it to make it easier to catch build errors.

+    buildbot_common.Run(['make', '-j1'],
                         cwd=os.path.abspath(src_dir), shell=True, env=env)
     # Clean to remove temporary files but keep the built libraries.
-    buildbot_common.Run(['make', '-j8', 'clean'],
+    buildbot_common.Run(['make', 'clean'],
                         cwd=os.path.abspath(src_dir), shell=True)
 
 
 def BuildStepTarBundle(pepper_ver, tarfile):
   buildbot_common.BuildStep('Tar Pepper Bundle')
   buildbot_common.MakeDir(os.path.dirname(tarfile))
   buildbot_common.Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile,
        'pepper_' + pepper_ver], cwd=NACL_DIR)
 
 
@@ skipping 140 matching lines @@
       action='store_true', dest='only_updater', default=False)
   parser.add_option('--test-examples',
       help='Run the pyauto tests for examples.', action='store_true',
       dest='test_examples', default=False)
   parser.add_option('--skip-tar', help='Skip generating a tarball.',
       action='store_true', dest='skip_tar', default=False)
   parser.add_option('--archive', help='Force the archive step.',
       action='store_true', dest='archive', default=False)
   parser.add_option('--release', help='PPAPI release version.',
       dest='release', default=None)
+  parser.add_option('--experimental',
+      help='build experimental examples and libraries', action='store_true',
+      dest='build_experimental', default=False)
 
   options, args = parser.parse_args(args[1:])
   platform = getos.GetPlatform()
   arch = 'x86'
 
   builder_name = os.getenv('BUILDBOT_BUILDERNAME','')
   if builder_name.find('pnacl') >= 0 and builder_name.find('sdk') >= 0:
     options.pnacl = True
 
   # TODO(binji) There is currently a hack in download_nacl_toolchains.py that
@@ skipping 24 matching lines @@
   tarname = 'naclsdk_' + platform + '.tar.bz2'
   if 'pnacl' in toolchains:
     tarname = 'p' + tarname
   tarfile = os.path.join(SERVER_DIR, tarname)
 
   if options.release:
     pepper_ver = options.release
   print 'Building PEPPER %s at %s' % (pepper_ver, clnumber)
 
   if options.only_examples:
-    BuildStepCopyExamples(pepperdir, toolchains)
+    BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
     BuildStepBuildLibraries(pepperdir, platform)
     BuildStepBuildExamples(pepperdir, platform)
     if options.test_examples:
       BuildStepTestExamples(pepperdir, platform, pepper_ver)
   elif options.only_updater:
     build_updater.BuildUpdater(OUT_DIR)
   else:  # Build everything.
     BuildStepBuildToolsTests()
 
     BuildStepDownloadToolchains(platform)
     BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
     BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
     BuildStepCopyTextFiles(pepperdir, pepper_ver, clnumber)
     BuildStepUntarToolchains(pepperdir, platform, arch, toolchains)
     BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains)
     InstallHeaders(os.path.join(pepperdir, 'include'), None, 'libs')
     BuildStepCopyBuildHelpers(pepperdir, platform)
-    BuildStepCopyExamples(pepperdir, toolchains)
+    BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental)
 
     # Ship with libraries prebuilt, so run that first.
     BuildStepBuildLibraries(pepperdir, platform)
 
     if not options.skip_tar:
       BuildStepTarBundle(pepper_ver, tarfile)
       build_updater.BuildUpdater(OUT_DIR)
 
       # BuildStepTestUpdater downloads the bundle to its own directory. Build
       # the examples and test from this directory instead of the original.
       pepperdir = BuildStepTestUpdater(platform, pepper_ver, clnumber, tarfile)
       BuildStepBuildExamples(pepperdir, platform)
       if options.test_examples:
         BuildStepTestExamples(pepperdir, platform, pepper_ver)
 
       # Archive on non-trybots.
       if options.archive or buildbot_common.IsSDKBuilder():
         BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
         BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))