Issue 1144 - Generate IE update manifests

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 182 matching lines @@
       os.makedirs(baseDir)
     if self.config.type == 'chrome' or self.config.type == 'opera':
       manifestPath = os.path.join(baseDir, "updates.xml")
       templateName = 'chromeUpdateManifest'
     elif self.config.type == 'safari':
       manifestPath = os.path.join(baseDir, "updates.plist")
       templateName = 'safariUpdateManifest'
     elif self.config.type == 'android':
       manifestPath = os.path.join(baseDir, "updates.xml")
       templateName = 'androidUpdateManifest'
-    elif self.config.type == 'ie':
-      manifestPath = os.path.join(baseDir, "update.json")
-      templateName = 'ieUpdateManifest'

[Wladimir Palant, 2014/07/29 11:25:18]

libabpUpdateManifest please, this format isn't specific to Internet Explorer.
Also, new settings should be documented in .sitescripts.example.

[Felix Dahlke, 2014/07/29 11:37:17]

As it is, the update manifest is IE specific, we won't have 32-bit/64-bit
variants for Android e.g. A more generic solution would be nice, but then again,
IE is the only special case we have here how I see it. Coming up with something
generic for a single use case doesn't seem wise.

     else:
       manifestPath = os.path.join(baseDir, "update.rdf")
       templateName = 'geckoUpdateManifest'
 
     template = get_template(get_config().get('extensions', templateName))
     template.stream({'extensions': [self]}).dump(manifestPath)
 
   def writeIEUpdateManifest(self, versions):
     """
       Writes update.json file for the latest IE build
     """
     if len(versions) == 0:
       return
 
+    version = versions[0]
+    packageName = self.basename + '-' + version + self.config.packageSuffix
+    updateURL = urlparse.urljoin(self.config.nightliesURL, self.basename + '/' + packageName + '?update')
     baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
-    if not os.path.exists(baseDir):
-      os.makedirs(baseDir)
-
-    self.version = versions[0]

[Wladimir Palant, 2014/07/29 11:25:18]

This function shouldn't set any instance variables - it is a write function, it
shouldn't have any side-effects.

[Felix Dahlke, 2014/07/29 11:37:17]

True, it's a hack. How about I move this part to where we set self.basename for
IE below?

[Wladimir Palant, 2014/07/29 12:03:10]

Yes, that would make sense.

-    packageName = self.basename + '-' + self.version + self.config.packageSuffix
-    self.updateURL = urlparse.urljoin(self.config.nightliesURL, self.basename +
-                                      '/' + packageName + '?update')
-    self.name = self.basename
-    self.writeUpdateManifest()
+    manifestPath = os.path.join(baseDir, 'update.json')
+
+    from sitescripts.extensions.utils import writeIEUpdateManifest as doWrite
+    doWrite(manifestPath, [{
+      'basename': self.basename,
+      'version': version,
+      'updateURL': updateURL
+    }])
 
     for suffix in (self.config.packageSuffix, self.config.packageSuffix.replace("-x64", "-x86")):
       linkPath = os.path.join(baseDir, '00latest%s' % suffix)
-      outputPath = os.path.join(baseDir, self.basename + '-' + self.version + suffix)
+      outputPath = os.path.join(baseDir, self.basename + '-' + version + suffix)
       if hasattr(os, 'symlink'):
         if os.path.exists(linkPath):
           os.remove(linkPath)
         os.symlink(os.path.basename(outputPath), linkPath)
       else:
         shutil.copyfile(outputPath, linkPath)
 
   def build(self):
     """
       run the build command in the tempdir
@@ skipping 249 matching lines @@
     except Exception, ex:
       print >>sys.stderr, "The build for %s failed:" % repo
       traceback.print_exc()
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()