Issue 5049 - Allow embedded WebExtensions in gecko packager

packagerGecko.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import sys
 import re
 import hashlib
 import base64
 import urllib
@@ skipping 37 matching lines @@
     result = {}
     chromeDir = getChromeDir(baseDir)
     for subdir in ('content', 'skin'):
         result[subdir] = os.path.join(chromeDir, subdir)
     for locale in locales:
         result['locale/%s' % locale] = os.path.join(chromeDir, 'locale', locale)
     return result
 
 
 def getPackageFiles(params):
-    result = set(('chrome', 'components', 'modules', 'lib', 'resources', 'chrome.manifest', 'icon.png', 'icon64.png',))
+    result = {
+        'chrome', 'components', 'modules', 'lib', 'resources', 'webextension',
+        'chrome.manifest', 'icon.png', 'icon64.png'
+    }
 
     baseDir = params['baseDir']
     for file in os.listdir(baseDir):
         if file.endswith('.js') or file.endswith('.xml'):
             result.add(file)
     return result
 
 
 def getIgnoredFiles(params):
     return {'.incomplete', 'meta.properties'}
@@ skipping 165 matching lines @@
 
 def addMissingFiles(params, files):
     templateData = {
         'hasChrome': False,
         'hasChromeRequires': False,
         'hasShutdownHandlers': False,
         'chromeWindows': [],
         'requires': set(),
         'jsonRequires': params['jsonRequires'],
         'metadata': params['metadata'],
+        'hasWebExtension': params['hasWebExtension'],
         'multicompartment': params['multicompartment'],
         'applications': dict((v, k) for k, v in KNOWN_APPS.iteritems()),
     }
 
     def checkScript(name):
         content = files[name]
         for match in re.finditer(r'(?:^|\s)require\(\s*"([\w\-]+)"\s*\)', content):
             templateData['requires'].add(match.group(1))
             if name.startswith('chrome/content/'):
                 templateData['hasChromeRequires'] = True
@@ skipping 45 matching lines @@
     contributors = getContributors(metadata)
 
     params = {
         'baseDir': baseDir,
         'locales': locales,
         'releaseBuild': releaseBuild,
         'version': version.encode('utf-8'),
         'metadata': metadata,
         'contributors': contributors,
         'multicompartment': multicompartment,
+        'hasWebExtension': os.path.isdir(os.path.join(baseDir, 'webextension')),
         'jsonRequires': {},
     }
 
     mapped = metadata.items('mapping') if metadata.has_section('mapping') else []
     skip = [opt for opt, _ in mapped] + ['chrome']
     files = Files(getPackageFiles(params), getIgnoredFiles(params),
                   process=lambda path, data: processFile(path, data, params))
     files['install.rdf'] = createManifest(params)
     files.readMappedFiles(mapped)
     files.read(baseDir, skip=skip)
     for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
         if os.path.isdir(path):
             files.read(path, 'chrome/%s' % name, skip=skip)
     importLocales(params, files)
     fixupLocales(params, files)
     processJSONFiles(params, files)
     if not 'bootstrap.js' in files:
         addMissingFiles(params, files)
     if metadata.has_section('preprocess'):
         files.preprocess([f for f, _ in metadata.items('preprocess')])
     files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x)
 
 
 def autoInstall(baseDir, type, host, port, multicompartment=False):
     fileBuffer = StringIO()
     createBuild(baseDir, type=type, outFile=fileBuffer, multicompartment=multicompartment)
     urllib.urlopen('http://%s:%s/' % (host, port), data=fileBuffer.getvalue())