[NaCl SDK] Add arm gcc toolchain support to the 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 optparse
 import os
 import sys
 from generate_index import LandingPage
@@ skipping 258 matching lines @@
       continue
 
     # If it's a bool, the expected values are always True or False.
     if exp_type is bool:
       continue
 
     # If it's a string and there are expected values, make sure it matches
     if exp_type is str:
       if type(exp_value) is list and exp_value:
         if value not in exp_value:
-          ErrorMsg('Value %s not expected for %s.' % (value, key))
+          ErrorMsg("Value '%s' not expected for %s." % (value, key))
           failed = True
       continue
 
     # if it's a list, then we need to validate the values
     if exp_type is list:
       # If we expect a dictionary, then call this recursively
       if type(exp_value) is dict:
         for val in value:
           if not ValidateFormat(val, exp_value, ErrorMsg):
             failed = True
@@ skipping 97 matching lines @@
   WriteReplaced(srcfile, dstfile, replace)
 
 
 def LoadProject(filename, toolchains):
   """Generate a Master Makefile that builds all examples.
 
   Load a project desciption file, verifying it conforms and checking
   if it matches the set of requested toolchains.  Return None if the
   project is filtered out."""
 
-  print '\n\nProcessing %s...' % filename
+  print 'Processing %s...' % filename
   # Default src directory is the directory the description was found in
   desc = open(filename, 'r').read()
   desc = eval(desc, {}, {})
 
   # Verify the format of this file
   if not ValidateFormat(desc, DSC_FORMAT):
     ErrorExit('Failed to validate: ' + filename)
 
   # Check if we are actually interested in this example
   match = False
@@ skipping 112 matching lines @@
   }
 
   WriteReplaced(in_path, out_path, replace)
 
   outdir = os.path.dirname(os.path.abspath(out_path))
   pepperdir = os.path.dirname(outdir)
   AddMakeBat(pepperdir, outdir)
 
 
 def main(argv):
-  parser = optparse.OptionParser()
+  usage = "usage: generate_make [options] <dsc_file ..>"
+  parser = optparse.OptionParser(usage=usage)
   parser.add_option('--dstroot', help='Set root for destination.',
-      dest='dstroot', default=os.path.join(OUT_DIR, 'pepper_canary'))
+      default=os.path.join(OUT_DIR, 'pepper_canary'))
   parser.add_option('--master', help='Create master Makefile.',
-      action='store_true', dest='master', default=False)
+      action='store_true', default=False)
   parser.add_option('--newlib', help='Create newlib examples.',
-      action='store_true', dest='newlib', default=False)
+      action='store_true', default=False)
   parser.add_option('--glibc', help='Create glibc examples.',
-      action='store_true', dest='glibc', default=False)
+      action='store_true', default=False)
   parser.add_option('--pnacl', help='Create pnacl examples.',
-      action='store_true', dest='pnacl', default=False)
+      action='store_true', default=False)
   parser.add_option('--host', help='Create host examples.',
-      action='store_true', dest='host', default=False)
+      action='store_true', default=False)
   parser.add_option('--experimental', help='Create experimental examples.',
-      action='store_true', dest='experimental', default=False)
+      action='store_true', default=False)
 
   toolchains = []
   platform = getos.GetPlatform()
 
   options, args = parser.parse_args(argv)
   if options.newlib:
     toolchains.append('newlib')
   if options.glibc:
     toolchains.append('glibc')
   if options.pnacl:
     toolchains.append('pnacl')
   if options.host:
     toolchains.append(platform)
 
   if not args:
     ErrorExit('Please specify one or more projects to generate Makefiles for.')
 
   # By default support newlib and glibc
   if not toolchains:
-    toolchains = ['newlib', 'glibc']
-    print 'Using default toolchains: ' + ' '.join(toolchains)
+    toolchains = ['newlib', 'glibc', 'pnacl']
 
   master_projects = {}
 
   landing_page = LandingPage()
-  for filename in args:
+  for i, filename in enumerate(args):
+    if i:
+      # Print two newlines between each dsc file we process
+      print '\n'
     desc = LoadProject(filename, toolchains)
     if not desc:
       print 'Skipping %s, not in [%s].' % (filename, ', '.join(toolchains))
       continue
 
     if desc.get('EXPERIMENTAL', False) and not options.experimental:
       print 'Skipping %s, experimental only.' % (filename,)
       continue
 
     srcroot = os.path.dirname(os.path.abspath(filename))
@@ skipping 25 matching lines @@
     for dest, projects in master_projects.iteritems():
       master_out = os.path.join(options.dstroot, dest, 'Makefile')
       GenerateMasterMakefile(master_in, master_out, projects)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))