Use gn_helpers to deserialize GN lists.

mojo/public/tools/gn/zip.py

 #!/usr/bin/env python

[Dirk Pranke, 2016/01/29 21:01:56]

Is this script actually used somewhere? Can we use the other zip.py in //build
instead ?

[brettw, 2016/01/29 21:10:21]

You can see in a previous patch I removed this, and got errors. Then I spun off
a separate CL to just do that and I didn't get it to work.

The usage of this script depends on some specific handling of symbolic links
that I don't understand, and I wasted too long on it so I'm leaving as-is.

[Dirk Pranke, 2016/01/29 21:38:42]

Mike, can you help us figure out if this is needed?

[brettw, 2016/01/29 21:48:15]

I filed a bug https://code.google.com/p/chromium/issues/detail?id=582594 and
added a todo in this file with a reference to it.

[msw, 2016/01/29 21:59:38]

I don't have any useful offhand knowledge here, but I'll look next week.

 #
 # Copyright 2014 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.
 
 """Archives a set of files.
 """
 
-import ast
 import optparse
 import os
 import sys
 import zipfile
 
+sys.path.append(os.path.join(os.path.dirname(__file__),
+                             os.pardir, os.pardir, os.pardir, os.pardir,
+                             "build"))
+import gn_helpers
+
 def DoZip(inputs, link_inputs, zip_inputs, output, base_dir):
   files = []
   with zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED) as outfile:
     for f in inputs:
       file_name = os.path.relpath(f, base_dir)
       files.append(file_name)
       outfile.write(f, file_name)
     for f in link_inputs:
       realf = os.path.realpath(f)  # Resolve symlinks.
       file_name = os.path.relpath(realf, base_dir)
       files.append(file_name)
       outfile.write(realf, file_name)
     for zf_name in zip_inputs:
       with zipfile.ZipFile(zf_name, 'r') as zf:
         for f in zf.namelist():
           if f not in files:
             files.append(f)
             with zf.open(f) as zff:
               outfile.writestr(f, zff.read())
 
 
 def main():
   parser = optparse.OptionParser()
 
-  parser.add_option('--inputs', help='List of files to archive.')
+  parser.add_option('--inputs',
+      help='GN format list of files to archive.')
   parser.add_option('--link-inputs',
-      help='List of files to archive. Symbolic links are resolved.')
-  parser.add_option('--zip-inputs', help='List of zip files to re-archive.')
+      help='GN-format list of files to archive. Symbolic links are resolved.')
+  parser.add_option('--zip-inputs',
+      help='GN-format list of zip files to re-archive.')
   parser.add_option('--output', help='Path to output archive.')
   parser.add_option('--base-dir',
                     help='If provided, the paths in the archive will be '
                     'relative to this directory', default='.')
 
   options, _ = parser.parse_args()
 
   inputs = []
   if (options.inputs):
-    inputs = ast.literal_eval(options.inputs)
+    parser = gn_helpers.GNValueParser(options.inputs)
+    inputs = parser.ParseList()
+
   link_inputs = []
   if options.link_inputs:
-    link_inputs = ast.literal_eval(options.link_inputs)
+    parser = gn_helpers.GNValueParser(options.link_inputs)
+    link_inputs = parser.ParseList()
+
   zip_inputs = []
   if options.zip_inputs:
-    zip_inputs = ast.literal_eval(options.zip_inputs)
+    parser = gn_helpers.GNValueParser(options.zip_inputs)
+    zip_inputs = parser.ParseList()
+
   output = options.output
   base_dir = options.base_dir
 
   DoZip(inputs, link_inputs, zip_inputs, output, base_dir)
 
 if __name__ == '__main__':
   sys.exit(main())