Integrated ABP for Safari into the nightly builds

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 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 156 matching lines @@
     metadata = packager.readMetadata(self.tempdir, self.config.type)
     self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
     self.basename = metadata.get("general", "basename")
     if self.config.experimental:
       self.basename += '-experimental'
 
     self.compat = []
     if metadata.has_section('compat') and metadata.has_option('compat', 'chrome'):
       self.compat.append({'id': 'chrome', 'minVersion': metadata.get('compat', 'chrome')})
 
+  def readSafariMetadata(self):
+    # get the certificate ID from the developer certificate's common name
+    import M2Crypto
+    bio = M2Crypto.BIO.openfile(self.config.keyFile)
+    try:
+      while not hasattr(self, 'certificateID'):
+        try:
+          cert = M2Crypto.X509.load_cert_bio(bio)
+        except M2Crypto.X509.X509Error:
+          raise Exception('No safari developer certificate found in chain')
+
+        subject = cert.get_subject()
+        for entry in subject.get_entries_by_nid(subject.nid['CN']):
+          m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text())

[Wladimir Palant, 2013/11/13 11:53:24]

Wow, this sucks.

[Sebastian Noack, 2013/11/13 11:55:55]

Agreed. Do you have a better idea?

[Wladimir Palant, 2013/11/13 13:21:13]

No, I don't - other than putting "this sucks, blame Apple" in a comment above it
:)

+          if m:
+            self.certificateID = m.group(1)
+            break
+    finally:
+      bio.close()
+
+    # read metadata file
+    import buildtools.packagerSafari as packager
+    metadata = packager.readMetadata(self.tempdir, self.config.type)
+    self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
+    self.shortVersion = metadata.get("general", "version")
+    self.basename = metadata.get("general", "basename")
+
   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':
       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'
     else:
       manifestPath = os.path.join(baseDir, "update.rdf")
       templateName = 'geckoUpdateManifest'
 
     template = get_template(get_config().get('extensions', templateName))
     template.stream({'extensions': [self]}).dump(manifestPath)
 
@@ skipping 74 matching lines @@
         buildCommand += 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(outputPath):
           os.remove(outputPath)
         raise
     elif self.config.type == 'chrome' or self.config.type == 'opera':
       import buildtools.packagerChrome as packager
       packager.createBuild(self.tempdir, type=self.config.type, outFile=outputPath, 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=outputPath, buildNum=self.revision, keyFile=self.config.keyFile)
     else:
       import buildtools.packagerGecko as packager
       packager.createBuild(self.tempdir, outFile=outputPath, buildNum=self.revision, keyFile=self.config.keyFile)
 
     if not os.path.exists(outputPath):
       raise Exception("Build failed, output file hasn't been created")
 
     linkPath = os.path.join(baseDir, '00latest%s' % self.config.packageSuffix)
     if hasattr(os, 'symlink'):
       if os.path.exists(linkPath):
@@ skipping 79 matching lines @@
         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':
           self.readChromeMetadata()
+        elif self.config.type == 'safari':
+          self.readSafariMetadata()
         else:
           self.readMetadata()
 
         # create development build
         self.build()
 
         # write out changelog
         self.writeChangelog(self.getChanges())
 
         # write update.rdf file
@@ skipping 42 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()