Version 1.0.0.2

dart/tools/signing_script.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 hashlib
 import imp
 import optparse
 import os
 import subprocess
 import sys
 
 DART_DIR = os.path.dirname(os.path.dirname(__file__))
 GSUTIL = os.path.join(DART_DIR, 'third_party', 'gsutil', 'gsutil')
 BOT_UTILS = os.path.join(DART_DIR, 'tools', 'bots', 'bot_utils.py')
 BASENAME_PATTERN = 'darteditor-%(system)s-%(bits)s'
 FILENAME_PATTERN = BASENAME_PATTERN + '.zip'
-BUCKET_PATTERN = (
-    'gs://dart-editor-archive-trunk/%(revision)s/' + FILENAME_PATTERN)
 
 DRY_RUN = False
 
 bot_utils = imp.load_source('bot_utils', BOT_UTILS)
 
 class ChangedWorkingDirectory(object):
   def __init__(self, working_directory):
     self._working_directory = working_directory
 
   def __enter__(self):
@@ skipping 76 matching lines @@
   with ChangedWorkingDirectory(os.path.dirname(to_dir)):
     run(['zip', '-r9', dirname + '.zip', dirname])
 
 def unzip_and_copy(extracted_zipfiledir, to_dir):
   rm_tree(extracted_zipfiledir)
   run(['unzip', extracted_zipfiledir + '.zip', '-d',
        os.path.dirname(extracted_zipfiledir)])
   rm_tree(to_dir)
   copy_tree(extracted_zipfiledir, to_dir)
 
-def download_from_old_location(config, destination):
-  bucket = BUCKET_PATTERN % config
-  run([GSUTIL, 'cp', bucket, destination])
-
-def upload_to_old_location(config, source_zip):
-  if not DRY_RUN:
-    bot_utils.CreateChecksumFile(
-        source_zip, mangled_filename=os.path.basename(source_zip))
-  md5_zip_file = source_zip + '.md5sum'
-  
-  bucket = BUCKET_PATTERN % config
-  run([GSUTIL, 'cp', source_zip, bucket])
-  run([GSUTIL, 'cp', md5_zip_file, bucket + '.md5sum'])
-  run([GSUTIL, 'setacl', 'public-read', bucket])
-  run([GSUTIL, 'setacl', 'public-read', bucket + '.md5sum'])
-
 def download_from_new_location(channel, config, destination):
   namer = bot_utils.GCSNamer(channel,
                              bot_utils.ReleaseType.RAW)
   bucket = namer.editor_zipfilepath(config['revision'], config['system'],
                                     config['bits'])
   run([GSUTIL, 'cp', bucket, destination])
 
 def upload_to_new_location(channel, config, source_zip):
   namer = bot_utils.GCSNamer(channel,
                              bot_utils.ReleaseType.SIGNED)
   zipfilename = namer.editor_zipfilename(config['system'], config['bits'])
   bucket = namer.editor_zipfilepath(config['revision'], config['system'],
                                     config['bits'])
 
   if not DRY_RUN:
     bot_utils.CreateChecksumFile(source_zip, mangled_filename=zipfilename)
   md5_zip_file = source_zip + '.md5sum'
-  
+
   run([GSUTIL, 'cp', source_zip, bucket])
   run([GSUTIL, 'cp', md5_zip_file, bucket + '.md5sum'])
   run([GSUTIL, 'setacl', 'public-read', bucket])
   run([GSUTIL, 'setacl', 'public-read', bucket + '.md5sum'])
 
 def main():
   if sys.platform != 'linux2':
     print "This script was only tested on linux. Please run it on linux!"
     sys.exit(1)
 
   parser = GetOptionsParser()
   (options, args) = parser.parse_args()
 
   if not options.scratch_dir:
     die("No scratch directory given.")
   if not options.revision:
     die("No revision given.")
   if not options.prepare and not options.deploy:
     die("No prepare/deploy parameter given.")
   if options.prepare and options.deploy:
     die("Can't have prepare and deploy parameters at the same time.")
   if len(args) > 0:
     die("Invalid additional arguments: %s." % args)
 
-  if options.channel:
-    assert options.channel in bot_utils.Channel.ALL_CHANNELS
+  if not options.channel:
+    die("You need to specify a channel with --channel.")
 
   global DRY_RUN
   DRY_RUN = options.dry_run
 
   downloads_dir = os.path.join(options.scratch_dir, 'downloads')
   presign_dir = os.path.join(options.scratch_dir, 'presign')
   postsign_dir = os.path.join(options.scratch_dir, 'postsign')
   uploads_dir = os.path.join(options.scratch_dir, 'uploads')
 
   if options.prepare:
@@ skipping 44 matching lines @@
       }
 
       destination = os.path.join(downloads_dir, FILENAME_PATTERN % config)
       destination_dir = os.path.join(downloads_dir, BASENAME_PATTERN % config)
 
       deploy = os.path.join(uploads_dir, FILENAME_PATTERN % config)
       deploy_dir = os.path.join(uploads_dir, BASENAME_PATTERN % config)
 
       if options.prepare:
         # Download *.zip files from GCS buckets
-        if options.channel:
-          download_from_new_location(options.channel, config, destination)
-        else:
-          download_from_old_location(config, destination)
+        download_from_new_location(options.channel, config, destination)
 
         run(['unzip', destination, '-d', destination_dir])
 
         for name in ['editor', 'chrome', 'content_shell']:
           from_path = os.path.join(destination_dir, locations[system][name])
           to_path = os.path.join(
               presign_dir, locations[system]['%s_scratch' % name] % config)
 
           if locations[system]['zip']:
             # We copy a .app directory directory and zip it
@@ skipping 14 matching lines @@
             unzip_and_copy(from_path, to_path)
           else:
             # We copy the signed .exe file
             copy_file(from_path, to_path)
 
         deploy_zip_file = os.path.abspath(deploy)
         with ChangedWorkingDirectory(deploy_dir):
           run(['zip', '-r9', deploy_zip_file, 'dart'])
 
         # Upload *.zip/*.zip.md5sum and set 'public-read' ACL
-        if options.channel:
-          upload_to_new_location(options.channel, config, deploy_zip_file)
-        else:
-          upload_to_old_location(config, deploy_zip_file)
+        upload_to_new_location(options.channel, config, deploy_zip_file)
 
 if __name__ == '__main__':
   main()