Allow generator javascript test files to go anywhere in the source tree

tools/gypv8sh.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """This script is used by chrome_tests.gypi's js2webui action to maintain the
 argument lists and to generate inlinable tests.
 
 Usage:
   python tools/gypv8sh.py v8_shell mock.js test_api.js js2webui.js \
-         inputfile outputfile
+         inputfile inputrelfile cxxoutfile jsoutfile
 """
 
 try:
   import json
 except ImportError:
   import simplejson as json
 import optparse
 import os
 import subprocess
 import sys
+import shutil
 
 def main ():
   parser = optparse.OptionParser()
   parser.set_usage(
-      "%prog v8_shell mock.js test_api.js js2webui.js inputfile outputfile")
+      "%prog v8_shell mock.js test_api.js js2webui.js inputfile inputrelfile "
+      "cxxoutfile jsoutfile")
   parser.add_option('-v', '--verbose', action='store_true')
   parser.add_option('-n', '--impotent', action='store_true',
                     help="don't execute; just print (as if verbose)")
   (opts, args) = parser.parse_args()
 
-  if len(args) != 6:
+  if len(args) != 8:
     parser.error('all arguments are required.')
-  v8_shell, mock_js, test_api, js2webui, inputfile, outputfile = args
-  arguments = [js2webui, inputfile, os.path.basename(inputfile), outputfile]
+  (v8_shell, mock_js, test_api, js2webui, inputfile, inputrelfile,
+      cxxoutfile, jsoutfile) = args
+  arguments = [js2webui, inputfile, inputrelfile, cxxoutfile]
   cmd = [v8_shell, '-e', "arguments=" + json.dumps(arguments), mock_js,
          test_api, js2webui]
   if opts.verbose or opts.impotent:
     print cmd
   if not opts.impotent:
     try:
-      subprocess.check_call(cmd, stdout=open(outputfile,'w'))
+      subprocess.check_call(cmd, stdout=open(cxxoutfile,'w'))

[James Hawkins, 2011/10/21 23:35:49]

Space between params.

[Sheridan Rawlins, 2011/10/22 00:09:11]

Done.

+      shutil.copyfile(inputfile, jsoutfile)
     except Exception, ex:
       print ex
-      os.remove(outputfile)
+      os.remove(cxxoutfile)
+      os.remove(jsoutfile)
       sys.exit(1)
 
 if __name__ == '__main__':
  sys.exit(main())