Chromium NaCl scripts now uses package_version to extract.

build/download_nacl_toolchains.py

Index: build/download_nacl_toolchains.py
diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
index 3a4cb1b8bfaf08239f7ff348effb28d648e63627..4895c1a3fdd1bde1b3cc420008d56ce3731e328f 100755
--- a/build/download_nacl_toolchains.py
+++ b/build/download_nacl_toolchains.py
@@ -17,16 +17,16 @@ def Main(args):
   src_dir = os.path.dirname(script_dir)
   nacl_dir = os.path.join(src_dir, 'native_client')
   nacl_build_dir = os.path.join(nacl_dir, 'build')
-  download_script = os.path.join(nacl_build_dir, 'download_toolchains.py')
-  if not os.path.exists(download_script):
-    print "Can't find '%s'" % download_script
+  package_version_dir = os.path.join(nacl_build_dir, 'package_version')
+  package_version = os.path.join(package_version_dir, 'package_version.py')
+  if not os.path.exists(package_version):
+    print "Can't find '%s'" % package_version
     print 'Presumably you are intentionally building without NativeClient.'
     print 'Skipping NativeClient toolchain download.'
     sys.exit(0)
-  sys.path.insert(0, nacl_build_dir)
-  import download_toolchains
+  sys.path.insert(0, package_version_dir)
+  import package_version
 
-  # TODO (robertm): Finish getting PNaCl ready for prime time.
   # BUG:
   # We remove this --optional-pnacl argument, and instead replace it with
   # --no-pnacl for most cases.  However, if the bot name is an sdk
@@ -41,21 +41,17 @@ def Main(args):
     if use_pnacl:
       print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n'
     else:
-      args.append('--no-pnacl')
+      args.extend(['--exclude', 'pnacl_newlib'])
 
   # Only download the ARM gcc toolchain if we are building for ARM
   # TODO(olonho): we need to invent more reliable way to get build
   # configuration info, to know if we're building for ARM.
-  if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''):
-      args.append('--arm-untrusted')
+  if 'target_arch=arm' not in os.environ.get('GYP_DEFINES', ''):
+      args.extend(['--exclude', 'nacl_arm_newlib'])
 
-  # Append the name of the file to use as a version and hash source.
-  # NOTE:  While not recommended, it is possible to redirect this file to
-  # a chrome location to avoid branching NaCl if just a toolchain needs
-  # to be bumped.
-  args.append(os.path.join(nacl_dir, 'TOOL_REVISIONS'))
-
-  download_toolchains.main(args)
+  args.append('sync')
+  args.append('--extract')
+  package_version.main(args)

[jvoung - send to chromium..., 2014/05/02 15:49:15]

I don't know if someone's mentioned this already or not, but the main waterfall
IOS builders seem to be attempting to download:

http://build.chromium.org/p/chromium.mac/builders/iOS%20Device%20%28ninja%29/...

python ../../../scripts/slave/runhooks_wrapper.py
 in dir /b/build/slave/iOS_Device__ninja_/build (timeout 600 secs) (maxTime
28800 secs)
 watching logfiles {}
 argv: ['python', '../../../scripts/slave/runhooks_wrapper.py']
 environment:
  AWS_CREDENTIAL_FILE=/b/build/site_config/.boto
  BOTO_CONFIG=/b/build/site_config/.boto
  CHROME_HEADLESS=1
  CHROMIUM_GYP_SYNTAX_CHECK=1
  DEPOT_TOOLS_UPDATE=0
  GYP_CROSSCOMPILE=1
  GYP_DEFINES=component=static_library OS=ios target_subarch=both
  GYP_GENERATORS=ninja
  GYP_GENERATOR_FLAGS=
  HOME=/Users/chrome-bot
  LANDMINES_VERBOSE=1
  LOGNAME=chrome-bot
  PAGER=cat
 
PATH=/Users/chrome-bot/slavebin:/b/depot_tools:/usr/local/git/bin:/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
  PWD=/b/build/slave/iOS_Device__ninja_/build
 
PYTHONPATH=/b/build/site_config:/b/build/scripts:/b/build/scripts/release:/b/build/third_party:/b/build_internal/site_config:/b/build_internal/symsrc:/b/build/slave:/b/build/third_party/buildbot_slave_8_4:/b/build/third_party/twisted_10_2:
  SHELL=/bin/bash
  SSH_AUTH_SOCK=/tmp/launch-yVpumu/Listeners
  USER=chrome-bot
 using PTY: False

gclient runhooks

________ running
'/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/python
src/build/download_nacl_toolchains.py --exclude arm_trusted' in
'/b/build/slave/iOS_Device__ninja_/build'
Error: Command
/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/python
src/build/download_nacl_toolchains.py --exclude arm_trusted returned non-zero
exit status 1 in /b/build/slave/iOS_Device__ninja_/build
Traceback (most recent call last):
  File "src/build/download_nacl_toolchains.py", line 59, in <module>
    sys.exit(Main(sys.argv[1:]))
  File "src/build/download_nacl_toolchains.py", line 54, in Main
    package_version.main(args)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/package_version.py",
line 892, in main
    return COMMANDS[arguments.command].do_cmd_func(arguments)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/package_version.py",
line 634, in _DoSyncCmd
    revision_file)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/revision_info.py",
line 43, in __init__
    self.LoadRevisionFile(revision_file)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/revision_info.py",
line 93, in LoadRevisionFile
    with open(revision_file, 'rt') as f:
IOError: [Errno 2] No such file or directory:
u'/b/build/slave/iOS_Device__ninja_/build/src/native_client/toolchain_revisions/nacl_x86_glibc.json'
program finished with exit code 2
elapsedTime=1.991995


I thought IOS builds would have disable_nacl=1 and skip out early, but it looks
like that's not the case... Did it used to skip downloads via a different
mechanism or ?

   return 0