Small cleanup

native_client_sdk/src/build_tools/buildbot_run.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'''
+"""Entry point for both build and try bots
 
-import build_utils
-import lastchange
+This script is invoked from XXX, usually without arguments
+to package an SDK. It automatically determines whether
+this SDK is for mac, win, linux.
+
+The script inspects the following environment variables:
+
+BUILDBOT_BUILDERNAME to determine whether the script is run locally
+and whether it should upload an SDK to file storage (GSTORE)
+"""
+
+# std python includes
 import os
 import subprocess
 import sys
 
+# local includes
+import build_utils
+import lastchange
+
+
 # Create the various paths of interest
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 SDK_SRC_DIR = os.path.dirname(SCRIPT_DIR)
 SDK_DIR = os.path.dirname(SDK_SRC_DIR)
 SRC_DIR = os.path.dirname(SDK_DIR)
 NACL_DIR = os.path.join(SRC_DIR, 'native_client')
 OUT_DIR = os.path.join(SRC_DIR, 'out')
 PPAPI_DIR = os.path.join(SRC_DIR, 'ppapi')
 
 
 # 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 http_download
-from getos import GetPlatform
 import oshelpers
 
 GSTORE = 'http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/'
 MAKE = 'nacl_sdk/make_3_81/make.exe'
-GSUTIL = '/b/build/scripts/slave/gsutil'
+# For buildbots assume gsutil is stored in the build directory.
+BOT_GSUTIL = '/b/build/scripts/slave/gsutil'
+# For local runs just make sure gsutil is in your PATH.
+LOCAL_GSUTIL = 'gsutil'
+CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
+
 
 def ErrorExit(msg):
   """Write and error to stderr, then exit with 1 signaling failure."""
   sys.stderr.write(msg + '\n')
   sys.exit(1)
 
 
 def BuildStep(name):
   """Annotate a buildbot build step."""
   sys.stdout.flush()
@@ skipping 15 matching lines @@
 
 
 def Archive(filename):
   """Upload the given filename to Google Store."""
   chrome_version = build_utils.ChromeVersion()
   bucket_path = 'nativeclient-mirror/nacl/nacl_sdk/%s/%s' % (
       chrome_version, filename)
   full_dst = 'gs://%s' % bucket_path
 
   if os.environ.get('BUILDBOT_BUILDERNAME', ''):
-    # For buildbots assume gsutil is stored in the build directory.
-    gsutil = '/b/build/scripts/slave/gsutil'
+    gsutil = BOT_GSUTIL
   else:
-    # For non buildpots, you must have it in your path.
-    gsutil = 'gsutil'
+    gsutil = LOCAL_GSUTIL
 
   subprocess.check_call(
       '%s cp -a public-read %s %s' % (
           gsutil, filename, full_dst), shell=True, cwd=OUT_DIR)
   url = 'https://commondatastorage.googleapis.com/%s' % bucket_path
   print '@@@STEP_LINK@download@%s@@@' % url
   sys.stdout.flush()
 
 
 def AddMakeBat(makepath):
@@ skipping 74 matching lines @@
 
 
 def GetBuildArgs(tcname, tcpath, arch, xarch=None):
   """Return list of scons build arguments to generate user libraries."""
   scons = GetScons()
   mode = '--mode=opt-host,nacl'
   arch_name = GetArchName(arch, xarch)
   plat = 'platform=' + arch_name
   bin = ('bindir=' +
          BuildOutputDir('pepper_' + build_utils.ChromeMajorVersion(), 'tools'))
-  lib = ('libdir=' +
-         os.path.join(GetToolchainNaClLib(tcpath, arch, xarch)))
+  lib = 'libdir=' + GetToolchainNaClLib(tcpath, arch, xarch)
   args = [scons, mode, plat, bin, lib, '-j10',
           'install_bin', 'install_lib']
   if tcname == 'glibc':
     args.append('--nacl_glibc')
   return args
 
 header_map = {
   'newlib': {
       'pthread.h': 'src/untrusted/pthread/pthread.h',
       'semaphore.h': 'src/untrusted/pthread/semaphore.h',
@@ skipping 74 matching lines @@
   CopyDir(os.path.join(PPAPI_DIR,'lib','gl','include','GLES2', '*.h'),
           os.path.join(tc_dst_inc, 'GLES2'))
 
   # Copy the KHR headers
   MakeDir(os.path.join(tc_dst_inc, 'KHR'))
   CopyDir(os.path.join(PPAPI_DIR,'lib','gl','include','KHR', '*.h'),
           os.path.join(tc_dst_inc, 'KHR'))
 
 
 def main():
-  platform = GetPlatform()
+  platform = getos.GetPlatform()
   arch = 'x86'
+  # the vars below are intended for debugging
   skip_untar = 0
   skip_build = 0
   skip_tar = 0
   skip_examples = 0
   skip_headers = 0
   skip_make = 0
   force_archive = 0
 
   pepper_ver = build_utils.ChromeMajorVersion()
   clnumber = lastchange.FetchVersionInfo(None).revision
   print 'Building PEPPER %s at %s' % (pepper_ver, clnumber)
 
   BuildStep('Clean Pepper Dir')
   pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver)
   if not skip_untar:
     RemoveDir(pepperdir)
     MakeDir(os.path.join(pepperdir, 'toolchain'))
     MakeDir(os.path.join(pepperdir, 'tools'))
 
   BuildStep('Untar Toolchains')
-  tmpdir = os.path.join(SRC_DIR, 'out', 'tc_temp')
   tcname = platform + '_' + arch
   tmpdir = os.path.join(SRC_DIR, 'out', 'tc_temp')
-  cygtar = os.path.join(NACL_DIR, 'build', 'cygtar.py')
 
-    # Clean out the temporary toolchain untar directory
+  # Clean out the temporary toolchain untar directory
   if not skip_untar:
     RemoveDir(tmpdir)
     MakeDir(tmpdir)
     tcname = platform + '_' + arch
 
     # Untar the newlib toolchains
     tarfile = GetNewlibToolchain(platform, arch)
-    Run([sys.executable, cygtar, '-C', tmpdir, '-xf', tarfile], cwd=NACL_DIR)
+    Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile], cwd=NACL_DIR)
 
     # Then rename/move it to the pepper toolchain directory
     srcdir = os.path.join(tmpdir, 'sdk', 'nacl-sdk')
     newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib')
     print "Buildbot mv %s to %s" % (srcdir, newlibdir)
     MoveDir(srcdir, newlibdir)
     print "Done with buildbot move"
     # Untar the glibc toolchains
     tarfile = GetGlibcToolchain(platform, arch)
-    Run([sys.executable, cygtar, '-C', tmpdir, '-xf', tarfile], cwd=NACL_DIR)
+    Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile], cwd=NACL_DIR)
 
     # Then rename/move it to the pepper toolchain directory
     srcdir = os.path.join(tmpdir, 'toolchain', tcname)
     glibcdir = os.path.join(pepperdir, 'toolchain', tcname + '_glibc')
     MoveDir(srcdir, glibcdir)
   else:
     newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib')
     glibcdir = os.path.join(pepperdir, 'toolchain', tcname + '_glibc')
 
   BuildStep('SDK Items')
@@ skipping 30 matching lines @@
   if not skip_examples:
     BuildStep('Copy examples')
     RemoveDir(os.path.join(pepperdir, 'examples'))
     CopyDir(os.path.join(SDK_SRC_DIR, 'examples'), pepperdir)
 
 
   tarname = 'naclsdk_' + platform + '.bz2'
   BuildStep('Tar Pepper Bundle')
   if not skip_tar:
     tarfile = os.path.join(OUT_DIR, 'naclsdk_' + platform + '.bz2')
-    Run([sys.executable, cygtar, '-C', OUT_DIR, '-cjf', tarfile,
+    Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile,
          'pepper_' + pepper_ver], cwd=NACL_DIR)
 
   # Archive on non-trybots.
   if force_archive or '-sdk' in os.environ.get('BUILDBOT_BUILDERNAME', ''):
     BuildStep('Archive build')
     Archive(tarname)
 
   if not skip_make:
     BuildStep('Test Build Examples')
     filelist = os.listdir(os.path.join(pepperdir, 'examples'))
     for filenode in filelist:
       dirnode = os.path.join(pepperdir, 'examples', filenode)
       makefile = os.path.join(dirnode, 'Makefile')
       if os.path.isfile(makefile):
         if platform == 'win':
           AddMakeBat(dirnode)
         print "\n\nMake: " + dirnode
         Run(['make', 'all', '-j8'], cwd=os.path.abspath(dirnode), shell=True)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())
-