Add DSC files for the various examples.

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.
 
 The script inspects the following environment variables:
 
 BUILDBOT_BUILDERNAME to determine whether the script is run locally
 and whether it should upload an SDK to file storage (GSTORE)
 """
 
 
 # std python includes
+import generate_make
 import optparse
 import os
 import platform
 import subprocess
 import sys
 
 # local includes
 import buildbot_common
 import build_updater
 import build_utils
@@ skipping 18 matching lines @@
 
 import getos
 import http_download
 import oshelpers
 
 GSTORE = 'http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/'
 MAKE = 'nacl_sdk/make_3_81/make.exe'
 CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
 
 
-def AddMakeBat(pepperdir, makepath):
-  """Create a simple batch file to execute Make.
-
-  Creates a simple batch file named make.bat for the Windows platform at the
-  given path, pointing to the Make executable in the SDK."""
-
-  makepath = os.path.abspath(makepath)
-  if not makepath.startswith(pepperdir):
-    buildbot_common.ErrorExit('Make.bat not relative to Pepper directory: ' +
-                              makepath)
-
-  makeexe = os.path.abspath(os.path.join(pepperdir, 'tools'))
-  relpath = os.path.relpath(makeexe, makepath)
-
-  fp = open(os.path.join(makepath, 'make.bat'), 'wb')
-  outpath = os.path.join(relpath, 'make.exe')
-
-  # Since make.bat is only used by Windows, for Windows path style
-  outpath = outpath.replace(os.path.sep, '\\')
-  fp.write('@%s %%*\n' % outpath)
-  fp.close()
-
-
 def BuildOutputDir(*paths):
   return os.path.join(OUT_DIR, *paths)
 
 
 def GetGlibcToolchain(platform, arch):
   tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
   tcname = 'toolchain_%s_%s.tar.bz2' % (platform, arch)
   return os.path.join(tcdir, tcname)
 
 
@@ skipping 271 matching lines @@
     'mouselock',
     'multithreaded_input_events',
     'pi_generator',
     'pong',
     'sine_synth',
     'tumbler',
     'websocket'
   ],
   'glibc': [
     'dlopen',
-    'hello_world_glibc',
   ],
   'pnacl': [
     'hello_world_pnacl',
   ],
 }
 
-def GenerateExamplesMakefile(in_path, out_path, examples):
-  """Generate a Makefile that includes only the examples supported by this
-  SDK."""
-  # Line wrap the PROJECTS variable
-  wrap_width = 80
-  projects_text = ''
-  projects_line = 'PROJECTS:='
-  for example in examples:
-    if len(projects_line + example + ' ') > wrap_width:
-      projects_text += projects_line + '\n'
-      projects_line = 'PROJECTS+='
-    projects_line += example + ' '
-
-  # Add the last unwrapped line
-  projects_text += projects_line + '\n'
-
-  out_makefile_text = ''
-  wrote_projects_text = False
-  snipping = False
-  for line in open(in_path, 'r'):
-    if line.startswith('# =SNIP='):
-      snipping = not snipping
-      continue
-
-    if snipping:
-      if not wrote_projects_text:
-        out_makefile_text += projects_text
-      wrote_projects_text = True
-    else:
-      out_makefile_text += line
-
-  open(out_path, 'w').write(out_makefile_text)
-
 
 def CopyExamples(pepperdir, toolchains):
   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)
-  AddMakeBat(pepperdir, exampledir)
 
   # Copy individual files
   files = ['favicon.ico', 'httpd.cmd', 'httpd.py', 'index.html']
   for filename in files:
     oshelpers.Copy(['-v', os.path.join(SDK_EXAMPLE_DIR, filename), exampledir])
 
   # Add examples for supported toolchains
   examples = []
   for tc in toolchains:
     examples.extend(EXAMPLE_MAP[tc])
+
+  print 'Process: ' + ' '.join(examples)
+  args = ['--dstroot=%s' % pepperdir, '--master']
   for example in examples:
-    buildbot_common.CopyDir(os.path.join(SDK_EXAMPLE_DIR, example), exampledir)
-    AddMakeBat(pepperdir, os.path.join(exampledir, example))
+    dsc = os.path.join(SDK_EXAMPLE_DIR, example, 'example.dsc')
+    args.append(dsc)
+  generate_make.main(args)
 
-  # Generate a root Makefile that only includes supported examples
-  out_makefile = os.path.join(exampledir, 'Makefile')
-  print 'Generating %s' % (out_makefile,)
-  GenerateExamplesMakefile(os.path.join(SDK_EXAMPLE_DIR, 'Makefile'),
-      out_makefile, examples)
 
 def main(args):
   parser = optparse.OptionParser()
   parser.add_option('--pnacl', help='Enable pnacl build.',
       action='store_true', dest='pnacl', default=False)
   parser.add_option('--examples', help='Only build the examples.',
       action='store_true', dest='only_examples', default=False)
   parser.add_option('--update', help='Only build the updater.',
       action='store_true', dest='only_updater', default=False)
   parser.add_option('--skip-tar', help='Skip generating a tarball.',
@@ skipping 204 matching lines @@
         manifest_snippet_stream.write(bundle.GetDataAsString())
 
       buildbot_common.Archive(tarname + '.json', bucket_path, OUT_DIR,
                               step_link=False)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))