Add tools/download_file.dart helper + download_contentshell shell/bat script included in the editor…

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
@@ skipping 934 matching lines @@
 
   for zipFile in _FindRcpZipFiles(out_dir):
     basename = os.path.basename(zipFile)
     if renameMap[basename] != None:
       os.rename(zipFile, join(os.path.dirname(zipFile), renameMap[basename]))
 
 
 def PostProcessEditorBuilds(out_dir, buildos):
   """Post-process the created RCP builds"""
   with utils.TempDir('editor_scratch') as scratch_dir:
+
+    def instantiate_download_script_template(destination, replacements):

[ricow1, 2013/11/05 12:59:33]

please add a comment describing what this does, it is pretty hard to follow,
something like
""" Fixes up the script we use for downloading so that it points to the correct
url and downloads this tool into the correct location. """

[kustermann, 2013/11/05 13:11:05]

Done.

+      template_location = {
+       'windows' : join(
+          DART_DIR, 'tools', 'dartium', 'download_shellscript_template.bat'),
+       'linux' : join(
+          DART_DIR, 'tools', 'dartium', 'download_shellscript_template.sh'),
+       'macos' : join(
+          DART_DIR, 'tools', 'dartium', 'download_shellscript_template.sh'),
+      }[SYSTEM]
+
+      with open(template_location) as fd:
+        content = fd.read()
+      for key in replacements:
+        content = content.replace(key, replacements[key])
+      with open(destination, 'w') as fd:
+        fd.write(content)
+
+      # Make it executable if we are not on windows
+      if SYSTEM != 'windows':
+        os.chmod(destination, os.stat(destination).st_mode | stat.S_IEXEC)
+
+    def add_download_scripts(zipFile, arch):
+      shell_ending = {
+        'windows' : '.bat',
+        'linux' : '.sh',
+        'macos' : '.sh',
+      }[SYSTEM]
+
+      namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RELEASE)
+
+      # We're adding download scripts to the chromium directory.
+      # The directory tree will look like this after that:
+      #   dart/dart-sdk/bin/dart{,.exe}
+      #       /chromium/download_contentshell.{sh,bat}
+      #       /chromium/download_dartium_debug.{sh,bat}
+      #       /chromium/download_file.dart
+
+      # Add download_file.dart helper utility to the zip file.
+      f = ziputils.ZipUtil(zipFile, buildos)
+      f.AddFile(join(DART_DIR, 'tools', 'dartium', 'download_file.dart'),
+                'dart/chromium/download_file.dart')
+
+      # Add content shell download script
+      contentshell_name = namer.dartium_variant_zipfilename(
+          'content_shell', SYSTEM, arch, 'release')
+      contentshell_download_script = join(scratch_dir, 'download_contentshell')
+      instantiate_download_script_template(contentshell_download_script, {
+        'VAR_DESTINATION' : contentshell_name,
+        'VAR_DOWNLOAD_URL' : 
+            ("http://dartlang.org/editor/update/channels/%s/%s/dartium/%s"

[ricow1, 2013/11/05 12:59:33]

should we do a namer for this?

[kustermann, 2013/11/05 13:11:05]

We can do it in another CL.

+             % (CHANNEL, REVISION, contentshell_name)),
+      })
+      f.AddFile(contentshell_download_script,
+          'dart/chromium/download_contentshell%s' % shell_ending)
+
+      # Add dartium debug download script
+      dartium_debug_name = namer.dartium_variant_zipfilename(
+          'dartium', SYSTEM, arch, 'debug')
+      dartium_download_script = join(scratch_dir, 'download_dartium_debug')
+      instantiate_download_script_template(dartium_download_script, {
+        'VAR_DESTINATION' : dartium_debug_name,
+        'VAR_DOWNLOAD_URL' :
+            ("http://dartlang.org/editor/update/channels/%s/%s/dartium/%s"
+             % (CHANNEL, REVISION, dartium_debug_name)),
+      })
+      f.AddFile(dartium_download_script,
+          'dart/chromium/download_dartium_debug%s' % shell_ending)
+
     # Create a editor.properties
     editor_properties = os.path.join(scratch_dir, 'editor.properties')
     with open(editor_properties, 'w') as fd:
       fd.write("com.dart.tools.update.core.url=http://dartlang.org"
                "/editor/update/channels/%s/\n" % CHANNEL)
 
     for zipFile in _FindRcpZipFiles(out_dir):
       basename = os.path.basename(zipFile)
+      is_64bit = basename.endswith('-64.zip')
 
       print('  processing %s' % basename)
 
       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':
         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 (basename.endswith('-64.zip')):
+      if is_64bit:
         if (basename.startswith('darteditor-macos-')):
           inifile = join('dart', 'DartEditor.app', 'Contents', 'MacOS',
                          'DartEditor.ini')
         else:
           inifile = join('dart', 'DartEditor.ini')
 
         if (basename.startswith('darteditor-win32-')):
           f = zipfile.ZipFile(zipFile)
           f.extract(inifile.replace('\\','/'))
           f.close()
@@ skipping 378 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())