Issue 3758 - Removed Opera Extensions related logic

sitescripts/extensions/bin/createNightlies.py

Index: sitescripts/extensions/bin/createNightlies.py
===================================================================
--- a/sitescripts/extensions/bin/createNightlies.py
+++ b/sitescripts/extensions/bin/createNightlies.py
@@ -223,31 +223,29 @@
     """
       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)
@@ -309,7 +307,7 @@
         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':
@@ -563,7 +561,7 @@
         # 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()