diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 08:49:24 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 08:49:24 +0000 |
| commit | d83bcc93bf18df682e49b945c29a7a5e32013975 (patch) | |
| tree | 6ced2e7c39540aefffde294725b86a2ef05cd00b /tools/export_tarball | |
| parent | ac506f83614dc9d010b237d204d59e1c6c6a744e (diff) | |
| download | chromium_src-d83bcc93bf18df682e49b945c29a7a5e32013975.zip chromium_src-d83bcc93bf18df682e49b945c29a7a5e32013975.tar.gz chromium_src-d83bcc93bf18df682e49b945c29a7a5e32013975.tar.bz2 | |
Linux: call download_nacl_irt.py in export_tarball.py
to make sure the generated tarballs can be built with NaCl support.
export_tarball.py is not the prettiest place for this,
but it's the easiest to modify (public repo),
and can easily be kept in sync with other scripts in the tree
in case anything changes.
BUG=none
Review URL: http://codereview.chromium.org/7066022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/export_tarball')
| -rw-r--r-- | tools/export_tarball/export_tarball.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/export_tarball/export_tarball.py b/tools/export_tarball/export_tarball.py index aed61e6..03c8995 100644 --- a/tools/export_tarball/export_tarball.py +++ b/tools/export_tarball/export_tarball.py @@ -18,6 +18,7 @@ The above will create file /foo/bar.tar.bz2. import optparse import os +import subprocess import sys import tarfile @@ -97,6 +98,17 @@ def main(argv): print 'Cannot find the src directory.' return 1 + nacl_download_path = 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') + output_fullname = args[0] + '.tar.bz2' output_basename = os.path.basename(args[0]) |