Added a -s switch to sort the manifest. Default is unsorted.

Author: ianamason

wllvm/extraction.py

@@ -242,7 +242,7 @@ def extract_from_thin_archive(inputFile):
     """
     retval = None
 
-    arCmd = ['ar', '-t', inputFile]         #might be os dependent
+    arCmd = ['ar', '-t', inputFile]         #iam: check if this might be os dependent
     arProc = Popen(arCmd, stdout=sp.PIPE)
 
     arOutput = arProc.communicate()[0]
@@ -263,7 +263,7 @@ def handleExecutable(pArgs):
         return 1
 
     if pArgs.manifestFlag:
-        writeManifest('{0}.llvm.manifest'.format(pArgs.inputFile), fileNames)
+        writeManifest(pArgs, '{0}.llvm.manifest'.format(pArgs.inputFile), fileNames)
 
     if pArgs.outputFile is None:
         pArgs.outputFile = pArgs.inputFile + '.' + moduleExtension
@@ -273,11 +273,6 @@ def handleExecutable(pArgs):
 
 def handleThinArchive(pArgs):
 
-    if pArgs.bitcodeModuleFlag:
-        _logger.info('Generating LLVM Bitcode module from an archive')
-    else:
-        _logger.info('Generating LLVM Bitcode archive from an archive')
-
     objectPaths = extract_from_thin_archive(pArgs.inputFile)
 
     if not objectPaths:
@@ -297,11 +292,6 @@ def handleThinArchive(pArgs):
 
 def handleArchive(pArgs):
 
-    if pArgs.bitcodeModuleFlag:
-        _logger.info('Generating LLVM Bitcode module from an archive')
-    else:
-        _logger.info('Generating LLVM Bitcode archive from an archive')
-
     originalDir = os.getcwd() # This will be the destination
 
     pArgs.arCmd.append(pArgs.inputFile)
@@ -366,9 +356,14 @@ def handleArchive(pArgs):
 
 def buildArchive(pArgs, bitCodeFiles):
 
+    if pArgs.bitcodeModuleFlag:
+        _logger.info('Generating LLVM Bitcode module from an archive')
+    else:
+        _logger.info('Generating LLVM Bitcode archive from an archive')
+
     #write the manifest file if asked for
     if pArgs.manifestFlag:
-        writeManifest('{0}.llvm.manifest'.format(pArgs.inputFile), bitCodeFiles)
+        writeManifest(pArgs, '{0}.llvm.manifest'.format(pArgs.inputFile), bitCodeFiles)
 
     if pArgs.bitcodeModuleFlag:
 
@@ -398,13 +393,16 @@ def buildArchive(pArgs, bitCodeFiles):
         return archiveFiles(pArgs, bitCodeFiles)
 
 
-def writeManifest(manifestFile, bitCodeFiles):
+def writeManifest(pArgs, manifestFile, bitCodeFiles):
+    if  pArgs.sortManifestFlag:
+        bitCodeFiles = sorted(bitCodeFiles)
     with open(manifestFile, 'w') as output:
-        for f in sorted(bitCodeFiles):
+        for f in bitCodeFiles:
             output.write('{0}\n'.format(f))
             sf = getStorePath(f)
             if sf:
                 output.write('{0}\n'.format(sf))
+    _logger.warning('Manifest written to %s', manifestFile)
 
 
 
@@ -457,6 +455,10 @@ def extract_bc_args():
                         dest='manifestFlag',
                         help='Write a manifest file listing all the .bc files used.',
                         action='store_true')
+    parser.add_argument('--sortmanifest', '-s',
+                        dest='sortManifestFlag',
+                        help='Sort the manifest file (if written).',
+                        action='store_true')
     parser.add_argument('--bitcode', '-b',
                         dest='bitcodeModuleFlag',
                         help='Extract a bitcode module rather than an archive. ' +