Make the 7zip tool more flexible in handling different versions of 7zip.

site_scons/site_tools/seven_zip.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 15 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 """SCons tool for 7zip."""
 
 
 import os
+import re
 import shutil
 import subprocess
 import tempfile
 import SCons.Script
 
 
 def SevenZipGetFiles(env, source):
   """SCons emitter for 7zip extract.
 
   Examines the source 7z archive to determine the list of files which will be
   created by extract/unzip operation.
   Args:
     env: The SCons environment to get the 7zip command line from.
     source: The 7zip archive to examine.
   Returns:
     The list of filenames in the archive.
   """
   # Expand the command to list archive contents.
   cmd = env.subst('$SEVEN_ZIP l "%s"' % source)
   # Run it and capture output.
   output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
-  # Strip off 7-line header and 3-line trailer from 7zip output.
-  lines = output.split('\r\n')[7:-3]
-  # Trim out just the files and their names.
+  # Remove header + footer.
+  m = re.match('.*[-]{8}[^\n]*\n(.*)\r\n[-]{8}.*', output, re.DOTALL)
+  lines = m.group(1).split('\r\n')
+  # Trim out just the files and their names (skip directories).
   files = [i[53:] for i in lines if i[20] != 'D']
   return files
 
 
 def SevenZipEmitter(target, source, env):
   """An emitter that decides what nodes are vented from a 7zip archive.
 
   Args:
     target: The target directory node.
     source: The source archive node.
@@ skipping 66 matching lines @@
   b = SCons.Script.Builder(
       action=('cd $SOURCE && '
               '$SEVEN_ZIP a $SEVEN_ZIP_ARCHIVE_OPTIONS ${TARGET.abspath} ./'))
   env['BUILDERS']['Archive7zip'] = b
 
   b = SCons.Script.Builder(
       action=('cd ${SOURCE.dir} && '
               '$SEVEN_ZIP a $SEVEN_ZIP_COMPRESS_OPTIONS '
               '${TARGET.abspath} ${SOURCE.file}'))
   env['BUILDERS']['Compress7zip'] = b