Add windows installer functionallity to editor build script.

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
@@ skipping 113 matching lines @@
   # Remove this once the channel transition is done.
   if CHANNEL == 'trunk': return
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   for revision in [REVISION, 'latest']:
     DartArchiveFile(version_file, namer.version_filepath(revision),
         create_md5sum=False)
 
 def DartArchiveUploadInstaller(
       arch, installer_file, extension, release_type=bot_utils.ReleaseType.RAW):
   namer = bot_utils.GCSNamer(CHANNEL, release_type)
-  gsu_path = namer.editor_installer_zipfilepath(
+  gsu_path = namer.editor_installer_filepath(
       REVISION, SYSTEM, arch, extension)
   DartArchiveFile(installer_file, gsu_path, create_md5sum=False)
 
 class AntWrapper(object):
   """A wrapper for ant build invocations"""
 
   _antpath = None
   _bzippath = None
   _propertyfile = None
 
@@ skipping 291 matching lines @@
         os_rename = {'win': 'win32', 'mac': 'macos', 'linux': 'linux'}
         system = os_rename[SYSTEM]
         return (
             ("%s/darteditor-%s-%s.zip" % (GSU_PATH_REV, system, arch)),
             ("%s/darteditor-installer-%s-%s.%s"
              % (GSU_PATH_REV, system, arch, extension)))
 
       def new_location_pair(arch, extension):
         namer = bot_utils.GCSNamer(CHANNEL, release_type)
         editor_path = namer.editor_zipfilepath(REVISION, SYSTEM, arch)
-        installer_path = namer.editor_installer_zipfilepath(
+        installer_path = namer.editor_installer_filepath(
             REVISION, SYSTEM, arch, extension)
         return (editor_path, installer_path)
 
-      def create_mac_installer(arch):
-        with utils.TempDir('build_editor_installer') as temp_dir:
-          with utils.ChangedWorkingDirectory(temp_dir):
-            if CHANNEL == 'dev':
-              # On the dev channel we currently use the bits from trunk.
-              (gsu_editor_zip, gsu_editor_dmg) = old_location_pair(arch, 'dmg')
-            else:
-              (gsu_editor_zip, gsu_editor_dmg) = new_location_pair(arch, 'dmg')
-            # Fetch the editor zip file from the old location.
-            if gsu.Copy(gsu_editor_zip, 'editor.zip', False):
-              raise Exception("gsutil command failed, aborting.")
+      def create_windows_installer(installer_file, input_dir):
+        msi_builder = os.path.join(DART_PATH, 'tools',
+                                   'create_windows_installer.py')
+        wix_bin = os.path.join(DART_PATH, 'third_party',
+                               'wix')

[kustermann, 2013/10/29 08:44:47]

Do we already have this in our DEPS file?

[ricow1, 2013/10/29 08:59:05]

No, and we will not, I will explicitly check this out on the bot, see:
https://codereview.chromium.org/50423002

+        version = utils.GetShortVersion()
+        bot_utils.run(['python', msi_builder,
+                       '--msi_location=%s' % installer_file,
+                       '--input_directory=%s' % input_dir,
+                       '--version=%s' % version,
+                       '--wix_bin=%s' % wix_bin])
 
-            # Unzip the editor (which contains a directory named 'dart').
-            bot_utils.run(['unzip', 'editor.zip'])
-            assert os.path.exists('dart') and os.path.isdir('dart')
+      def create_mac_installer(installer_file):
+        dart_folder_icon = os.path.join(DART_PATH,
+            'editor/tools/plugins/com.google.dart.tools.ui/' +
+            'icons/dart_about_140_160.png')
+        dmg_builder = os.path.join(DART_PATH, 'tools',
+                                   'mac_build_editor_dmg.sh')
+        bot_utils.run([dmg_builder, installer_file, 'dart',
+                       dart_folder_icon, "Dart Distribution"])

[kustermann, 2013/10/29 08:44:47]

You could rename this to "Dart Installer" -- so we're consistent with windows
(but I don't really care).

[ricow1, 2013/10/29 08:59:05]

Done.

 
-            # Build the dmg installer
-            dmg_installer = os.path.join(temp_dir,'darteditor-installer.dmg')
-            dart_folder_icon = os.path.join(DART_PATH,
-                'editor/tools/plugins/com.google.dart.tools.ui/' +
-                'icons/dart_about_140_160.png')
-            dmg_builder = os.path.join(DART_PATH, 'tools',
-                'mac_build_editor_dmg.sh')
-            bot_utils.run([dmg_builder, dmg_installer, 'dart',
-                dart_folder_icon, "Dart Distribution"])
-            assert os.path.isfile(dmg_installer)
 
-            if CHANNEL == 'dev':
-              # Archive to old bucket
-              # TODO(kustermann/ricow): Remove all the old archiving code,
-              # once everything points to the new location.
-              if gsu.Copy(dmg_installer, gsu_editor_dmg):
+      if SYSTEM == 'mac' or SYSTEM == 'win':
+        for arch in ['32', '64']:
+          extension = 'dmg' if SYSTEM == 'mac' else 'msi'
+          with utils.TempDir('build_editor_installer') as temp_dir:
+            with utils.ChangedWorkingDirectory(temp_dir):
+              if CHANNEL == 'dev':
+                # On the dev channel we currently use the bits from trunk.
+                (gsu_editor_zip,
+                 gsu_editor_installer) = old_location_pair(arch, extension)
+              else:
+                (gsu_editor_zip,
+                 gsu_editor_installer) = new_location_pair(arch, extension)
+              # Fetch the editor zip file from the old location.
+              zip_location = os.path.join(temp_dir, 'editor.zip')
+              if gsu.Copy(gsu_editor_zip, zip_location, False):
                 raise Exception("gsutil command failed, aborting.")
+              # Unzip the editor (which contains a directory named 'dart').
+              unzip_dir = os.path.join(temp_dir, 'dart')

[kustermann, 2013/10/29 08:44:47]

Isn't this creating a directory structure like this?:

temp_dir/dart/dart/DartEditor.exe 

[ricow1, 2013/10/29 08:59:05]

Indeed it is, changed

+              os.makedirs(unzip_dir)
+              dartium_zip = ziputils.ZipUtil(zip_location, buildos)
+              dartium_zip.UnZip(unzip_dir)

[kustermann, 2013/10/29 08:44:47]

This is not dartium. Rename it.

+ Do we need to call "dartium_zip.close()" to free the zip file [might cause
issues on windows]?

[ricow1, 2013/10/29 08:59:05]

renamed - regarding close I think you are confusing ziputils with zipfile ->
ziputils is another python lib in this directory that will handle this

 
-            # Archive to new bucket
-            # NOTE: This is a little bit hackisch, we fetch the editor from
-            # the old bucket and archive the dmg to the new bucket here.
-            DartArchiveUploadInstaller(arch, dmg_installer, 'dmg',
-                release_type=release_type)
+              assert os.path.exists('dart') and os.path.isdir('dart')
+              installer_name = 'darteditor-installer.%s' % extension
+              installer_file = os.path.join(temp_dir, installer_name)
+              if SYSTEM == 'mac':
+                create_mac_installer(installer_file)
+              else:
+                create_windows_installer(installer_file, unzip_dir)
+              assert os.path.isfile(installer_file)
 
-      if SYSTEM == 'mac':
-        for arch in ['32', '64']:
-          create_mac_installer(arch)
+              if CHANNEL == 'dev':
+                # Archive to old bucket
+                # TODO(kustermann/ricow): Remove all the old archiving code,
+                # once everything points to the new location.
+                if gsu.Copy(installer_file, gsu_editor_installer):
+                  raise Exception("gsutil command failed, aborting.")
+
+              # Archive to new bucket
+              # NOTE: This is a little bit hackisch, we fetch the editor from
+              # the old bucket and archive the dmg to the new bucket here.
+              DartArchiveUploadInstaller(arch, installer_file, extension,
+                                         release_type=release_type)
+
       else:
         raise Exception(
             "We currently cannot build installers for %s" % SYSTEM)
     def build_editor(sdk_zip):
       ant_property_file = tempfile.NamedTemporaryFile(suffix='.property',
                                                       prefix='AntProperties',
                                                       delete=False)
       ant_property_file.close()
       ant = AntWrapper(ant_property_file.name, os.path.join(antpath, 'bin'),
                        bzip2libpath)
@@ skipping 853 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())