| Index: packagerGecko.py | 
| =================================================================== | 
| --- a/packagerGecko.py | 
| +++ b/packagerGecko.py | 
| @@ -16,17 +16,18 @@ | 
| # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 
| import os, sys, re, hashlib, base64, urllib, json | 
| from ConfigParser import SafeConfigParser | 
| from StringIO import StringIO | 
| import xml.dom.minidom as minidom | 
| import buildtools.localeTools as localeTools | 
| -from packager import getDefaultFileName, readMetadata, getBuildVersion, getTemplate, Files | 
| +import packager | 
| +from packager import getDefaultFileName, getBuildVersion, getTemplate, Files | 
| KNOWN_APPS = { | 
| 'conkeror': '{a79fe89b-6662-4ff4-8e88-09950ad4dfde}', | 
| 'emusic': 'dlm@emusic.com', | 
| 'fennec': '{a23983c0-fd0e-11dc-95ff-0800200c9a66}', | 
| 'fennec2': '{aa3c5121-dab2-40e2-81ca-7ea25febc110}', | 
| 'firefox': '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}', | 
| 'midbrowser': '{aa5ca914-c309-495d-91cf-3141bbb04115}', | 
| @@ -34,16 +35,22 @@ KNOWN_APPS = { | 
| 'seamonkey': '{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}', | 
| 'songbird': 'songbird@songbirdnest.com', | 
| 'thunderbird': '{3550f703-e582-4d05-9a08-453d09bdfdc6}', | 
| 'toolkit': 'toolkit@mozilla.org', | 
| } | 
| defaultLocale = 'en-US' | 
| +def getMetadataPath(baseDir): | 
| + return packager.getMetadataPath(baseDir, 'gecko') | 
| + | 
| +def readMetadata(baseDir): | 
| + return packager.readMetadata(baseDir, 'gecko') | 
| + | 
| def getChromeDir(baseDir): | 
| return os.path.join(baseDir, 'chrome') | 
| def getLocalesDir(baseDir): | 
| return os.path.join(getChromeDir(baseDir), 'locale') | 
| def getChromeSubdirs(baseDir, locales): | 
| result = {} |