| OLD | NEW | 
|    1 # coding: utf-8 |    1 # coding: utf-8 | 
|    2  |    2  | 
|    3 # This Source Code Form is subject to the terms of the Mozilla Public |    3 # This Source Code Form is subject to the terms of the Mozilla Public | 
|    4 # License, v. 2.0. If a copy of the MPL was not distributed with this |    4 # License, v. 2.0. If a copy of the MPL was not distributed with this | 
|    5 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |    5 # file, You can obtain one at http://mozilla.org/MPL/2.0/. | 
|    6  |    6  | 
|    7 # Note: These are the base functions common to all packagers, the actual |    7 # Note: These are the base functions common to all packagers, the actual | 
|    8 # packagers are implemented in packagerGecko and packagerChrome. |    8 # packagers are implemented in packagerGecko and packagerChrome. | 
|    9  |    9  | 
|   10 import sys, os, re, codecs, subprocess, json, zipfile |   10 import sys, os, re, codecs, subprocess, json, zipfile | 
|   11 from StringIO import StringIO |   11 from StringIO import StringIO | 
|   12 from chainedconfigparser import ChainedConfigParser |   12 from chainedconfigparser import ChainedConfigParser | 
|   13  |   13  | 
|   14 import buildtools |   14 import buildtools | 
|   15  |   15  | 
|   16 def getDefaultFileName(metadata, version, ext): |   16 def getDefaultFileName(metadata, version, ext): | 
|   17   return '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext) |   17   return '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext) | 
|   18  |   18  | 
|   19 def getMetadataPath(baseDir, type): |   19 def getMetadataPath(baseDir, type): | 
|   20   return os.path.join(baseDir, 'metadata.%s' % type) |   20   return os.path.join(baseDir, 'metadata.%s' % type) | 
|   21  |   21  | 
 |   22 def getDevEnvPath(baseDir): | 
 |   23   return os.path.join(baseDir, 'devenv') | 
 |   24  | 
|   22 def readMetadata(baseDir, type): |   25 def readMetadata(baseDir, type): | 
|   23   parser = ChainedConfigParser() |   26   parser = ChainedConfigParser() | 
|   24   parser.optionxform = lambda option: option |   27   parser.optionxform = lambda option: option | 
|   25   parser.read(getMetadataPath(baseDir, type)) |   28   parser.read(getMetadataPath(baseDir, type)) | 
|   26   return parser |   29   return parser | 
|   27  |   30  | 
|   28 def getBuildNum(baseDir): |   31 def getBuildNum(baseDir): | 
|   29   try: |   32   try: | 
|   30     from buildtools.ensure_dependencies import Mercurial, Git |   33     from buildtools.ensure_dependencies import Mercurial, Git | 
|   31     if Mercurial().istype(baseDir): |   34     if Mercurial().istype(baseDir): | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  126     names = self.keys() |  129     names = self.keys() | 
|  127     names.sort(key=sortKey) |  130     names.sort(key=sortKey) | 
|  128     for name in names: |  131     for name in names: | 
|  129       zip.writestr(name, self[name]) |  132       zip.writestr(name, self[name]) | 
|  130     zip.close() |  133     zip.close() | 
|  131  |  134  | 
|  132   def zipToString(self, sortKey=None): |  135   def zipToString(self, sortKey=None): | 
|  133     buffer = StringIO() |  136     buffer = StringIO() | 
|  134     self.zip(buffer, sortKey=sortKey) |  137     self.zip(buffer, sortKey=sortKey) | 
|  135     return buffer.getvalue() |  138     return buffer.getvalue() | 
| OLD | NEW |