Switching IRT to be built inside the chrome build.

chrome/build_nacl_irt.py

 #!/usr/bin/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.
 

[noelallen_use_chromium, 2011/08/23 21:42:05]

Clean out plz.

[bradn, 2011/08/23 21:53:48]

Done.

+#import sys

[Mark Seaborn, 2011/08/23 21:42:21]

Don't forget to remove this.

[bradn, 2011/08/23 21:53:48]

Done.

+#sys.stderr.write('AAAAAAA\n')
+#import os
+#print os.isatty(0)
+#print os.isatty(1)
+#print os.isatty(2)
+#print "here"
+#sys.stdout.flush()
+#import readline
+#sys.stderr.write('BBBBBBB\n')
+
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
 
 
 # Where things are in relation to this script.
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ skipping 56 matching lines @@
         continue
       if filename.startswith('scons-out'):
         continue
       if filename.endswith('.nexe'):
         continue
       # Apply the underlay of gpu/command_buffer (to match scons).
       if filename.startswith(NACL_CMD_BUFFER_DIR + os.sep):
         filename = GPU_CMD_BUFFER_DIR + filename[len(NACL_CMD_BUFFER_DIR):]
       inputs.add(filename)
   # Check that everything exists and make it script relative.
+  # Exclude things above SRC_DIR.
   rel_inputs = set()
   for f in inputs:
     nf = os.path.join(NACL_DIR, f)
     if not os.path.exists(nf):
       raise Exception('missing input file "%s"' % nf)
+    # If the relative path from SRC_DIR to the file starts with ../ ignore it.
+    # (i.e. the file is outside the client).
+    if RelativePath(nf, SRC_DIR).startswith('..' + os.sep):
+      continue
     rel_inputs.add(RelativePath(nf, SCRIPT_DIR))
   # Print it sorted.
   rel_inputs = sorted(list(rel_inputs))
   for f in rel_inputs:
     print f
 
 
 def BuildIRT(platforms, out_dir):
   """Build the IRT for several platforms.
 
   Arguments:
     platforms: list of platform names to build for.
     out_dir: directory to output the IRT to.
   """
+  # Make out_dir absolute.
+  out_dir = os.path.abspath(out_dir)
   # Clean.
   scons_out = os.path.join(NACL_DIR, 'scons-out')
   if os.path.exists(scons_out):
     shutil.rmtree(scons_out)
   # Build for each platform.
   for platform in platforms:
     cmd = [
         sys.executable, 'scons.py', '--verbose', '-j8',
         '--mode=nacl', 'platform=' + platform,
         'scons-out/nacl_irt-' + platform + '/staging/irt.nexe',
     ]
     print 'Running: ' + ' '.join(cmd)
-    p = subprocess.Popen(cmd, cwd=NACL_DIR)
+    os.chdir(NACL_DIR)
+    # Work around the fact that python's readline module (used by scons),
+    # attempts to alter file handle state on stdin in a way that blocks if
+    # a process is not the primary owner of a terminal on OSX.

[Mark Seaborn, 2011/08/23 21:42:21]

"not a member of a foreground job on a tty"?

e.g. On a Mac:

hydric:test mseaborn$ python -c 'import readline' &
[1] 67058
hydric:test mseaborn$ 
[1]+  Stopped                 python -c 'import readline'

i.e. the process receives a stop signal when it's a background job.

[bradn, 2011/08/23 21:53:48]

Done.

+    if sys.platform == 'darwin':
+      devnull = open(os.devnull, 'rb').fileno()

[Mark Seaborn, 2011/08/23 21:42:21]

open(os.devnull, 'rb').fileno() is wrong: the file object will probably get GC'd
and the file will be closed.

open(os.devnull, 'rb') will work: subprocess accepts file objects.

No need for the 'b' flag on Unix.

[bradn, 2011/08/23 21:53:48]

Done.

+    else:
+      devnull = None
+    p = subprocess.Popen(cmd, cwd=NACL_DIR, stdin=devnull)

[Mark Seaborn, 2011/08/23 21:42:21]

Use either cwd= or chdir() but not both?

[bradn, 2011/08/23 21:53:48]

Done.

     p.wait()
     if p.returncode != 0:
       sys.exit(3)
   # Copy out each platform after stripping.
   for platform in platforms:
     uplatform = platform.replace('-', '_')
     platform2 = {'x86-32': 'i686', 'x86-64': 'x86_64'}.get(platform, platform)
     cplatform = {
         'win32': 'win',
         'cygwin': 'win',
@@ skipping 31 matching lines @@
     sys.exit(1)
 
   if options.inputs:
     PrintInputs(options.platforms)
   else:
     BuildIRT(options.platforms, options.outdir)
 
 
 if __name__ == '__main__':
   Main(sys.argv)