Merge libv1.

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 629 matching lines @@
     # 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 = []
     
+    dartiumFiles = RemoveDuplicateDartiums(dartiumFiles)
+    
     for dartiumFile in dartiumFiles:
       print '  found dartium: %s' % dartiumFile
       tempList.append(RemapDartiumUrl(dartiumFile))
 
     dartiumFiles = tempList
   
   for rcpZipFile in rcpZipFiles:
     searchString = None
     
     # dart-editor-linux.gtk.x86.zip
@@ skipping 29 matching lines @@
         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]
           zip_rel_path = 'dart/chromium'
           # remove extra files
-          FileDelete(os.path.join(add_path, 'chrome.packed.7z'))
+          FileDelete(os.path.join(add_path, 'DumpRenderTree'))
+          FileDelete(os.path.join(add_path, 'DumpRenderTree.pak'))
         if 'win' in buildos:
           paths = glob.glob(os.path.join(unzip_dir, 'dartium-*'))
           add_path = paths[0]
           zip_rel_path = 'dart/chromium'
           # remove extra files
           FileDelete(os.path.join(add_path, 'DumpRenderTree.exe'))
           FileDelete(os.path.join(add_path, 'mini_installer.exe'))
           FileDelete(os.path.join(add_path, 'sync_unit_tests.exe'))
         if 'mac' in buildos:
           paths = glob.glob(os.path.join(unzip_dir, 'dartium-*'))
           add_path = os.path.join(paths[0], 'Chromium.app')
           zip_rel_path = 'dart/Chromium.app'
         
         #add to the rcp zip
         dart_zip_path = os.path.join(buildout, rcpZipFile)
         dart_zip = ziputils.ZipUtil(dart_zip_path, buildos)
         dart_zip.AddDirectoryTree(add_path, zip_rel_path)
         
   shutil.rmtree(tmp_dir, True)
 
+def RemoveDuplicateDartiums(dartiumFiles):
+  result = []
+  found = []
+  
+  dartiumFiles.sort(reverse=True)
+  
+  # dartium-lucid64-full-9420.9420.zip
+  for f in dartiumFiles:
+    index = f.find('-full-')
+    prefix = f[:index]
+    if not prefix in found:
+      found.append(prefix)
+      result.append(f)
+
+  return result
+
 
 # convert:
 #   gs://dartium-archive/latest/dartium-lucid32-full-9420.9420.zip
 # to:
 #   gs://dartium-archive/dartium-lucid32-full/dartium-lucid32-full-9420.9420.zip  
 def RemapDartiumUrl(url):
   name = os.path.basename(url)
 
   reResult = re.search('(\S*-\S*-full)-.*', name)
 
@@ skipping 297 matching lines @@
   # 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', '-a', 'public-read', '-r'] + filesToUpload +
-                  [GSU_API_DOCS_PATH])
+  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])
@@ skipping 37 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())