Merge revision 13642 and 13643 to trunk.

dart/editor/build/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, 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 optparse
 import os
 import re
@@ skipping 260 matching lines @@
     print 'thirdpartypath = {0}'.format(thirdpartypath)
     print 'toolspath      = {0}'.format(toolspath)
     print 'antpath        = {0}'.format(antpath)
     print 'bzip2libpath   = {0}'.format(bzip2libpath)
     print 'buildpath      = {0}'.format(buildpath)
     print 'buildroot      = {0}'.format(buildroot)
     print 'dartpath       = {0}'.format(dartpath)
     print 'revision(in)   = |{0}|'.format(options.revision)
     #this code handles getting the revision on the developer machine
     #where it can be 123, 123M 123:125M
-    print 'revision(in)   = {0}|'.format(options.revision)
+    print 'revision(in)   = |{0}|'.format(options.revision)
     revision = options.revision.rstrip()
     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)
@@ skipping 32 matching lines @@
       if TRUNK_BUILD:
         to_bucket = 'gs://dart-editor-archive-trunk'
       else:
         to_bucket = 'gs://dart-editor-archive-continuous'  
       running_on_buildbot = True
     else:
       to_bucket = 'gs://dart-editor-archive-testing'
       running_on_buildbot = False
       sdk_environment['DART_LOCAL_BUILD'] = 'dart-editor-archive-testing'
 
-    REVISION = options.revision
-    GSU_PATH_REV = '%s/%s' % (to_bucket, options.revision)
+    REVISION = revision
+    GSU_PATH_REV = '%s/%s' % (to_bucket, REVISION)
     GSU_PATH_LATEST = '%s/%s' % (to_bucket, 'latest')
-    GSU_API_DOCS_PATH = '%s/%s' % (GSU_API_DOCS_BUCKET, options.revision)
+    GSU_API_DOCS_PATH = '%s/%s' % (GSU_API_DOCS_BUCKET, REVISION)
 
     homegsutil = join(DART_PATH, 'third_party', 'gsutil', 'gsutil')
     gsu = gsutil.GsUtil(False, homegsutil, running_on_buildbot=running_on_buildbot)
 
     print '@@@BUILD_STEP dart-ide dart clients: %s@@@' % options.name
     if sdk_environment.has_key('JAVA_HOME'):
       print 'JAVA_HOME = {0}'.format(str(sdk_environment['JAVA_HOME']))
 
     if not PLUGINS_BUILD:
       PrintSeparator('running the build of the Dart SDK')
@@ skipping 148 matching lines @@
 def UploadTestHtml(buildout, bucket, svnid, buildos, gsu):
   """Upload the Test Results HTML to GoogleStorage.
 
   Args:
     buildout: the location ofthe output of the build
     bucket: the Google Storage bucket the code is staged in
     svnid: the revision id for this build
     buildos: the os the build is running on
     gsu: the gsutil object
   """
-  print 'UploadTestHtml({0}, {1}, {2}, {3}, gsu)'.format(buildout,
-                                                          bucket,
-                                                          svnid,
-                                                          buildos)
-  gs_dir = '{0}/{1}'.format(bucket, svnid)
+  print 'UploadTestHtml(%s, %s, %s, %s)' % (buildout, bucket, svnid, buildos)
   local_dir = '{0}'.format(svnid)
   html_dir = os.path.join(buildout, 'html')
   cwd = os.getcwd()
   gs_test_dir_name = 'tests'
   tmp_dir = None
   try:
     if os.path.exists(html_dir):
       tmp_dir = tempfile.mkdtemp(prefix=gs_test_dir_name)
       local_path = os.path.join(tmp_dir, local_dir)
       os.makedirs(local_path)
       os.chdir(tmp_dir)
       shutil.copytree(html_dir, os.path.join(local_path, gs_test_dir_name,
                                              buildos))
       gsu.Copy(svnid, bucket, recursive_flag=True)
-      gs_elements = gsu.ReadBucket('{0}/{1}/{2}/*'.format(gs_dir,
-                                                          gs_test_dir_name,
-                                                          buildos))
   finally:
     os.chdir(cwd)
     if tmp_dir is not None and os.path.exists(tmp_dir):
       shutil.rmtree(tmp_dir, ignore_errors=True)
 
 
 def _FindRcpZipFiles(out_dir):
   """Find the Zipped RCP files.
 
   Args:
@@ skipping 77 matching lines @@
     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
+  
+  if TRUNK_BUILD:
+    # we look for Dartium artifacts differently for trunk vs continuous builds
+    gsPrefix = "gs://dartium-archive"
+
+    dartiumFiles = []
+    dartiumFiles.append(
+      "%s/dartium-mac-full-trunk/dartium-mac-full-trunk-%s.0.zip"
+      % (gsPrefix, REVISION))
+    dartiumFiles.append(
+      "%s/dartium-lucid32-full-trunk/dartium-lucid32-full-trunk-%s.0.zip"
+      % (gsPrefix, REVISION))
+    dartiumFiles.append(
+      "%s/dartium-lucid64-full-trunk/dartium-lucid64-full-trunk-%s.0.zip"
+      % (gsPrefix, REVISION))
+    dartiumFiles.append(
+      "%s/dartium-win-full-trunk/dartium-win-full-trunk-%s.0.zip"
+      % (gsPrefix, REVISION))
+  else:
+    # dartium-lucid32-full-9420.9420.zip
+    # dartium-lucid64-full-9420.9420.zip
+    # dartium-mac-full-9420.9420.zip
+    # dartium-win-full-9420.9420.zip
+    # exclude dartium-lucid64-full-trunk-9571.9571.zip
+    dartiumFiles = gsu.ReadBucket(
+      'gs://dartium-archive/latest/dartium-*-full-[0-9]*.zip')
+
+    if not dartiumFiles:
+      raise Exception("could not find any dartium files")
+
+    tempList = []
     
-  # dartium-lucid32-full-9420.9420.zip
-  # dartium-lucid64-full-9420.9420.zip
-  # dartium-mac-full-9420.9420.zip
-  # dartium-win-full-9420.9420.zip
-  # exclude dartium-lucid64-full-trunk-9571.9571.zip
-  dartiumFiles = gsu.ReadBucket('gs://dartium-archive/latest/dartium-*-full-[0-9]*.zip')
+    for dartiumFile in dartiumFiles:
+      print '  found dartium: %s' % dartiumFile
+      tempList.append(RemapDartiumUrl(dartiumFile))
 
-  if not dartiumFiles:
-    raise Exception("could not find any dartium files")
-
-  tempList = []
-  
-  for dartiumFile in dartiumFiles:
-    print '  found dartium: %s' % dartiumFile
-    tempList.append(RemapDartiumUrl(dartiumFile))
-
-  dartiumFiles = tempList
-
+    dartiumFiles = tempList
   
   for rcpZipFile in rcpZipFiles:
     searchString = None
     
     # dart-editor-linux.gtk.x86.zip
     # dart-editor-linux.gtk.x86_64.zip
     # dart-editor-macosx.cocoa.x86.zip
     # dart-editor-macosx.cocoa.x86_64.zip
     # dart-editor-win32.win32.x86.zip
     # dart-editor-win32.win32.x86_64.zip
@@ skipping 11 matching lines @@
       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)
         tmp_zip_file = os.path.join(tmp_dir, os.path.basename(dartiumFile))
         
         if not os.path.exists(tmp_zip_file):
           gsu.Copy(dartiumFile, tmp_zip_file, False)
           
-          # Dartium is unzipped into ~ unzip_dir/dartium-win-inc-7665.7665
+          # 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)
 
         add_path = None
   
         if 'lin' in buildos:
           paths = glob.glob(os.path.join(unzip_dir, 'dartium-*'))
           add_path = paths[0]
@@ skipping 395 matching lines @@
   """delete the given file - do not re-throw any exceptions that occur"""
   if os.path.exists(f):
     try:
       os.remove(f)
     except:
       print 'error deleting %s' % f
 
 
 if __name__ == '__main__':
   sys.exit(main())