Nightly builds script changes required to work with the newest buildtools

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This Source Code is subject to the terms of the Mozilla Public License
 # version 2.0 (the "License"). You can obtain a copy of the License at
 # http://mozilla.org/MPL/2.0/.
 
 """
 
 Nightly builds generation script
 ================================
 
   This script generates nightly builds of extensions, together
   with changelogs and documentation.
 
 """
 
 import sys, os, os.path, subprocess, ConfigParser, traceback, json, hashlib
 import tempfile, re, shutil, urlparse, pipes
 from datetime import datetime
 from xml.dom.minidom import parse as parseXml
 from sitescripts.utils import get_config, setupStderr, get_template
 from sitescripts.extensions.utils import compareVersions, Configuration
-import buildtools.packagerGecko as packager
 
 MAX_BUILDS = 50
 
 
 class NightlyBuild(object):
   """
     Performs the build process for an extension,
     generating changelogs and documentation.
   """
 
@@ skipping 67 matching lines @@
       os.symlink(changelogPath, linkPath)
     else:
       shutil.copyfile(changelogPath, linkPath)
 
   def readMetadata(self):
     """
       read the metadata file from a cloned repository
       and parse id, version, basename and the compat section
       out of the file
     """
+    import buildtools.packagerGecko as packager
     metadata = packager.readMetadata(self.tempdir)
     self.extensionID = metadata.get("general", "id")
     self.version = '%s.%s' % (metadata.get("general", "version"), self.revision)
     self.basename = metadata.get("general", "basename")
     self.compat = []
     for key, value in packager.KNOWN_APPS.iteritems():
       if metadata.has_option('compat', key):
         minVersion, maxVersion = metadata.get('compat', key).split('/')
         self.compat.append({'id': value, 'minVersion': minVersion, 'maxVersion': maxVersion})
 
@@ skipping 16 matching lines @@
     self.basename = os.path.basename(self.config.repository)
 
   def readChromeMetadata(self):
     """
       Read Chrome-specific metadata from manifest.json file. It will also
       calculate extension ID from the private key.
     """
 
     # Calculate extension ID from public key
     # (see http://supercollider.dk/2010/01/calculating-chrome-extension-id-from-your-private-key-233)
-    sys.path.append(self.tempdir)
-    build = __import__('build')
-    publicKey = build.getPublicKey(self.config.keyFile)
+    import buildtools.packagerChrome as packager
+    publicKey = packager.getPublicKey(self.config.keyFile)
     hash = hashlib.sha256()
     hash.update(publicKey)
     self.extensionID = hash.hexdigest()[0:32]
     self.extensionID = ''.join(map(lambda c: chr(97 + int(c, 16)), self.extensionID))
 
     # Now read manifest.json
     manifestFile = open(os.path.join(self.tempdir, 'manifest.json'), 'rb')
     manifest = json.load(manifestFile)
     manifestFile.close()
 
@@ skipping 50 matching lines @@
       buildCommand += map(pipes.quote, ['/home/android/bin/makedebugbuild.py', '--revision', self.revision, '--version', self.version, '--stdout'])
       process = subprocess.Popen(buildCommand, stdout=apkFile, stderr=None)
       status = process.wait()
       apkFile.close()
       if status:
         # clear broken output if any
         # exception will be raised later
         if os.path.exists(outputPath):
           os.remove(outputPath)
     elif self.config.type == 'chrome':
-      buildCommand = ['python', os.path.join(self.tempdir, 'build.py'), '-k', self.config.keyFile, '-b', self.revision, outputPath]
-      if self.config.experimental:
-        buildCommand[-1:0] = ['--experimental']
-      subprocess.Popen(buildCommand, stdout=subprocess.PIPE).communicate()
+      import buildtools.packagerChrome as packager
+      packager.createBuild(self.tempdir, outFile=outputPath, buildNum=self.revision, keyFile=self.config.keyFile, experimentalAPI=self.config.experimental)
     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):
         os.remove(linkPath)
       os.symlink(outputPath, linkPath)
@@ skipping 134 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()