extract-bc gets a --manifest or -m flag

Author: ianamason

extract-bc

@@ -139,18 +139,18 @@ def extract_section_linux(inputFile):
     return contents
 
 
-def handleExecutable(inputFile, outputFile, extractor, llvmLinker):
+def handleExecutable(inputFile, outputFile, extractor, llvmLinker, manifestFlag):
 
     fileNames = extractor(inputFile)
 
     if not fileNames:
         return 1
-
-    manifestFile = '{0}.occcam.manifest'.format(inputFile)
 
-    with open(manifestFile, 'w') as output:
-        for f in fileNames:
-            output.write('{0}\n'.format(f))
+    if manifestFlag:
+        manifestFile = '{0}.occcam.manifest'.format(inputFile)
+        with open(manifestFile, 'w') as output:
+            for f in fileNames:
+                output.write('{0}\n'.format(f))
 
     if outputFile == None:
         outputFile = inputFile + '.' + moduleExtension
@@ -179,7 +179,7 @@ def handleExecutable(inputFile, outputFile, extractor, llvmLinker):
 
 
 
-def handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchiver):
+def handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchiver, manifestFlag):
     inputFile = os.path.abspath(inputFile)
     originalDir = os.getcwd() # This will be the destination
 
@@ -237,6 +237,13 @@ def handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchive
         # Delete the temporary folder
         logging.debug('Deleting temporary folder "{0}"'.format(tempDir))
         shutil.rmtree(tempDir)
+        
+    #write the manifest file if asked for
+    if manifestFlag:
+        manifestFile = '{0}.occcam.manifest'.format(inputFile)
+        with open(manifestFile, 'w') as output:
+            for f in bitCodeFiles:
+                output.write('{0}\n'.format(f))
 
     # Build bitcode archive
     os.chdir(originalDir)
@@ -325,6 +332,9 @@ def extract_bc_args(args):
     parser.add_argument("--verbose","-v",
                         help='Call the external procedures in verbose mode.',
                         action="store_true")
+    parser.add_argument("--manifest","-m",
+                        help='Write a manifest file listing all the .bc files used.',
+                        action="store_true")
     parser.add_argument("--output","-o",
                         help='The output file. Defaults to a file in the same directory ' +
                              'as the input with the same name as the input but with an ' +
@@ -337,11 +347,12 @@ def extract_bc_args(args):
     llvmLinker = parsedArgs.linker
     llvmArchiver = parsedArgs.archiver
     verboseFlag = parsedArgs.verbose
-    
+    manifestFlag = parsedArgs.manifest
+
     # Check file exists
     if not os.path.exists(inputFile):
         logging.error('File "{0}" does not exist.'.format(inputFile))
-        return (False, inputFile, '', llvmLinker, llvmArchiver)
+        return (False, inputFile, '', llvmLinker, llvmArchiver, manifestFlag)
 
     # Check output destitionation if set
     outputFile = parsedArgs.output
@@ -351,34 +362,34 @@ def extract_bc_args(args):
       if not os.path.exists(os.path.dirname(outputFile)):
         logging.error('Output directory "{0}" does not exist.'.format(
                       os.path.dirname(outputFile)))
-        return (False, inputFile, '', llvmLinker, llvmArchiver)
+        return (False, inputFile, '', llvmLinker, llvmArchiver, manifestFlag)
 
-    return (True, inputFile, outputFile, llvmLinker, llvmArchiver)
+    return (True, inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag)
 
 
 def main(args):
 
-    (success, inputFile, outputFile, llvmLinker, llvmArchiver) = extract_bc_args(args)
+    (success, inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag) = extract_bc_args(args)
 
     if not success:
         return 1
 
     if ( sys.platform.startswith('freebsd') or
          sys.platform.startswith('linux') ):
 
-        process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver)
+        process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag)
 
     elif sys.platform.startswith('darwin'):
 
-        process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver)
+        process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag)
 
     else:
         #iam: do we work on anything else? 
         logging.error('Unsupported or unrecognized platform: {0}'.format(sys.platform))
         return 1
 
 
-def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver):
+def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag):
     ft = FileType.getFileType(inputFile)
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
@@ -388,17 +399,17 @@ def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver):
 
     if ft == FileType.ELF_EXECUTABLE or ft == FileType.ELF_SHARED or ft == FileType.ELF_OBJECT:
         logging.info('Generating LLVM Bitcode module')
-        return handleExecutable(inputFile, outputFile, extractor, llvmLinker)
+        return handleExecutable(inputFile, outputFile, extractor, llvmLinker, manifestFlag)
     elif ft == FileType.ARCHIVE:
         logging.info('Generating LLVM Bitcode archive')
-        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver)
+        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver, manifestFlag)
     else:
         logging.error('File "{0}" of type {1} cannot be used'.format(inputFile,FileType.revMap[ft]))
         return 1
 
 
 
-def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver):
+def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver, manifestFlag):
     ft = FileType.getFileType(inputFile)
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
@@ -408,10 +419,10 @@ def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver):
 
     if ft == FileType.MACH_EXECUTABLE or ft == FileType.MACH_SHARED or ft == FileType.MACH_OBJECT:
         logging.info('Generating LLVM Bitcode module')
-        return handleExecutable(inputFile, outputFile, extractor, llvmLinker)
+        return handleExecutable(inputFile, outputFile, extractor, llvmLinker, manifestFlag)
     elif ft == FileType.ARCHIVE:
         logging.info('Generating LLVM Bitcode archive')
-        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver)
+        return handleArchive(inputFile, outputFile, arCmd, ofileType, extractor, llvmArchiver, manifestFlag)
     else:
         logging.error('File "{0}" of type {1} cannot be used'.format(inputFile,FileType.revMap[ft]))
         return 1