Version 1.0.0.2

dart/editor/build/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import glob
 import gsutil
 import imp
 import optparse
 import os
 import re
 import shutil
 import stat
 import subprocess
 import sys
 import tempfile
 import zipfile
 import ziputils
 
 from os.path import join
 
 BUILD_OS = None
 DART_PATH = None
 TOOLS_PATH = None
 
-GSU_PATH_REV = None
-GSU_PATH_LATEST = None
-GSU_API_DOCS_PATH = None
-GSU_API_DOCS_BUCKET = 'gs://dartlang-api-docs'
-
 CHANNEL = None
 PLUGINS_BUILD = None
 REVISION = None
 SYSTEM = None
-TRUNK_BUILD = None
 
 NO_UPLOAD = None
 
 DART_DIR = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
 utils = imp.load_source('utils', os.path.join(DART_DIR, 'tools', 'utils.py'))
 bot_utils = imp.load_source('bot_utils',
     os.path.join(DART_DIR, 'tools', 'bots', 'bot_utils.py'))
 
 def DartArchiveFile(local_path, remote_path, create_md5sum=False):
   # Copy it to the new unified gs://dart-archive bucket
-  # TODO(kustermann/ricow): Remove all the old archiving code, once everything
-  # points to the new location
   gsutil = bot_utils.GSUtil()
   gsutil.upload(local_path, remote_path, public=True)
   if create_md5sum:
     # 'local_path' may have a different filename than 'remote_path'. So we need
     # to make sure the *.md5sum file contains the correct name.
     assert '/' in remote_path and not remote_path.endswith('/')
     mangled_filename = remote_path[remote_path.rfind('/') + 1:]
     local_md5sum = bot_utils.CreateChecksumFile(local_path, mangled_filename)
     gsutil.upload(local_md5sum, remote_path + '.md5sum', public=True)
 
 def DartArchiveUploadEditorZipFile(zipfile):
-  # TODO(kustermann): We don't archive trunk builds to gs://dart-archive/
-  # Remove this once the channel transition is done.
-  if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   gsutil = bot_utils.GSUtil()
 
   basename = os.path.basename(zipfile)
   system = None
   arch = None
   if basename.startswith('darteditor-linux'):
     system = 'linux'
   elif basename.startswith('darteditor-mac'):
     system = 'macos'
   elif basename.startswith('darteditor-win'):
     system = 'windows'
 
   if basename.endswith('-32.zip'):
     arch = 'ia32'
   elif basename.endswith('-64.zip'):
     arch = 'x64'
 
   assert system and arch
 
   for revision in [REVISION, 'latest']:
     DartArchiveFile(zipfile, namer.editor_zipfilepath(revision, system, arch),
         create_md5sum=True)
 
 def DartArchiveUploadUpdateSite(local_path):
-  # TODO(kustermann): We don't archive trunk builds to gs://dart-archive/
-  # Remove this once the channel transition is done.
-  if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   gsutil = bot_utils.GSUtil()
   for revision in [REVISION, 'latest']:
     update_site_dir = namer.editor_eclipse_update_directory(revision)
     try:
       gsutil.remove(update_site_dir, recursive=True)
     except:
       # Ignore this, in the general case there is nothing.
       pass
     gsutil.upload(local_path, update_site_dir, recursive=True, public=True)
 
 def DartArchiveUploadSDKs(system, sdk32_zip, sdk64_zip):
-  # TODO(kustermann): We don't archive trunk builds to gs://dart-archive/
-  # Remove this once the channel transition is done.
-  if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   for revision in [REVISION, 'latest']:
     path32 = namer.sdk_zipfilepath(revision, system, 'ia32', 'release')
     path64 = namer.sdk_zipfilepath(revision, system, 'x64', 'release')
     DartArchiveFile(sdk32_zip, path32, create_md5sum=True)
     DartArchiveFile(sdk64_zip, path64, create_md5sum=True)
 
 def DartArchiveUploadAPIDocs(api_zip):
-  # TODO(kustermann): We don't archive trunk builds to gs://dart-archive/
-  # Remove this once the channel transition is done.
-  if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   for revision in [REVISION, 'latest']:
     destination = (namer.apidocs_directory(revision) + '/' +
         namer.apidocs_zipfilename())
     DartArchiveFile(api_zip, destination, create_md5sum=False)
 
 def DartArchiveUploadVersionFile(version_file):
-  # TODO(kustermann): We don't archive trunk builds to gs://dart-archive/.
-  # Remove this once the channel transition is done.
-  if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   for revision in [REVISION, 'latest']:
     DartArchiveFile(version_file, namer.version_filepath(revision),
         create_md5sum=False)
 
 def DartArchiveUploadInstaller(
       arch, installer_file, extension, release_type=bot_utils.ReleaseType.RAW):
   namer = bot_utils.GCSNamer(CHANNEL, release_type)
   gsu_path = namer.editor_installer_filepath(
       REVISION, SYSTEM, arch, extension)
@@ skipping 105 matching lines @@
 
     print ' '.join(args)
     status = subprocess.call(args, shell=is_windows)
     os.chdir(cwd)
     return status
 
 
 def BuildOptions():
   """Setup the argument processing for this program."""
   result = optparse.OptionParser()
-  result.set_default('dest', 'gs://dart-editor-archive-continuous')
   result.add_option('-m', '--mode',
                     help='Build variants (comma-separated).',
                     metavar='[all,debug,release]',
                     default='debug')
   result.add_option('-v', '--verbose',
                     help='Verbose output.',
                     default=False, action='store')
   result.add_option('-r', '--revision',
                     help='SVN Revision.',
                     action='store')
   result.add_option('-n', '--name',
                     help='builder name.',
                     action='store')
   result.add_option('-o', '--out',
                     help='Output Directory.',
                     action='store')
   result.add_option('--dest',
                     help='Output Directory.',
                     action='store')
   result.add_option('--build-installer',
                     help='Fetch editor, build installer and archive it.',
                     action='store_true', default=False)
   return result
 
 def main():
   """Main entry point for the build program."""
   global BUILD_OS
   global CHANNEL
   global DART_PATH
-  global GSU_API_DOCS_PATH
-  global GSU_PATH_LATEST
-  global GSU_PATH_REV
   global NO_UPLOAD
   global PLUGINS_BUILD
   global REVISION
   global SYSTEM
   global TOOLS_PATH
-  global TRUNK_BUILD
 
   if not sys.argv:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.abspath(os.path.dirname(sys.argv[0]))
   editorpath = os.path.abspath(os.path.join(scriptdir, '..'))
   thirdpartypath = os.path.abspath(os.path.join(scriptdir, '..', '..',
                                                 'third_party'))
   toolspath = os.path.abspath(os.path.join(scriptdir, '..', '..',
@@ skipping 62 matching lines @@
     lastc = revision[-1]
     if lastc.isalpha():
       revision = revision[0:-1]
     index = revision.find(':')
     if index > -1:
       revision = revision[0:index]
     print 'revision       = |{0}|'.format(revision)
     buildout = os.path.abspath(options.out)
     print 'buildout       = {0}'.format(buildout)
 
-    # Get user name. If it does not start with chrome then deploy to the test
-    # bucket; otherwise deploy to the continuous bucket.
-    username = os.environ.get('USER')
-    if username is None:
-      username = os.environ.get('USERNAME')
-
-    if username is None:
+    username = utils.GetUserName()
+    if not username:
       print 'Could not find username'
       return 6
 
     build_skip_tests = os.environ.get('DART_SKIP_RUNNING_TESTS')
     sdk_environment = os.environ
     if sdk_environment.has_key('JAVA_HOME'):
       print 'JAVA_HOME = {0}'.format(str(sdk_environment['JAVA_HOME']))
 
-    # dart-editor[-trunk], dart-editor-(win/mac/linux)[-trunk/be/dev/stable]
-    builder_name = str(options.name)
-
     EDITOR_REGEXP = (r'^dart-editor(-(?P<installer>(installer)))?'
                       '(-(?P<system>(win|mac|linux)))?' +
-                      '(-(?P<channel>(trunk|be|dev|stable)))?$')
+                      '(-(?P<channel>(be|dev|stable)))?$')
+    builder_name = str(options.name)
     match = re.match(EDITOR_REGEXP, builder_name)
     if not match:
       raise Exception("Buildername '%s' does not match pattern '%s'."
                       % (builder_name, EDITOR_REGEXP))
 
     CHANNEL = match.groupdict()['channel'] or 'be'
     SYSTEM = match.groupdict()['system']
     BUILD_INSTALLER = bool(match.groupdict()['installer'])
 
-    TRUNK_BUILD = CHANNEL == 'trunk'
     PLUGINS_BUILD = SYSTEM is None
     REVISION = revision
 
     # Make sure the buildername and the options agree
     assert BUILD_INSTALLER == options.build_installer
 
-    if username.startswith('chrome'):
-      if TRUNK_BUILD:
-        bucket = 'gs://dart-editor-archive-trunk'
-      else:
-        bucket = 'gs://dart-editor-archive-continuous'
-      running_on_buildbot = True
-    else:
-      bucket = 'gs://dart-editor-archive-testing'
-      running_on_buildbot = False
-      sdk_environment['DART_LOCAL_BUILD'] = 'dart-editor-archive-testing'
-
-    GSU_PATH_REV = '%s/%s' % (bucket, REVISION)
-    GSU_PATH_LATEST = '%s/%s' % (bucket, 'latest')
-    GSU_API_DOCS_PATH = '%s/%s' % (GSU_API_DOCS_BUCKET, REVISION)
+    running_on_buildbot = username.startswith('chrome')
 
     homegsutil = join(DART_PATH, 'third_party', 'gsutil', 'gsutil')
     gsu = gsutil.GsUtil(False, homegsutil,
       running_on_buildbot=running_on_buildbot)
 
     def build_installer():
       release_type = bot_utils.ReleaseType.SIGNED
       if CHANNEL == 'be':
         # We don't have signed bits on bleeding_edge, so we take the unsigned
         # editor.
@@ skipping 158 matching lines @@
           _InstallArtifacts(buildout, buildos, extra_artifacts)
 
           # dart-editor-linux.gtk.x86.zip --> darteditor-linux-32.zip
           RenameRcpZipFiles(buildout)
 
           PostProcessEditorBuilds(buildout, buildos)
 
           if running_on_buildbot:
             version_file = _FindVersionFile(buildout)
             if version_file:
-              UploadFile(version_file, False)
               DartArchiveUploadVersionFile(version_file)
 
             found_zips = _FindRcpZipFiles(buildout)
             for zipfile in found_zips:
-              UploadFile(zipfile)
               DartArchiveUploadEditorZipFile(zipfile)
 
         return 0
 
     if BUILD_INSTALLER:
       build_installer()
     else:
       build_editor(sdk_zip)
   finally:
     if ant_property_file is not None:
@@ skipping 195 matching lines @@
       # black/white-listing mechanism.
       FileDelete(join(add_path, 'mini_installer.exe'))
       FileDelete(join(add_path, 'sync_unit_tests.exe'))
       FileDelete(join(add_path, 'chrome.packed.7z'))
 
     # Add dartium to the rcp zip
     dart_zip.AddDirectoryTree(add_path, 'dart/chromium')
   shutil.rmtree(tmp_dir, True)
 
 
-def InstallDartiumFromOldDartiumArchive(buildroot, buildout, buildos, gsu):
-  """Install Dartium into the RCP zip files and upload a version of Dartium
-
-  Args:
-    buildroot: the boot of the build output
-    buildout: the location of the ant build output
-    buildos: the OS the build is running under
-    gsu: the gsutil wrapper
-  Raises:
-    Exception: if no dartium files can be found
-  """
-  print 'InstallDartium(%s, %s, %s)' % (buildroot, buildout, buildos)
-
-  tmp_dir = os.path.join(buildroot, 'tmp')
-
-  rcpZipFiles = _FindRcpZipFiles(buildout)
-
-  for rcpZipFile in rcpZipFiles:
-    print '  found rcp: %s' % rcpZipFile
-
-  dartiumFiles = []
-
-  dartiumFiles.append("gs://dartium-archive/dartium-mac-full-trunk/"
-    + "dartium-mac-full-trunk-%s.0.zip" % REVISION)
-  dartiumFiles.append("gs://dartium-archive/dartium-win-full-trunk/"
-    + "dartium-win-full-trunk-%s.0.zip" % REVISION)
-  dartiumFiles.append("gs://dartium-archive/dartium-lucid32-full-trunk/"
-    + "dartium-lucid32-full-trunk-%s.0.zip" % REVISION)
-  dartiumFiles.append("gs://dartium-archive/dartium-lucid64-full-trunk/"
-    + "dartium-lucid64-full-trunk-%s.0.zip" % REVISION)
-
-  for rcpZipFile in rcpZipFiles:
-    searchString = None
-
-    # dart-editor-linux.gtk.x86.zip, ...
-
-    if '-linux.gtk.x86.zip' in rcpZipFile:
-      searchString = 'dartium-lucid32'
-    if '-linux.gtk.x86_64.zip' in rcpZipFile:
-      searchString = 'dartium-lucid64'
-    if 'macosx' in rcpZipFile:
-      searchString = 'dartium-mac'
-    if 'win32' in rcpZipFile:
-      searchString = 'dartium-win'
-
-    for dartiumFile in dartiumFiles:
-      if searchString in dartiumFile:
-        #download and unzip dartium
-        unzip_dir = os.path.join(tmp_dir,
-          os.path.splitext(os.path.basename(dartiumFile))[0])
-        if not os.path.exists(unzip_dir):
-          os.makedirs(unzip_dir)
-        # Always download as searchString.zip
-        basename = "%s.zip" % searchString
-        tmp_zip_file = os.path.join(tmp_dir, basename)
-
-        if not os.path.exists(tmp_zip_file):
-          if gsu.Copy(dartiumFile, tmp_zip_file, False):
-            raise Exception("gsutil command failed, aborting.")
-
-          # Upload dartium zip to make sure we have consistent dartium downloads
-          UploadFile(tmp_zip_file)
-
-          # Dartium is unzipped into ~ unzip_dir/dartium-win-full-7665.7665
-          dartium_zip = ziputils.ZipUtil(tmp_zip_file, buildos)
-          dartium_zip.UnZip(unzip_dir)
-        else:
-          dartium_zip = ziputils.ZipUtil(tmp_zip_file, buildos)
-
-        dart_zip_path = join(buildout, rcpZipFile)
-        dart_zip = ziputils.ZipUtil(dart_zip_path, buildos)
-
-        if 'lin' in buildos:
-          paths = glob.glob(join(unzip_dir, 'dartium-*'))
-          add_path = paths[0]
-          zip_rel_path = 'dart/chromium'
-          # add to the rcp zip
-          dart_zip.AddDirectoryTree(add_path, zip_rel_path)
-        if 'win' in buildos:
-          paths = glob.glob(join(unzip_dir, 'dartium-*'))
-          add_path = paths[0]
-          zip_rel_path = 'dart/chromium'
-          FileDelete(join(add_path, 'mini_installer.exe'))
-          FileDelete(join(add_path, 'sync_unit_tests.exe'))
-          FileDelete(join(add_path, 'chrome.packed.7z'))
-          # add to the rcp zip
-          dart_zip.AddDirectoryTree(add_path, zip_rel_path)
-        if 'mac' in buildos:
-          paths = glob.glob(join(unzip_dir, 'dartium-*'))
-          add_path = paths[0]
-          zip_rel_path = 'dart/chromium'
-          # add to the rcp zip
-          dart_zip.AddDirectoryTree(add_path, zip_rel_path)
-
-
-  shutil.rmtree(tmp_dir, True)
-
-
 def InstallDartium(buildroot, buildout, buildos, gsu):
-  if TRUNK_BUILD:
-    # On trunk builds we fetch dartium from the old location (where the
-    # dartium-*-trunk builders archive to)
-    InstallDartiumFromOldDartiumArchive(buildroot, buildout, buildos, gsu)
-  else:
-    # On our be/dev/stable channels, we fetch dartium from the new
-    # gs://dart-archive/ location.
-    InstallDartiumFromDartArchive(buildroot, buildout, buildos, gsu)
+  # On our be/dev/stable channels, we fetch dartium from the new
+  # gs://dart-archive/ location.
+  InstallDartiumFromDartArchive(buildroot, buildout, buildos, gsu)
 
 
 def _InstallArtifacts(buildout, buildos, extra_artifacts):
   """Install extra build artifacts into the RCP zip files.
 
   Args:
     buildout: the location of the ant build output
     buildos: the OS the build is running under
     extra_artifacts: the directory containing the extra artifacts
   """
@@ skipping 119 matching lines @@
       readme_file = join('dart', 'README')
       if (basename.startswith('darteditor-win32-')):
         seven_zip = os.path.join(DART_DIR, 'third_party', '7zip', '7za.exe')
         bot_utils.run([seven_zip, 'd', zipFile, readme_file], env=os.environ)
       else:
         bot_utils.run(['zip', '-d', zipFile, readme_file], env=os.environ)
 
       # If we're on -dev/-stable build: add an editor.properties file
       # pointing to the correct update location of the editor for the channel
       # we're building for.
-      if not TRUNK_BUILD and CHANNEL != 'be':
+      if CHANNEL != 'be':
         f = ziputils.ZipUtil(zipFile, buildos)
         f.AddFile(editor_properties, 'dart/editor.properties')
 
       # Add a shell/bat script to download contentshell and dartium debug.
       # (including the necessary tools/dartium/download_file.dart helper).
       add_download_scripts(zipFile, '64' if is_64bit else '32')
 
       # adjust memory params for 64 bit versions
       if is_64bit:
         if (basename.startswith('darteditor-macos-')):
@@ skipping 34 matching lines @@
 
 def Modify64BitDartEditorIni(iniFilePath):
   f = open(iniFilePath, 'r')
   lines = f.readlines()
   f.close()
   lines[lines.index('-Xms40m\n')] = '-Xms256m\n'
   lines[lines.index('-Xmx1000m\n')] = '-Xmx2000m\n'
   # Add -d64 to give better error messages to user in 64 bit mode.
   lines[lines.index('-vmargs\n')] = '-vmargs\n-d64\n'
   f = open(iniFilePath, 'w')
-  f.writelines(lines);
+  f.writelines(lines)
   f.close()
 
 
 def RunEditorTests(buildout, buildos):
   StartBuildStep('run_tests')
 
   for editorArchive in _GetTestableRcpArchives(buildout):
     with utils.TempDir('editor_') as tempDir:
       print 'Running tests for %s...' % editorArchive
 
@@ skipping 73 matching lines @@
 
 def BuildUpdateSite(ant, revision, name, buildroot, buildout,
               editorpath, buildos):
   status = ant.RunAnt('../com.google.dart.eclipse.feature_releng',
              'build.xml', revision, name, buildroot, buildout,
               editorpath, buildos, ['-Dbuild.dir=%s' % buildout])
   if status:
     BuildStepFailure()
   else:
     StartBuildStep('upload_artifacts')
-    UploadSite(buildout, "%s/%s" % (GSU_PATH_REV, 'eclipse-update'))
-    UploadSite(buildout, "%s/%s" % (GSU_PATH_LATEST, 'eclipse-update'))
+    DartArchiveUploadUpdateSite(join(buildout, 'buildRepo'))
   return status
 
 
-def UploadSite(buildout, gsPath) :
-  # remove any old artifacts
-  try:
-    Gsutil(['rm', '-R', join(gsPath, '*')])
-  except:
-    # Ignore this, in the general case there is nothing.
-    pass
-  # create eclipse-update/index.html first to ensure eclipse-update prefix
-  # exists (needed for recursive copy to follow)
-  Gsutil(['cp', '-a', 'public-read',
-          r'file://' + join(buildout, 'buildRepo', 'index.html'),
-          join(gsPath,'index.html')])
-
-  # recursively copy update site contents
-  UploadDirectory(glob.glob(join(buildout, 'buildRepo', '*')), gsPath)
-  DartArchiveUploadUpdateSite(join(buildout, 'buildRepo'))
-
 def CreateApiDocs(buildLocation):
   """Zip up api_docs, upload it, and upload the raw tree of docs"""
 
   apidir = join(DART_PATH,
                 utils.GetBuildRoot(BUILD_OS, 'release', 'ia32'),
                 'api_docs')
 
   shutil.rmtree(apidir, ignore_errors = True)
 
   CallBuildScript('release', 'ia32', 'api_docs')
 
   UploadApiDocs(apidir)
 
   api_zip = join(buildLocation, 'dart-api-docs.zip')
 
   CreateZip(apidir, api_zip)
 
-  # upload to continuous/svn_rev and to continuous/latest
-  UploadFile(api_zip, False)
-
   DartArchiveUploadAPIDocs(api_zip)
 
 
 def CreateSDK(sdkpath):
   """Create the dart-sdk's for the current OS"""
 
   if BUILD_OS == 'linux':
     return CreateLinuxSDK(sdkpath)
   if BUILD_OS == 'macos':
     return CreateMacosSDK(sdkpath)
   if BUILD_OS == 'win32':
     return CreateWin32SDK(sdkpath)
 
 def CreateLinuxSDK(sdkpath):
   sdkdir32 = join(DART_PATH, utils.GetBuildRoot('linux', 'release', 'ia32'),
                   'dart-sdk')
   sdkdir64 = join(DART_PATH, utils.GetBuildRoot('linux', 'release', 'x64'),
                   'dart-sdk')
 
   # Build the SDK
   CallBuildScript('release', 'ia32,x64', 'create_sdk')
 
   sdk32_zip = join(sdkpath, 'dartsdk-linux-32.zip')
-  sdk32_tgz = join(sdkpath, 'dartsdk-linux-32.tar.gz')
   sdk64_zip = join(sdkpath, 'dartsdk-linux-64.zip')
-  sdk64_tgz = join(sdkpath, 'dartsdk-linux-64.tar.gz')
 
   CreateZip(sdkdir32, sdk32_zip)
-  CreateTgz(sdkdir32, sdk32_tgz)
   CreateZip(sdkdir64, sdk64_zip)
-  CreateTgz(sdkdir64, sdk64_tgz)
-
-  UploadFile(sdk32_zip)
-  UploadFile(sdk32_tgz)
-  UploadFile(sdk64_zip)
-  UploadFile(sdk64_tgz)
 
   DartArchiveUploadSDKs('linux', sdk32_zip, sdk64_zip)
 
   return sdk32_zip
 
 
 def CreateMacosSDK(sdkpath):
   # Build the SDK
   CallBuildScript('release', 'ia32,x64', 'create_sdk')
 
   sdk32_zip = join(sdkpath, 'dartsdk-macos-32.zip')
   sdk64_zip = join(sdkpath, 'dartsdk-macos-64.zip')
-  sdk32_tgz = join(sdkpath, 'dartsdk-macos-32.tar.gz')
-  sdk64_tgz = join(sdkpath, 'dartsdk-macos-64.tar.gz')
 
   CreateZip(join(DART_PATH, utils.GetBuildRoot('macos', 'release', 'ia32'),
                  'dart-sdk'), sdk32_zip)
   CreateZip(join(DART_PATH, utils.GetBuildRoot('macos', 'release', 'x64'),
                  'dart-sdk'), sdk64_zip)
-  CreateTgz(join(DART_PATH, utils.GetBuildRoot('macos', 'release', 'ia32'),
-                 'dart-sdk'), sdk32_tgz)
-  CreateTgz(join(DART_PATH, utils.GetBuildRoot('macos', 'release', 'x64'),
-                 'dart-sdk'), sdk64_tgz)
-
-  UploadFile(sdk32_zip)
-  UploadFile(sdk64_zip)
-  UploadFile(sdk32_tgz)
-  UploadFile(sdk64_tgz)
 
   DartArchiveUploadSDKs('macos', sdk32_zip, sdk64_zip)
 
   return sdk32_zip
 
 
 def CreateWin32SDK(sdkpath):
   # Build the SDK
   CallBuildScript('release', 'ia32,x64', 'create_sdk')
 
   sdk32_zip = join(sdkpath, 'dartsdk-win32-32.zip')
   sdk64_zip = join(sdkpath, 'dartsdk-win32-64.zip')
 
   CreateZipWindows(join(DART_PATH,
                         utils.GetBuildRoot('win32', 'release', 'ia32'),
                         'dart-sdk'), sdk32_zip)
   CreateZipWindows(join(DART_PATH,
                         utils.GetBuildRoot('win32', 'release', 'x64'),
                         'dart-sdk'), sdk64_zip)
 
-  UploadFile(sdk32_zip)
-  UploadFile(sdk64_zip)
-
   DartArchiveUploadSDKs('win32', sdk32_zip, sdk64_zip)
 
   return sdk32_zip
 
 
 def CallBuildScript(mode, arch, target):
   """invoke tools/build.py"""
   buildScript = join(TOOLS_PATH, 'build.py')
   cmd = [sys.executable, buildScript, '--mode=%s' % mode, '--arch=%s' % arch,
          target]
   try:
     ExecuteCommand(cmd, DART_PATH)
-  except:
-    print '%s build failed: %s' % (target, status)
+  except Exception as error:
+    print '%s build failed: %s' % (target, error)
     BuildStepFailure()
     raise Exception('%s build failed' % target)
 
 
 def CreateZip(directory, targetFile):
   """zip the given directory into the file"""
   EnsureDirectoryExists(targetFile)
   FileDelete(targetFile)
   ExecuteCommand(['zip', '-yrq9', targetFile, os.path.basename(directory)],
                  os.path.dirname(directory))
 
 
 def CreateZipWindows(directory, targetFile):
   """zip the given directory into the file - win32 specific"""
   EnsureDirectoryExists(targetFile)
   FileDelete(targetFile)
   ExecuteCommand([join(DART_PATH, 'third_party', '7zip', '7za'), 'a', '-tzip',
                   targetFile,
                   os.path.basename(directory)],
                  os.path.dirname(directory))
 
 
-def CreateTgz(directory, targetFile):
-  """tar gzip the given directory into the file"""
-  EnsureDirectoryExists(targetFile)
-  FileDelete(targetFile)
-  ExecuteCommand(['tar', 'czf', targetFile, os.path.basename(directory)],
-                 os.path.dirname(directory))
+def UploadApiDocs(dirName):
+  apidocs_namer = bot_utils.GCSNamerApiDocs(CHANNEL)
+  apidocs_destination_gcsdir = apidocs_namer.docs_dirpath(REVISION)
+  apidocs_destination_latestfile = apidocs_namer.docs_latestpath(REVISION)
 
+  # Delete the old revision specific apidocs directory if present.
+  Gsutil(['-m', 'rm', '-R', '-f', apidocs_destination_gcsdir])
 
-def UploadFile(targetFile, createChecksum=True):
-  """Upload the given file to google storage."""
+  # Upload everything inside the built apidocs directory.
+  Gsutil(['-m', 'cp', '-R', '-a', 'public-read', dirName,
+          apidocs_destination_gcsdir])
 
-  if (NO_UPLOAD):
-    return
+  # Update latest.txt to contain the newest revision.
+  with utils.TempDir('latest_file') as temp_dir:
+    latest_file = join(temp_dir, 'latest.txt')
+    with open(latest_file, 'w') as f:
+      f.write('%s' % REVISION)
 
-  filePathRev = "%s/%s" % (GSU_PATH_REV, os.path.basename(targetFile))
-  filePathLatest = "%s/%s" % (GSU_PATH_LATEST, os.path.basename(targetFile))
-
-  if createChecksum:
-    checksum = bot_utils.CreateChecksumFile(targetFile)
-
-    checksumRev = "%s/%s" % (GSU_PATH_REV, os.path.basename(checksum))
-    checksumLatest = "%s/%s" % (GSU_PATH_LATEST, os.path.basename(checksum))
-
-  Gsutil(['cp', '-a', 'public-read', r'file://' + targetFile, filePathRev])
-
-  if (createChecksum):
-    Gsutil(['cp', '-a', 'public-read', r'file://' + checksum, checksumRev])
-
-  Gsutil(['cp', '-a', 'public-read', filePathRev, filePathLatest])
-  if (createChecksum):
-    Gsutil(['cp', '-a', 'public-read', checksumRev, checksumLatest])
-
-
-def UploadDirectory(filesToUpload, gs_dir):
-  Gsutil(['-m', 'cp', '-a', 'public-read', '-r'] + filesToUpload + [gs_dir])
-
-
-def UploadApiDocs(dirName):
-  # create file in dartlang-api-docs/REVISION/index.html
-  # this lets us do the recursive copy in the next step
-
-  localIndexFile = join(dirName, 'index.html')
-  destIndexFile = GSU_API_DOCS_PATH + '/index.html'
-
-  Gsutil(['cp', '-a', 'public-read', localIndexFile, destIndexFile])
-
-  # copy -R api_docs into dartlang-api-docs/REVISION
-  filesToUpload = glob.glob(join(dirName, '*'))
-  result = Gsutil(['-m', 'cp', '-q', '-a', 'public-read', '-r'] +
-                  filesToUpload + [GSU_API_DOCS_PATH])
-
-  if result == 0:
-    destLatestRevFile = GSU_API_DOCS_BUCKET + '/latest.txt'
-    localLatestRevFilename = join(dirName, 'latest.txt')
-    with open(localLatestRevFilename, 'w+') as f:
-      f.write(REVISION)
-
-    # overwrite dartlang-api-docs/latest.txt to contain REVISION
-    Gsutil(['cp', '-a', 'public-read', localLatestRevFilename,
-            destLatestRevFile])
+    Gsutil(['cp', '-a', 'public-read', latest_file,
+            apidocs_destination_latestfile])
 
 
 def Gsutil(cmd):
   gsutilTool = join(DART_PATH, 'third_party', 'gsutil', 'gsutil')
   ExecuteCommand([sys.executable, gsutilTool] + cmd)
 
 
 def EnsureDirectoryExists(f):
   d = os.path.dirname(f)
   if not os.path.exists(d):
@@ skipping 14 matching lines @@
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except OSError:
       print 'error deleting %s' % f
 
 
 if __name__ == '__main__':
   sys.exit(main())