| Index: dart/tools/signing_script.py
|
| diff --git a/dart/tools/signing_script.py b/dart/tools/signing_script.py
|
| index 14ce0cda5b8a63aebf8859aa33cc39089b97651f..0ce0a4c3a903202c1cc367c6b9c9e545a1a6ad5e 100755
|
| --- a/dart/tools/signing_script.py
|
| +++ b/dart/tools/signing_script.py
|
| @@ -136,6 +136,12 @@ def download_from_new_location(channel, config, destination):
|
| config['bits'])
|
| run([GSUTIL, 'cp', bucket, destination])
|
|
|
| +def download_msi_installer_from_new_location(channel, config, destination):
|
| + namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.RAW)
|
| + bucket = namer.editor_installer_filepath(
|
| + config['revision'], config['system'], config['bits'], 'msi')
|
| + run([GSUTIL, 'cp', bucket, destination])
|
| +
|
| def upload_to_new_location(channel, config, source_zip):
|
| namer = bot_utils.GCSNamer(channel,
|
| bot_utils.ReleaseType.SIGNED)
|
| @@ -152,6 +158,12 @@ def upload_to_new_location(channel, config, source_zip):
|
| run([GSUTIL, 'setacl', 'public-read', bucket])
|
| run([GSUTIL, 'setacl', 'public-read', bucket + '.md5sum'])
|
|
|
| +def upload_msi_installer_to_new_location(channel, config, signed_msi):
|
| + namer = bot_utils.GCSNamer(channel, bot_utils.ReleaseType.SIGNED)
|
| + bucket = namer.editor_installer_filepath(
|
| + config['revision'], config['system'], config['bits'], 'msi')
|
| + run([GSUTIL, 'cp', '-a', 'public-read', signed_msi, bucket])
|
| +
|
| def main():
|
| if sys.platform != 'linux2':
|
| print "This script was only tested on linux. Please run it on linux!"
|
| @@ -212,6 +224,7 @@ def main():
|
| 'content_shell' : os.path.join('dart', 'chromium',
|
| 'content_shell.exe'),
|
|
|
| + 'msi_scratch' : 'darteditor-installer-windows-%(bits)s.exe',
|
| 'editor_scratch' : 'DartEditor%(bits)s.exe',
|
| 'chrome_scratch' : 'chromium%(bits)s.exe',
|
| 'content_shell_scratch' : 'content_shell%(bits)s.exe',
|
| @@ -255,6 +268,13 @@ def main():
|
| else:
|
| # We copy an .exe file
|
| copy_file(from_path, to_path)
|
| +
|
| + # Download .*msi installer from GCS to presign directory
|
| + if system == 'win32':
|
| + presign_msi = os.path.join(
|
| + presign_dir, locations[system]['msi_scratch'] % config)
|
| + download_msi_installer_from_new_location(
|
| + options.channel, config, presign_msi)
|
| elif options.deploy:
|
| copy_tree(destination_dir, deploy_dir)
|
|
|
| @@ -280,6 +300,13 @@ def main():
|
| else:
|
| upload_to_old_location(config, deploy_zip_file)
|
|
|
| + # Upload *.msi installer and set 'public-read ACL
|
| + if system == 'win32':
|
| + postsign_msi = os.path.join(
|
| + postsign_dir, locations[system]['msi_scratch'] % config)
|
| + upload_msi_installer_to_new_location(
|
| + options.channel, config, postsign_msi)
|
| +
|
| if __name__ == '__main__':
|
| main()
|
|
|
|
|