Linux: call download_nacl_irt.py in export_tarball.py

tools/export_tarball/export_tarball.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.
 
 """
 This tool creates a tarball with all the sources, but without .svn directories.
 
 It can also remove files which are not strictly required for build, so that
 the resulting tarball can be reasonably small (last time it was ~110 MB).
 
 Example usage:
 
 export_tarball.py /foo/bar
 
 The above will create file /foo/bar.tar.bz2.
 """
 
 import optparse
 import os
+import subprocess
 import sys
 import tarfile
 
 NONESSENTIAL_DIRS = (
     'chrome/common/extensions/docs',
     'chrome/test/data',
     'chrome/tools/test/reference_build',
     'courgette/testdata',
     'data',
     'native_client/src/trusted/service_runtime/testdata',
@@ skipping 59 matching lines @@
 
   if len(args) != 1:
     print 'You must provide only one argument: output file name'
     print '(without .tar.bz2 extension).'
     return 1
 
   if not os.path.exists(GetSourceDirectory()):
     print 'Cannot find the src directory.'
     return 1
 
+  nacl_download_path = \

[bradn, 2011/05/24 19:55:36]

Style guide discourages \
Do this instead:
nacl_download_path = os.path.join(
    GetSourceDirectory(), 'build', 'download_nacl_irt.py')

[Paweł Hajdan Jr., 2011/05/25 08:49:44]

Done.

+      os.path.join(GetSourceDirectory(), 'build', 'download_nacl_irt.py')
+  nacl_cwd = os.path.join(GetSourceDirectory(), '..')
+  if subprocess.call(['python', nacl_download_path], cwd=nacl_cwd) != 0:
+    # The error is not fatal - NaCl is still experimental.
+    print 'Failed to download NaCl integrated runtime files.'
+    print 'The NaCl-enabled build will fail. You can pass -Ddisable_nacl=1'
+    print 'to gyp as a workaround. For more info see'
+    print 'http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/1fe6e2c3f9e78c2b'

[bradn, 2011/05/24 19:55:36]

Use () to split.

[Paweł Hajdan Jr., 2011/05/25 08:49:44]

Done.

+
   output_fullname = args[0] + '.tar.bz2'
   output_basename = os.path.basename(args[0])
 
   archive = MyTarFile.open(output_fullname, 'w:bz2')
   archive.set_remove_nonessential_files(options.remove_nonessential_files)
   try:
     archive.add(GetSourceDirectory(), arcname=output_basename)
   finally:
     archive.close()
 
   return 0
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))