Make the migrated ChromeVox work.

chrome/browser/resources/chromeos/chromevox/tools/jsbundler.py

 #!/usr/bin/env python
 
 # 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.
 
 '''Produces various output formats from a set of JavaScript files with
 closure style require/provide calls.
 
 Scans one or more directory trees for JavaScript files.  Then, from a
@@ skipping 14 matching lines @@
 - compressed_bundle: A bundle where non-significant whitespace, including
   comments, has been stripped is output.
 
 - copy: the files are copied, or hard linked if possible, to the destination
   directory.  In this case, no output is generated.
 '''
 
 
 import optparse
 import os
+import re
 import shutil
 import sys
 
 _SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
 _CHROME_SOURCE = os.path.realpath(
     os.path.join(_SCRIPT_DIR, *[os.path.pardir] * 6))
 sys.path.insert(0, os.path.join(
     _CHROME_SOURCE, 'third_party/WebKit/Source/build/scripts'))
 sys.path.insert(0, os.path.join(
     _CHROME_SOURCE, ('chrome/third_party/chromevox/third_party/' +
@@ skipping 119 matching lines @@
   for path in source_files:
     if need_source_text:
       EnsureSourceLoaded(path, sources)
     else:
       # Just add an empty representation of the source.
       sources[path] = SourceWithPaths(
           '', path, path_rewriter.RewritePath(path))
   return sources
 
 
+def _GetBase(sources):
+  '''Gets the closure base.js file if present among the sources.
+
+  Args:
+    sources, dict: Dictionary with SourceWithPath objects as values.
+  Returns:

[David Tseng, 2014/06/12 20:23:29]

'sources, dict' looks like a pair so perhaps remove ', dict'. Also, more useful
to say '... path string as keys, SourceWithPath objects as values

+    SourceWithPath: The source file providing the goog namespace.
+  '''
+  for source in sources.itervalues():
+    if (os.path.basename(source.GetInPath()) == 'base.js' and
+        'goog' in source.provides):
+      return source
+  Die('goog.base not provided by any file.')
+
+
 def CalcDeps(bundle, sources, top_level):
   '''Calculates dependencies for a set of top-level files.
 
   Args:
     bundle: Bundle to add the sources to.
     sources, dict: Mapping from input path to SourceWithPaths objects.
     top_level, list: List of top-level input paths to calculate dependencies
       for.
   '''
-  def GetBase(sources):
-    for source in sources.itervalues():
-      if (os.path.basename(source.GetInPath()) == 'base.js' and
-          'goog' in source.provides):
-        return source
-    Die('goog.base not provided by any file')
-
   providers = [s for s in sources.itervalues() if len(s.provides) > 0]
   deps = depstree.DepsTree(providers)
   namespaces = []
   for path in top_level:
     namespaces.extend(sources[path].requires)
   # base.js is an implicit dependency that always goes first.
-  bundle.Add(GetBase(sources))
+  bundle.Add(_GetBase(sources))
   bundle.Add(deps.GetDependencies(namespaces))
 
 
+def _MarkAsCompiled(sources):
+  '''Sets COMPILED to true in the Closure base.js source.'''

[David Tseng, 2014/06/12 20:23:29]

nit: Args?

+  base = _GetBase(sources)
+  new_content, count = re.subn('^var COMPILED = false;$',
+                               'var COMPILED = true;',
+                               base.GetSource(),
+                               count=1,
+                               flags=re.MULTILINE)
+  if count != 1:
+    Die('COMPILED var assignment not found in %s' % base.GetInPath())

[David Tseng, 2014/06/12 20:23:29]

Print the count since technically it could be > 1

+  sources[base.GetInPath()] = SourceWithPaths(
+      new_content,
+      base.GetInPath(),
+      base.GetOutPath())
+
 def LinkOrCopyFiles(sources, dest_dir):
   '''Copies a list of sources to a destination directory.'''
 
   def LinkOrCopyOneFile(src, dst):
     if not os.path.exists(os.path.dirname(dst)):
       os.makedirs(os.path.dirname(dst))
     if os.path.exists(dst):
       # Avoid clobbering the inode if source and destination refer to the
       # same file already.
       if os.path.samefile(src, dst):
@@ skipping 61 matching lines @@
                     default='list', metavar='MODE',
                     help=("Otput mode. One of 'list', 'html', 'bundle', " +
                           "'compressed_bundle' or 'copy'."))
   return parser
 
 
 def main():
   options, args = CreateOptionParser().parse_args()
   if len(args) < 1:
     Die('At least one top-level source file must be specified.')
+  output_bundle = options.mode in ('bundle', 'compressed_bundle')
   path_rewriter = PathRewriter(options.prefix_map)

[David Tseng, 2014/06/12 20:23:29]

Maybe call this need_source_text?

-  sources = ReadSources(options.roots,
-                        args,
-                        options.mode in ('bundle', 'compressed_bundle'),
-                        path_rewriter)
+  sources = ReadSources(options.roots, args, output_bundle, path_rewriter)
+  if output_bundle:
+    _MarkAsCompiled(sources)
   bundle = Bundle()
   if len(options.roots) > 0:
     CalcDeps(bundle, sources, args)
   bundle.Add((sources[name] for name in args))
   if options.mode == 'copy':
     if options.dest_dir is None:
       Die('Must specify --dest_dir when copying.')
     LinkOrCopyFiles(bundle.GetSources(), options.dest_dir)
   else:
     if options.output_file:
       out_file = open(options.output_file, 'w')
     else:
       out_file = sys.stdout
     try:
       WriteOutput(bundle, options.mode, out_file, options.dest_dir)
     finally:
       if options.output_file:
         out_file.close()
 
 
 if __name__ == '__main__':
   main()