Prepared buildtools for Safari

build.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # 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 157 matching lines @@
     }
 
 
 def runBuild(baseDir, scriptName, opts, args, type):
   locales = None
   buildNum = None
   multicompartment = False
   releaseBuild = False
   keyFile = None
   experimentalAPI = False
-  certs = []
   for option, value in opts:
     if option in ('-l', '--locales'):
       locales = value.split(',')
     elif option in ('-b', '--build'):
       buildNum = int(value)
     elif option in ('-k', '--key'):
       keyFile = value
     elif option in ('-m', '--multi-compartment'):
       multicompartment = True
     elif option in ('-r', '--release'):
       releaseBuild = True
     elif option == '--experimental':
       experimentalAPI = True
-    elif option == '--cert':
-      certs.append(value)

[Wladimir Palant, 2013/09/10 10:15:27]

I suggest reusing the approach from the Gecko packager instead of introducing a
new parameter. The signing key file for Gecko builds starts with the private key
followed by the certificates. M2Crypto can still load the key directly, look for
keyData in packagerGecko.py for the certificate loading code.

   outFile = args[0] if len(args) > 0 else None
 
   if type == 'gecko':
     import buildtools.packagerGecko as packager
     packager.createBuild(baseDir, type=type, outFile=outFile, locales=locales, buildNum=buildNum,
                          releaseBuild=releaseBuild, keyFile=keyFile,
                          multicompartment=multicompartment)
   elif type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
     packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
                          releaseBuild=releaseBuild, keyFile=keyFile,
                          experimentalAPI=experimentalAPI)
   elif type == 'safari':
     import buildtools.packagerSafari as packager
-    packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum, releaseBuild=releaseBuild, keyFile=keyFile, certs=certs)
-   
+    packager.createBuild(baseDir, type=type, outFile=outFile, buildNum=buildNum,
+                         releaseBuild=releaseBuild, keyFile=keyFile)
 
 
 def runAutoInstall(baseDir, scriptName, opts, args, type):
   if len(args) == 0:
     print 'Port of the Extension Auto-Installer needs to be specified'
     usage(scriptName, type, 'autoinstall')
     return
 
   multicompartment = False
   for option, value in opts:
@@ skipping 206 matching lines @@
 with addCommand(lambda baseDir, scriptName, opts, args, type: usage(scriptName, type), ('help', '-h', '--help')) as command:
   command.shortDescription = 'Show this message'
 
 with addCommand(runBuild, 'build') as command:
   command.shortDescription = 'Create a build'
   command.description = 'Creates an extension build with given file name. If output_file is missing a default name will be chosen.'
   command.params = '[options] [output_file]'
   command.addOption('Only include the given locales (if omitted: all locales not marked as incomplete)', short='l', long='locales', value='l1,l2,l3', types=('gecko'))
   command.addOption('Use given build number (if omitted the build number will be retrieved from Mercurial)', short='b', long='build', value='num')
   command.addOption('File containing private key and certificates required to sign the package', short='k', long='key', value='file', types=('gecko', 'chrome', 'opera', 'safari'))
-  command.addOption('File containing an X509 certificate to be inlcuded into the package. Can be given multiple times.', long='cert', value='file', types=('safari',))
   command.addOption('Create a build for leak testing', short='m', long='multi-compartment', types=('gecko'))
   command.addOption('Create a release build', short='r', long='release')
   command.addOption('Enable use of experimental APIs', long='experimental')
   command.supportedTypes = ('gecko', 'chrome', 'opera', 'safari')
 
 with addCommand(runAutoInstall, 'autoinstall') as command:
   command.shortDescription = 'Install extension automatically'
   command.description = 'Will automatically install the extension in a browser running Extension Auto-Installer. If host parameter is omitted assumes that the browser runs on localhost.'
   command.params = '[<host>:]<port>'
   command.addOption('Create a build for leak testing', short='m', long='multi-compartment')
@@ skipping 123 matching lines @@
         if option in ('-h', '--help'):
           usage(scriptName, type, command)
           sys.exit()
       commands[command](baseDir, scriptName, opts, args, type)
     else:
       print 'Command %s is not supported for this application type' % command
       usage(scriptName, type)
   else:
     print 'Command %s is unrecognized' % command
     usage(scriptName, type)