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:
+    contentshell_scriptconfig = {
+      'windows' : {
+        'local_path' : os.path.join(scratch_dir, 'download_contentshell.bat'),
+        'zipfile_path' : 'dart/chromium/download_contentshell.bat',
+        'content_pattern' :
+r"""
+REM This script will download content shell to "content_shell.zip" in the

[ricow1, 2013/11/04 17:14:53]

why don't we just put these scripts inside tools/dartium as well?

[kustermann, 2013/11/05 12:45:19]

We could, but remember that these are not executable scripts, since we patch
them with the URL / filename.

I'll change it.

+REM current working directory.
+
+CHROMIUM_DIR="%~dp0"
+SDK_BIN="%CHROMIUM_DIR%\..\dart-sdk\bin"
+
+DART="%SDK_BIN%\dart.exe"
+DOWNLOAD_SCRIPT="%CHROMIUM_DIR%\download_file.dart"
+
+"$DART" "$DOWNLOAD_SCRIPT" "%(url)s" content_shell.zip
+"""
+      },
+      'posix' : {
+        'local_path' : os.path.join(scratch_dir, 'download_contentshell.sh'),
+        'zipfile_path' : 'dart/chromium/download_contentshell.sh',
+        'content_pattern' :
+r"""#!/bin/bash
+
+# This script will download content shell to "content_shell.zip" in the current
+# working directory.
+
+CHROMIUM_DIR="$(dirname $BASH_SOURCE)"
+SDK_BIN="$CHROMIUM_DIR/../dart-sdk/bin"
+
+DART="$SDK_BIN/dart"
+DOWNLOAD_SCRIPT="$CHROMIUM_DIR/download_file.dart"
+
+"$DART" "$DOWNLOAD_SCRIPT" "%(url)s" content_shell.zip
+"""
+      }, 
+    }
+    contentshell_scriptconfig['linux'] = contentshell_scriptconfig['posix']
+    contentshell_scriptconfig['macos'] = contentshell_scriptconfig['posix']
+
+    # Create a download_contentshell shell/bat script.
+    def create_download_contentshell_script(arch):
+      # The directory tree will look like this:
+      # dart/dart-sdk/bin/dart(.exe)
+      #     /chromium/download_contentshell.(sh,bat)
+      #     /chromium/download_file.dart
+      namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RELEASE)
+      contentshell_name = namer.dartium_variant_zipfilename(
+          'content_shell', SYSTEM, arch, 'release')
+      contentshell_url = (
+          "http://dartlang.org/editor/update/channels/%s/latest/dartium/%s"
+          % (CHANNEL, contentshell_name))

[kustermann, 2013/11/04 16:36:52]

I'm not sure if we should use 'latest' here or the exact revision.

[ricow1, 2013/11/04 17:14:53]

We should use the exact version, otherwise there can be subtle differences
between what users are seeing in their dartium and what their testing scripts
are reporting

[kustermann, 2013/11/05 12:45:19]

I'll change it.

+
+      with open(contentshell_scriptconfig[SYSTEM]['local_path'], 'w') as fd:
+        fd.write(contentshell_scriptconfig[SYSTEM]['content_pattern']
+            % {'url' : contentshell_url })
+
+      # Make it executable if we are not on windows
+      if SYSTEM != 'windows':
+        shell_script = contentshell_scriptconfig[SYSTEM]['local_path']
+        os.chmod(shell_script, os.stat(shell_script).st_mode | stat.S_IEXEC)
+
     # 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 content shell (and the
+      # tools/download_file.dart helper utility).
+      create_download_contentshell_script('64' if is_64bit else '32')
+      f = ziputils.ZipUtil(zipFile, buildos)
+      f.AddFile(contentshell_scriptconfig[SYSTEM]['local_path'],
+                contentshell_scriptconfig[SYSTEM]['zipfile_path'])
+      f.AddFile(os.path.join(DART_DIR, 'tools', 'download_file.dart'),
+                'dart/chromium/download_file.dart')
+
       # 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())