Update idlsync.py to work with chrome generator.

tools/dom/scripts/idlsync.py

 #!/usr/bin/python
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import optparse
 import os
 import os.path
 import re
 import shutil
@@ skipping 31 matching lines @@
 
 The current version corresponds to:
 URL: %(url)s
 Current revision: %(revision)s
 """
 
 # Chrome info.
 CHROME_URL_PATTERN = r'"chromium_url": "(\S+)",'
 CHROME_REV_PATTERN = r'"chromium_revision": "(\d+)",'
 CHROME_IDL_SUBPATH = 'trunk/src/chrome/common/extensions/api'
-CHROME_TOOLS_SUBPATH = 'trunk/src/tools'
+CHROME_COMMENT_EATER_SUBPATH = 'trunk/src/tools/json_comment_eater'
 CHROME_COMPILER_SUBPATH = 'trunk/src/tools/json_schema_compiler'
 CHROME_IDL_PARSER_SUBPATH = 'trunk/src/ppapi/generators'
 CHROME_PLY_SUBPATH = 'trunk/src/third_party/ply'
 LOCAL_CHROME_IDL_PATH = os.path.join(DART_PATH, 'third_party', 'chrome', 'idl')
-LOCAL_CHROME_TOOLS_PATH = os.path.join(DART_PATH, 'third_party', 'chrome',
-                                       'tools')
+LOCAL_CHROME_COMMENT_EATER_PATH = os.path.join(
+      DART_PATH, 'third_party', 'chrome', 'tools', 'json_comment_eater')
 LOCAL_CHROME_COMPILER_PATH = os.path.join(DART_PATH, 'third_party', 'chrome',
                                           'tools', 'json_schema_compiler')
 LOCAL_CHROME_IDL_PARSER_PATH = os.path.join(DART_PATH, 'third_party', 'chrome',
                                             'ppapi', 'generators')
 LOCAL_CHROME_PLY_PATH = os.path.join(DART_PATH, 'third_party', 'chrome',
                                      'third_party', 'ply')
 LOCAL_CHROME_README = """\
 This directory contains a copy of Chromium IDL and generation scripts
 used to generate Dart APIs for Chrome Apps.
 
@@ skipping 27 matching lines @@
     # Chrome IDL.
     ('chrome', CHROME_IDL_SUBPATH, LOCAL_CHROME_IDL_PATH, LOCAL_CHROME_README,
      DEPTH_INFINITY),
     # Chrome PPAPI generators. Contains idl_parser.py which is used by the
     # Chrome IDL compiler.
     ('chrome', CHROME_IDL_PARSER_SUBPATH, LOCAL_CHROME_IDL_PARSER_PATH,
      LOCAL_CHROME_README, DEPTH_FILES),
     # ply files.
     ('chrome', CHROME_PLY_SUBPATH, LOCAL_CHROME_PLY_PATH, LOCAL_CHROME_README,
      DEPTH_INFINITY),
-    # Top level Chrome tools folder. Contains json_comment_eater.py which is
-    # needed by the Chrome IDL compiler.
-    ('chrome', CHROME_TOOLS_SUBPATH, LOCAL_CHROME_TOOLS_PATH,
+    # Path for json_comment_eater, which is needed by the Chrome IDL compiler.
+    ('chrome', CHROME_COMMENT_EATER_SUBPATH, LOCAL_CHROME_COMMENT_EATER_PATH,
      LOCAL_CHROME_README, DEPTH_FILES),
     # Chrome IDL compiler files.
     ('chrome', CHROME_COMPILER_SUBPATH, LOCAL_CHROME_COMPILER_PATH,
      LOCAL_CHROME_README, DEPTH_INFINITY),
     ]
 
 
-def RunCommand(cmd):
+def RunCommand(cmd, valid_exits=[0]):
   """Executes a shell command and return its stdout."""
   print ' '.join(cmd)
   pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   output = pipe.communicate()
-  if pipe.returncode == 0:
+  if pipe.returncode in valid_exits:
     return output[0]
   else:
     print output[1]
     print 'FAILED. RET_CODE=%d' % pipe.returncode
     sys.exit(pipe.returncode)
 
 
 def GetDeps():
   """Returns the DEPS file contents with pinned revision info."""
   return RunCommand(['svn', 'cat', DEPS])
@@ skipping 45 matching lines @@
     'revision': revision }
 
   readme_path = os.path.join(local_path, 'README')
   out = open(readme_path, 'w')
   out.write(readme)
   out.close()
 
 ZIP_ARCHIVE = 'version-control-dirs.zip'
 
 def SaveVersionControlDir(local_path):
-  RunCommand([
-    'sh', '-c',
-    'find %s -name .svn -or -name .git | zip -r %s -@' % (
-        os.path.relpath(local_path), ZIP_ARCHIVE)
-  ])
+  if os.path.exists(local_path):
+    RunCommand([
+      'sh', '-c',
+      'find %s -name .svn -or -name .git | zip -r %s -@' % (
+          os.path.relpath(local_path), ZIP_ARCHIVE)
+    ], [0, 12])  # It is ok if zip has nothing to do (exit code 12).
 
-
-def RestoreVersionControlDir():
-  RunCommand(['unzip', ZIP_ARCHIVE, '-d', '.'])
-  RunCommand(['rm', ZIP_ARCHIVE])
+def RestoreVersionControlDir(local_path):
+  archive_path = os.path.join(local_path, ZIP_ARCHIVE)
+  if os.path.exists(archive_path):
+    RunCommand(['unzip', ZIP_ARCHIVE, '-d', '.'])
+    RunCommand(['rm', ZIP_ARCHIVE])
 
 def ParseOptions():
   parser = optparse.OptionParser()
   parser.add_option('--webkit-revision', '-w', dest='webkit_revision',
                     help='WebKit IDL revision to install', default=None)
   parser.add_option('--chrome-revision', '-c', dest='chrome_revision',
                     help='Chrome IDL revision to install', default=None)
   parser.add_option('--update', '-u', dest='update',
                     help='IDL to update (webkit | chrome | all)',
                     default='webkit')
@@ skipping 12 matching lines @@
   for (component, remote_path, local_path, readme, depth) in UPDATE_LIST:
     if component in update.keys():
       revision = update[component]
       url, latest = GetSvnRevision(deps, component)
       if revision is None:
         revision = latest
       SaveVersionControlDir(local_path);
       RefreshFiles(url, revision, remote_path, local_path, depth)
       PruneExtraFiles(local_path)
       GenerateReadme(local_path, readme, url, revision)
-      RestoreVersionControlDir();
+      RestoreVersionControlDir(local_path);
 
 if __name__ == '__main__':
   main()