Issue 3758 - Removed Opera Extensions related logic

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 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 205 matching lines @@
     self.certificateID = packager.get_developer_identifier(certs)
     self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
     self.shortVersion = metadata.get("general", "version")
     self.basename = metadata.get("general", "basename")
     self.updatedFromGallery = False
 
   def writeUpdateManifest(self):
     """
       Writes update.rdf file for the current build
     """
-    baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
-    if not os.path.exists(baseDir):
-      os.makedirs(baseDir)
-    if self.config.type == 'chrome' or self.config.type == 'opera':

[Sebastian Noack, 2016/03/08 17:23:05]

Update manifest aren't used for Chrome anymore, but only for Opera devbuilds.
However, specifying an update_url prevents upload to the CWS. So we have to give
up on updates, if we want to get rid of seperate devuilds for Opera. However,
since support for offstore extensions are quite broken anyway that should be
fine.

-      manifestPath = os.path.join(baseDir, "updates.xml")
-      templateName = 'chromeUpdateManifest'
-    elif self.config.type == 'safari':
+    if 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'
+    else:
+      return
 
-      # ABP for Android used to have its own update manifest format. We need to
-      # generate both that and the new one in the libadblockplus format as long
-      # as a significant amount of users is on an old version.
+    baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
+    if not os.path.exists(baseDir):
+      os.makedirs(baseDir)
+
+    # ABP for Android used to have its own update manifest format. We need to
+    # generate both that and the new one in the libadblockplus format as long
+    # as a significant amount of users is on an old version.
+    if self.config.type == 'android':
       newManifestPath = os.path.join(baseDir, "update.json")
       writeAndroidUpdateManifest(newManifestPath, [{
         'basename': self.basename,
         'version': self.version,
         'updateURL': self.updateURL
       }])
-    else:
-      manifestPath = os.path.join(baseDir, "update.rdf")

[Sebastian Noack, 2016/03/08 17:23:05]

Update manifests are also not used anymore for Firefox. And I had to touch this
code anyway, as with just the branch above removed, it would generate an
update.rdf for Chrome otherwise.

-      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
@@ skipping 41 matching lines @@
         except ConfigParser.NoOptionError:
           port = '22'
         buildCommand = ['ssh', '-p', port, get_config().get('extensions', 'androidBuildHost')]
         buildCommand.extend(map(pipes.quote, ['/home/android/bin/makedebugbuild.py', '--revision', self.revision, '--version', self.version, '--stdout']))
         subprocess.check_call(buildCommand, stdout=apkFile, close_fds=True)
       except:
         # clear broken output if any
         if os.path.exists(self.path):
           os.remove(self.path)
         raise
-    elif self.config.type == 'chrome' or self.config.type == 'opera':
+    elif self.config.type == 'chrome':
       import buildtools.packagerChrome as packager
       packager.createBuild(self.tempdir, type=self.config.type, outFile=self.path, buildNum=self.revision, keyFile=self.config.keyFile, experimentalAPI=self.config.experimental)
     elif self.config.type == 'safari':
       import buildtools.packagerSafari as packager
       packager.createBuild(self.tempdir, type=self.config.type, outFile=self.path, buildNum=self.revision, keyFile=self.config.keyFile)
     else:
       import buildtools.packagerGecko as packager
       packager.createBuild(self.tempdir, outFile=self.path, buildNum=self.revision, keyFile=self.config.keyFile)
 
     if not os.path.exists(self.path):
@@ skipping 233 matching lines @@
         # We cannot build IE builds, simply list the builds already in
         # the directory. Basename has to be deduced from the repository name.
         self.basename = os.path.basename(self.config.repository)
       else:
         # copy the repository into a temporary directory
         self.copyRepository()
 
         # get meta data from the repository
         if self.config.type == 'android':
           self.readAndroidMetadata()
-        elif self.config.type == 'chrome' or self.config.type == 'opera':
+        elif self.config.type == 'chrome':
           self.readChromeMetadata()
         elif self.config.type == 'safari':
           self.readSafariMetadata()
         else:
           self.readGeckoMetadata()
 
         # create development build
         self.build()
 
         # write out changelog
@@ skipping 46 matching lines @@
     except Exception, ex:
       logging.error("The build for %s failed:", repo)
       logging.exception(ex)
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()