[NaCl SDK] Convert python scripts from optparse to argparse.

native_client_sdk/src/tools/create_nmf.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.
 
 """Tool for automatically creating .nmf files from .nexe/.pexe/.bc executables.
 
 As well as creating the nmf file this tool can also find and stage
 any shared libraries dependencies that the executables might have.
 """
 
+import argparse
 import errno
 import json
-import optparse
 import os
 import posixpath
 import shutil
 import sys
 
 import getos
 
 if sys.version_info < (2, 7, 0):
   sys.stderr.write("python 2.7 or later is required run this script\n")
   sys.exit(1)
@@ skipping 126 matching lines @@
     path: Full path to this file on the build system
     arch: Architecture of this file (e.g., x86-32)
     url: Relative path to file in the staged web directory.
         Used for specifying the "url" attribute in the nmf file."""
 
   def __init__(self, name, path, url=None, arch=None):
     self.name = name
     self.path = path
     self.url = url
     self.arch = arch
-    if not arch:
+    if arch is None:
       self.arch = ParseElfHeader(path)[0]
 
   def __repr__(self):
     return '<ArchFile %s>' % self.path
 
   def __str__(self):
     """Return the file path when invoked with the str() function"""
     return self.path
 
 
@@ skipping 223 matching lines @@
           name = MAIN_NEXE
 
       name = self.remap.get(name, name)
       fileinfo = manifest[FILES_KEY].get(name, {})
       fileinfo[archinfo.arch] = urlinfo
       manifest[FILES_KEY][name] = fileinfo
     self.manifest = manifest
 
   def GetManifest(self):
     """Returns a JSON-formatted dict containing the NaCl dependencies"""
-    if not self.manifest:
+    if self.manifest is None:
       if self.pnacl:
         self._GeneratePNaClManifest()
       else:
         self._GenerateManifest()
     return self.manifest
 
   def GetJson(self):
     """Returns the Manifest as a JSON-formatted string"""
     pretty_string = json.dumps(self.GetManifest(), indent=2)
     # json.dumps sometimes returns trailing whitespace and does not put
@@ skipping 118 matching lines @@
     libpath += [
       '%s/arm-nacl/lib' % bionic_dir,
       '%s/arm-nacl/usr/lib' % bionic_dir,
       'lib/bionic_arm/%s' % config,
     ]
   libpath = [os.path.normpath(p) for p in libpath]
   libpath = [os.path.join(sdk_root, p) for p in libpath]
   return libpath
 
 
-def main(argv):
-  parser = optparse.OptionParser(
-      usage='Usage: %prog [options] nexe [extra_libs...]', description=__doc__)
-  parser.add_option('-o', '--output', dest='output',
-                    help='Write manifest file to FILE (default is stdout)',
-                    metavar='FILE')
-  parser.add_option('-D', '--objdump', dest='objdump',
-                    help='Override the default "objdump" tool used to find '
-                         'shared object dependencies',
-                    metavar='TOOL')
-  parser.add_option('--no-default-libpath', action='store_true',
-                    help="Don't include the SDK default library paths")
-  parser.add_option('--debug-libs', action='store_true',
-                    help='Use debug library paths when constructing default '
-                         'library path.')
-  parser.add_option('-L', '--library-path', dest='lib_path',
-                    action='append', default=[],
-                    help='Add DIRECTORY to library search path',
-                    metavar='DIRECTORY')
-  parser.add_option('-P', '--path-prefix', dest='path_prefix', default='',
-                    help='Deprecated. An alias for --lib-prefix.',
-                    metavar='DIRECTORY')
-  parser.add_option('-p', '--lib-prefix', dest='lib_prefix', default='',
-                    help='A path to prepend to shared libraries in the .nmf',
-                    metavar='DIRECTORY')
-  parser.add_option('-N', '--nexe-prefix', dest='nexe_prefix', default='',
-                    help='A path to prepend to nexes in the .nmf',
-                    metavar='DIRECTORY')
-  parser.add_option('-s', '--stage-dependencies', dest='stage_dependencies',
-                    help='Destination directory for staging libraries',
-                    metavar='DIRECTORY')
-  parser.add_option('--no-arch-prefix', action='store_true',
-                    help='Don\'t put shared libraries in the lib32/lib64 '
-                    'directories. Instead, they will be put in the same '
-                    'directory as the .nexe that matches its architecture.')
-  parser.add_option('-t', '--toolchain', help='Legacy option, do not use')
-  parser.add_option('-n', '--name', dest='name',
-                    help='Rename FOO as BAR',
-                    action='append', default=[], metavar='FOO,BAR')
-  parser.add_option('-x', '--extra-files',
-                    help=('Add extra key:file tuple to the "files"' +
-                          ' section of the .nmf'),
-                    action='append', default=[], metavar='FILE')
-  parser.add_option('-O', '--pnacl-optlevel',
-                    help='Set the optimization level to N in PNaCl manifests',
-                    metavar='N')
-  parser.add_option('--pnacl-debug-optlevel',
-                    help='Set the optimization level to N for debugging '
-                         'sections in PNaCl manifests',
-                    metavar='N')
-  parser.add_option('-v', '--verbose',
-                    help='Verbose output', action='store_true')
-  parser.add_option('-d', '--debug-mode',
-                    help='Debug mode', action='store_true')
+def main(args):
+  parser = argparse.ArgumentParser(description=__doc__)
+  parser.add_argument('-o', '--output', dest='output',
+                      help='Write manifest file to FILE (default is stdout)',
+                      metavar='FILE')
+  parser.add_argument('-D', '--objdump', dest='objdump',
+                      help='Override the default "objdump" tool used to find '
+                           'shared object dependencies',
+                      metavar='TOOL')
+  parser.add_argument('--no-default-libpath', action='store_true',
+                      help="Don't include the SDK default library paths")
+  parser.add_argument('--debug-libs', action='store_true',
+                      help='Use debug library paths when constructing default '
+                           'library path.')
+  parser.add_argument('-L', '--library-path', dest='lib_path',
+                      action='append', default=[],
+                      help='Add DIRECTORY to library search path',
+                      metavar='DIRECTORY')
+  parser.add_argument('-P', '--path-prefix', dest='path_prefix', default='',
+                      help='Deprecated. An alias for --lib-prefix.',
+                      metavar='DIRECTORY')
+  parser.add_argument('-p', '--lib-prefix', dest='lib_prefix', default='',
+                      help='A path to prepend to shared libraries in the .nmf',
+                      metavar='DIRECTORY')
+  parser.add_argument('-N', '--nexe-prefix', dest='nexe_prefix', default='',
+                      help='A path to prepend to nexes in the .nmf',
+                      metavar='DIRECTORY')
+  parser.add_argument('-s', '--stage-dependencies', dest='stage_dependencies',
+                      help='Destination directory for staging libraries',
+                      metavar='DIRECTORY')
+  parser.add_argument('--no-arch-prefix', action='store_true',
+                      help='Don\'t put shared libraries in the lib32/lib64 '
+                      'directories. Instead, they will be put in the same '
+                      'directory as the .nexe that matches its architecture.')
+  parser.add_argument('-t', '--toolchain', help='Legacy option, do not use')
+  parser.add_argument('-n', '--name', dest='name',
+                      help='Rename FOO as BAR',
+                      action='append', default=[], metavar='FOO,BAR')
+  parser.add_argument('-x', '--extra-files',
+                      help=('Add extra key:file tuple to the "files"' +
+                            ' section of the .nmf'),
+                      action='append', default=[], metavar='FILE')
+  parser.add_argument('-O', '--pnacl-optlevel',
+                      help='Set the optimization level to N in PNaCl manifests',
+                      metavar='N')
+  parser.add_argument('--pnacl-debug-optlevel',
+                      help='Set the optimization level to N for debugging '
+                           'sections in PNaCl manifests',
+                      metavar='N')
+  parser.add_argument('-v', '--verbose',
+                      help='Verbose output', action='store_true')
+  parser.add_argument('-d', '--debug-mode',
+                      help='Debug mode', action='store_true')
+  parser.add_argument('executables', metavar='EXECUTABLE', nargs="+")
 
   # To enable bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
   #  complete -F _optcomplete create_nmf.py
   try:
     import optcomplete
     optcomplete.autocomplete(parser)
   except ImportError:
     pass
 
-  options, args = parser.parse_args(argv)
+  print(str(sys.argv))

[binji, 2014/12/08 21:58:20]

remove?

[Sam Clegg, 2015/01/14 15:28:32]

Done.

+  options = parser.parse_args(args)
+  print(options.executables)
   if options.verbose:
     Trace.verbose = True
   if options.debug_mode:
     DebugPrint.debug_mode = True
 
   if options.toolchain is not None:
     sys.stderr.write('warning: option -t/--toolchain is deprecated.\n')
 
-  if len(args) < 1:
-    parser.error('No nexe files specified.  See --help for more info')
-
   canonicalized = ParseExtraFiles(options.extra_files, sys.stderr)
   if canonicalized is None:
     parser.error('Bad --extra-files (-x) argument syntax')
 
   remap = {}
   for ren in options.name:
     parts = ren.split(',')
     if len(parts) != 2:
       parser.error('Expecting --name=<orig_arch.so>,<new_name.so>')
     remap[parts[0]] = parts[1]
@@ skipping 24 matching lines @@
   if options.pnacl_debug_optlevel is not None:
     pnacl_debug_optlevel = int(options.pnacl_debug_optlevel)
   else:
     pnacl_debug_optlevel = pnacl_optlevel
 
   nmf_root = None
   if options.output:
     nmf_root = os.path.dirname(options.output)
 
   nmf = NmfUtils(objdump=options.objdump,
-                 main_files=args,
+                 main_files=options.executables,
                  lib_path=options.lib_path,
                  extra_files=canonicalized,
                  lib_prefix=options.lib_prefix,
                  nexe_prefix=options.nexe_prefix,
                  no_arch_prefix=options.no_arch_prefix,
                  remap=remap,
                  pnacl_optlevel=pnacl_optlevel,
                  pnacl_debug_optlevel=pnacl_debug_optlevel,
                  nmf_root=nmf_root)
 
@@ skipping 13 matching lines @@
 if __name__ == '__main__':
   try:
     rtn = main(sys.argv[1:])
   except Error, e:
     sys.stderr.write('%s: %s\n' % (os.path.basename(__file__), e))
     rtn = 1
   except KeyboardInterrupt:
     sys.stderr.write('%s: interrupted\n' % os.path.basename(__file__))
     rtn = 1
   sys.exit(rtn)