Build frog and frogsh at the top-level.

frog/frog.py

 #!/usr/bin/env python
 # Copyright (c) 2011, 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.
 
 """Command line wrapper to run the frog compiler under the Dart VM"""
 
 # TODO(jimhug): This is a temporary hack to enable running on the VM.  We need
 #   the ability to get command-line arguments, to return exit codes, and to
 #   communicate with spawned processes in the VM for this to go away.
@@ skipping 40 matching lines @@
   dart = join(os.pardir, dart)
   if exists(dart): return dart
 
   # Try a debug version
   dart = utils.GetDartRunner('debug', 'ia32', 'vm')
   if exists(dart): return dart
   # Try at the top level
   dart = join(os.pardir, dart)
   return dart
 
+def GetD8():

[ngeoffray, 2011/11/04 10:42:21]

With frog.py soon to be removed, I don't think it's a problem to currently go
through all these tests. Hopefully, frog.py will be replaced with something that
integrates nicely with the build.

+  system = utils.GuessOS()
+  d8 = join(utils.GetBuildRoot(system, 'release', 'ia32'), 'd8')
+  if exists(d8): return d8
+  # Try at the top level
+  d8 = join(os.pardir, d8)
+  if exists(d8): return d8
+
+  # Try a debug version
+  d8 = join(utils.GetBuildRoot(system, 'debug', 'ia32'), 'd8')
+  if exists(d8): return d8
+  # Try at the top level
+  d8 = join(os.pardir, d8)
+  return d8
+
+
+D8 = GetD8()
 
 def execute(cmd):
   """Execute a command in a subprocess. """
   try:
     pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = pipe.communicate()
     if out is not None: sys.stdout.write(out)
     if err is not None: sys.stderr.write(err)
     return pipe.returncode
   except Exception as e:
@@ skipping 56 matching lines @@
   if len(extraArgs) != 0:
     optionParser.print_help()
     return 1
 
   dart = GetDart()
   if not exists(dart):
     print("Dart VM not configured in %s" % dart)
     return 1
 
   if subprocess.call("node --help >/dev/null 2>&1", shell=True):
-    print "Executing node failed. See frog/README.txt for instructions"
-    return 1
+    if not exists(D8):
+      print "No engine available for running JS code."
+      print "See frog/README.txt for instructions."
+      return 1
+    elif 'node' in options.js_cmd:
+      options.js_cmd = D8
 
   return compileAndRun(options, dartArgs, dart)
 
 
 def compileAndRun(options, args, dart):
   nodeArgs = []
   for i in range(len(args)):
     if args[i].endswith('.dart'):
       nodeArgs = args[i+1:]
       args = args[:i+1]
@@ skipping 62 matching lines @@
       f.close()
       result = execute([browser, outhtml])
 
   if cleanup: shutil.rmtree(workdir)
   if result != 0:
     return 1
   return 0
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))