[NaCL SDK] Roll naclports revision.

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 36 matching lines @@
 # Add SDK make tools scripts to the python path.
 sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
 sys.path.append(os.path.join(NACL_DIR, 'build'))
 
 import getos
 import oshelpers
 
 CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
 
 NACLPORTS_URL = 'https://naclports.googlecode.com/svn/trunk/src'
-NACLPORTS_REV = 850
+NACLPORTS_REV = 954

[binji, 2013/10/31 16:34:36]

CL comment says 951

[Sam Clegg, 2013/10/31 16:54:16]

Done.

 
 GYPBUILD_DIR = 'gypbuild'
 
 options = None
 
 
 def GetGlibcToolchain():
   tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
   tcname = 'toolchain_%s_x86.tar.bz2' % getos.GetPlatform()
   return os.path.join(tcdir, tcname)
@@ skipping 745 matching lines @@
   else:
     # sync existing copy to pinned revision.
     cmd = ['svn', 'update', '-r', str(NACLPORTS_REV)]
     buildbot_common.Run(cmd, cwd=NACLPORTS_DIR)
 
 
 def BuildStepBuildNaClPorts(pepper_ver, pepperdir):
   """Build selected naclports in all configurations."""
   # TODO(sbc): currently naclports doesn't know anything about
   # Debug builds so the Debug subfolders are all empty.
-  bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')
 
   env = dict(os.environ)
   env['NACL_SDK_ROOT'] = pepperdir
+  env['PEPPER_DIR'] = os.path.dirname(pepperdir)

[binji, 2013/10/31 16:34:36]

what is this for? (just curious)

[Sam Clegg, 2013/10/31 16:54:16]

The script we are calling expects this to be set by
the caller now.  Its the name of the folder to build
into.  Previously this was derived from NACL_SDK_DIR,
but this was happening in mulitple places so it was
consolidated and set in buildbot_selector.sh (which
we are not using here).

   env['NACLPORTS_NO_ANNOTATE'] = "1"
   env['NACLPORTS_NO_UPLOAD'] = "1"
 
   build_script = 'build_tools/bots/linux/naclports-linux-sdk-bundle.sh'
   buildbot_common.BuildStep('Build naclports')
   buildbot_common.Run([build_script], env=env, cwd=NACLPORTS_DIR)
 
+  bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')
   out_dir = os.path.join(bundle_dir, 'pepper_%s' % pepper_ver)
 
   # Some naclports do not include a standalone LICENSE/COPYING file
   # so we explicitly list those here for inclusion.
   extra_licenses = ('tinyxml/readme.txt',
                     'jpeg-8d/README',
                     'zlib-1.2.3/README')
   src_root = os.path.join(NACLPORTS_DIR, 'out', 'repository-i686')
   output_license = os.path.join(out_dir, 'ports', 'LICENSE')
   GenerateNotice(src_root , output_license, extra_licenses)
@@ skipping 125 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')