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

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 7ac2e0f9779671b2fd8b6e5a1fbbb86cbe47457e..beff87f0116a31116a2d16db46c05ecca7629df7 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -428,10 +428,11 @@ EXAMPLE_LIST = [
 ]
 
 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 = {
@@ -440,7 +441,7 @@ LIB_DICT = {
   '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')):
@@ -482,6 +483,9 @@ def BuildStepCopyExamples(pepperdir, toolchains):
     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.')
 
@@ -540,10 +544,11 @@ def BuildStepBuildLibraries(pepperdir, platform):
     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)
 
 
@@ -704,6 +709,9 @@ def main(args):
       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()
@@ -748,7 +756,7 @@ def main(args):
   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:
@@ -766,7 +774,7 @@ def main(args):
     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)