Add windows installer functionallity to editor build script.

tools/create_windows_installer.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.
 
 # A script to generate a windows installer for the editor bundle.
 # As input the script takes a zip file, a version and the location
 # to store the resulting msi file in.
 #
@@ skipping 22 matching lines @@
 # The components we want to add to our feature.
 feature_components = []
 
 # Indentation level, each level is indented 2 spaces
 current_indentation = 0
 
 def GetOptions():
   options = optparse.OptionParser(usage='usage: %prog [options]')
   options.add_option("--zip_file_location",
       help='Where the zip file including the editor is located.')
+  options.add_option("--input_directory",
+      help='Directory where all the files needed is located.')
   options.add_option("--msi_location",
       help='Where to store the resulting msi.')
   options.add_option("--version",
       help='The version specified as Major.Minor.Build.Patch.')
   options.add_option("--wix_bin",
       help='The location of the wix binary files.')
   options.add_option("--print_wxs", action="store_true", dest="print_wxs",
                     default=False,
                     help="Prints the generated wxs to stdout.")
-  return options.parse_args()
+  (options, args) = options.parse_args()
+  if len(args) > 0:
+    raise Exception("This script takes no arguments, only options")
+  ValidateOptions(options)
+  return options
+
+def ValidateOptions(options):
+  if not options.version:
+    raise Exception('You must supply a version')
+  if options.zip_file_location and options.input_directory:
+    raise Exception('Please pass either zip_file_location or input_directory')
+  if not options.zip_file_location and not options.input_directory:
+    raise Exception('Please pass either zip_file_location or input_directory')
+  if (options.zip_file_location and
+      not os.path.isfile(options.zip_file_location)):
+    raise Exception('Passed in zip file not found')
+  if (options.input_directory and
+      not os.path.isdir(options.input_directory)):
+    raise Exception('Passed in directory not found')
+
+def GetInputDirectory(options):
+  if options.zip_file_location:
+    ExtractZipFile(options.zip_file_location, temp_dir)

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

Where is "temp_dir" defined?

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

Fixed

+    return os.path.join(temp_dir, 'dart')
+  return options.input_directory
 
 # We combine the build and patch into a single entry since
 # the windows installer does _not_ consider a change in Patch
 # to require a new install.
 # In addition to that, the limits on the size are:
 # Major: 256
 # Minor: 256
 # Build: 65536
 # To circumvent this we create the version like this:
 #   Major.Minor.X
@@ skipping 241 matching lines @@
     candle_bin = os.path.join(options.wix_bin, 'candle.exe')
     light_bin = os.path.join(options.wix_bin, 'light.exe')
   print 'Calling candle on %s' % wxs_file
   subprocess.check_call('%s %s -o %s' % (candle_bin, wxs_file,
                                          wixobj_file))
   print 'Calling light on %s' % wixobj_file
   subprocess.check_call('%s %s -o %s' % (light_bin, wixobj_file,
                                          options.msi_location))
   print 'Created msi file to %s' % options.msi_location
 
+
 def Main(argv):
   if sys.platform != 'win32':
     raise Exception("This script can only be run on windows")
-  (options, args) = GetOptions()
-  if not options.version:
-    raise Exception('You must supply a version')
-  if not os.path.isfile(options.zip_file_location):
-    raise Exception('You must pass in a valid zip file')
+  options = GetOptions()
+  input_location = GetInputDirectory(options)

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

Remove this and add the following line inside "with utils.TempDir('installer')
as temp_dir":

  input_location = GetInputDirectory(temp_dir, GetOptions())

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

Done.

 
   version = GetMicrosoftProductVersion(options.version)
   with utils.TempDir('installer') as temp_dir:
-    ExtractZipFile(options.zip_file_location, temp_dir)
     print "Generating wix XML"
     XmlHeader()
     with WixAndProduct(version):
       AppendBlankLine()
       Package()
       MediaTemplate()
       AppendComment('We always do a major upgrade, at least for now')
       MajorUpgrade()
 
       AppendComment('Directory structure')
       with Directory('TARGETDIR', 'SourceDir'):
         with Directory('ProgramFilesFolder'):
           with Directory('RootInstallDir', 'Dart Editor'):
             AppendComment("Add all files and directories")
             print 'Installing files and directories in xml'
-            ListFiles(os.path.join(temp_dir, 'dart'))
+            ListFiles(input_location)
         AppendBlankLine()
         AppendComment("Create shortcuts")
         with Directory('ProgramMenuFolder'):
           with Directory('ShortcutFolder', 'Dart Editor'):
             with Component('shortcut'):
               # When generating a shortcut we need an entry with
               # a KeyPath (RegistryEntry) below - to be able to remove
               # the shortcut again. The RemoveFolder tag is needed
               # to clean up everything
               Shortcut('editor_shortcut', 'Dart Editor',
                        '[RootInstallDir]DartEditor.exe')
               RemoveFolder('RemoveShortcuts')
               RegistryEntry('DartEditor')
       with Feature():
         # We have only one feature and that consist of all the
         # files=components we have listed above"
         ComponentRefs()
     xml = GetContent()
     if options.print_wxs:
       print xml
     GenerateInstaller(xml, options, temp_dir)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))