Add DSC files for the various examples.

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.
 
 from __future__ import with_statement
 
 import errno
 import optparse
 import os
@@ skipping 76 matching lines @@
 class NmfUtils(object):
   '''Helper class for creating and managing nmf files
 
   Attributes:
     manifest: A JSON-structured dict containing the nmf structure
     needed: A dict with key=filename and value=ArchFile (see GetNeeded)
   '''
 
   def __init__(self, main_files=None, objdump='x86_64-nacl-objdump',
                lib_path=None, extra_files=None, lib_prefix=None,
-               toolchain=None):
+               toolchain=None, remap={}):
     ''' Constructor
 
     Args:
       main_files: List of main entry program files.  These will be named
           files->main.nexe for dynamic nexes, and program for static nexes
       objdump: path to x86_64-nacl-objdump tool (or Linux equivalent)
       lib_path: List of paths to library directories
       extra_files: List of extra files to include in the nmf
       lib_prefix: A list of path components to prepend to the library paths,
           both for staging the libraries and for inclusion into the nmf file.
           Examples:  ['..'], ['lib_dir']
       toolchain: Specify which toolchain newlib|glibc|pnacl which can require
-          different forms of the NMF.'''
+          different forms of the NMF.
+      remap: Remaps the library name in the manifest.
+      '''
     self.objdump = objdump
     self.main_files = main_files or []
     self.extra_files = extra_files or []
     self.lib_path = lib_path or []
     self.manifest = None
     self.needed = None
     self.lib_prefix = lib_prefix or []
     self.toolchain = toolchain
+    self.remap = remap
 
 
   def GleanFromObjdump(self, files):
     '''Get architecture and dependency information for given files
 
     Args:
       files: A dict with key=filename and value=list or set of archs.  E.g.:
           { '/path/to/my.nexe': ['x86-32']
             '/path/to/lib64/libmy.so': ['x86-64'],
             '/path/to/mydata.so': ['x86-32', 'x86-64'],
@@ skipping 143 matching lines @@
         # We assume that the nexe and the corresponding nmf file are
         # installed in the same directory.
         urlinfo[URL_KEY] = os.path.basename(urlinfo[URL_KEY])
         # Place it under program if we aren't using the runnable-ld.so.
         if not runnable:
           manifest[PROGRAM_KEY][archinfo.arch] = urlinfo
           continue
         # Otherwise, treat it like another another file named main.nexe.
         name = MAIN_NEXE
 
+      name = self.remap.get(name, name)
       fileinfo = manifest[FILES_KEY].get(name, {})
       fileinfo[archinfo.arch] = urlinfo
       manifest[FILES_KEY][name] = fileinfo
+      print 'need=' + str(need)

[binji, 2012/06/11 20:22:29]

debug spew?

[noelallen1, 2012/06/11 20:34:38]

Done.

+      print 'name=' + str(name)
     self.manifest = manifest
 
   def GetManifest(self):
     '''Returns a JSON-formatted dict containing the NaCl dependencies'''
     if not self.manifest:
       self._GenerateManifest()
 
     return self.manifest
 
   def GetJson(self):
@@ skipping 38 matching lines @@
                     metavar='DIRECTORY')
   parser.add_option('-s', '--stage-dependencies', dest='stage_dependencies',
                     help='Destination directory for staging libraries',
                     metavar='DIRECTORY')
   parser.add_option('-r', '--remove', dest='remove',
                     help='Remove the prefix from the files.',
                     metavar='PATH')
   parser.add_option('-t', '--toolchain', dest='toolchain',
                     help='Add DIRECTORY to library search path',
                     default=None, metavar='TOOLCHAIN')
+  parser.add_option('-n', '--name', dest='name',
+                    help='Rename FOO as BAR',
+                    action='append', default=[], metavar='FOO,BAR')
   (options, args) = parser.parse_args(argv)
   
   if not options.toolchain:
     options.toolchain = DetermineToolchain(os.path.abspath(options.objdump))
 
   if options.toolchain not in ['newlib', 'glibc']:
     ErrorOut('Unknown toolchain: ' + str(options.toolchain))
 
   if len(args) < 1:
     parser.print_usage()
     sys.exit(1)
 
+  remap = {}
+  for ren in options.name:
+    parts = ren.split(',')
+    if len(parts) != 2:
+      ErrorOut('Expecting --name=<orig_arch.so>,<new_name.so>')
+    remap[parts[0]] = parts[1]
+
   nmf = NmfUtils(objdump=options.objdump,
                  main_files=args,
                  lib_path=options.lib_path,
-                 toolchain=options.toolchain)
+                 toolchain=options.toolchain,
+                 remap=remap)
 
   manifest = nmf.GetManifest()
   if options.output is None:
     sys.stdout.write(nmf.GetJson())
   else:
     with open(options.output, 'w') as output:
       output.write(nmf.GetJson())
 
   if options.stage_dependencies:
     nmf.StageDependencies(options.stage_dependencies)
 
 
 # Invoke this file directly for simple testing.
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))