Bug 1056324 - move addon-sdk/'s JS module installation to moz.build; r=gps; f=Mossop

2014-08-20 16:48:23 -04:00 · 2014-08-20 16:48:23 -04:00 · 0d574b3aed
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@ -2,20 +2,6 @@
 # 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/.

-include $(topsrcdir)/config/config.mk
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-MOZ_B2G=1
-else
-MOZ_B2G=0
-endif
-
-libs::
-	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs $(MOZ_B2G) >copy_source.mk
-	$(MAKE) -f copy_source.mk libs
-
-include $(topsrcdir)/config/rules.mk
-
 TEST_FILES = \
  source/app-extension \
  source/bin \
--- a/addon-sdk/copy_source.py
+++ b/addon-sdk/copy_source.py
@ -1,63 +0,0 @@
-# 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
-
-if len(sys.argv) != 5:
-    print >> sys.stderr, "Usage: copy_source.py " \
-                         "<topsrcdir> <source directory> <target directory> <isb2g>"
-    sys.exit(1)
-
-topsrcdir = sys.argv[1]
-source_dir = sys.argv[2]
-target_dir = sys.argv[3]
-isB2G = int(sys.argv[4])
-
-print """
-DEPTH     = ..
-topsrcdir = %(topsrcdir)s
-srcdir    = %(topsrcdir)s/addon-sdk
-VPATH     = %(topsrcdir)s/addon-sdk
-
-include $(topsrcdir)/config/config.mk
-""" % {'topsrcdir': topsrcdir}
-
-real_source = source_dir.replace('/', os.sep)
-if not os.path.exists(real_source):
-    print >> sys.stderr, "Error: Missing source file %s" % real_source
-    sys.exit(1)
-elif not os.path.isdir(real_source):
-    print >> sys.stderr, "Error: Source %s is not a directory" % real_source
-    sys.exit(1)
-for dirpath, dirnames, filenames in os.walk(real_source):
-    if not filenames:
-        continue
-    dirpath = dirpath.replace(os.sep, '/')
-    relative = dirpath[len(source_dir):]
-    if isB2G and relative in [
-        '/method/test',
-        '/sdk/ui',
-        '/sdk/ui/button',
-        '/sdk/ui/sidebar',
-        '/sdk/places',
-        '/sdk/places/host',
-        '/sdk/tabs',
-        '/sdk/panel',
-        '/sdk/frame',
-        '/sdk/test',
-        '/sdk/window',
-        '/sdk/windows',
-        '/sdk/deprecated',
-        ]:
-        continue
-    varname = "COMMONJS%s" % relative.replace('/', '_')
-    print "%s_FILES = \\" % varname
-    for name in filenames:
-        print "  %s/%s \\" % (dirpath, name)
-    print "  $(NULL)"
-    print "%s_DEST = %s%s" % (varname, target_dir, relative)
-    print "INSTALL_TARGETS += %s\n" % varname
-
-print "include $(topsrcdir)/config/rules.mk"
--- a/addon-sdk/mach_commands.py
+++ b/addon-sdk/mach_commands.py
@ -5,8 +5,11 @@
 # Integrates the xpcshell test runner with mach.

 import os
+import re
 import sys

+import mozpack.path as mozpath
+
 from mozbuild.base import (
    MachCommandBase,
    MozbuildObject,
@ -36,3 +39,86 @@ class MachCommands(MachCommandBase):
        jetpack = self._spawn(JetpackRunner)

        jetpack.run_tests(**params)
+
+    @Command('generate-addon-sdk-moz-build', category='misc',
+        description='Generates the moz.build file for the addon-sdk/ directory.')
+    def run_addon_sdk_moz_build(self, **params):
+        addon_sdk_dir = mozpath.join(self.topsrcdir, 'addon-sdk')
+        js_src_dir = mozpath.join(addon_sdk_dir, 'source/lib')
+        dirs_to_files = {}
+
+        for path, dirs, files in os.walk(js_src_dir):
+            js_files = [f for f in files if f.endswith(('.js', '.jsm'))]
+            if not js_files:
+                continue
+
+            relative = mozpath.relpath(path, js_src_dir)
+            dirs_to_files[relative] = js_files
+
+        moz_build = """# AUTOMATICALLY GENERATED FROM moz.build.in AND mach.  DO NOT EDIT.
+# 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/.
+
+%(moz-build-template)s
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk":
+%(non-b2g-modules)s
+%(always-on-modules)s"""
+
+        non_b2g_paths = [
+            'method/test',
+            'sdk/ui',
+            'sdk/ui/button',
+            'sdk/ui/sidebar',
+            'sdk/places',
+            'sdk/places/host',
+            'sdk/tabs',
+            'sdk/panel',
+            'sdk/frame',
+            'sdk/test',
+            'sdk/window',
+            'sdk/windows',
+            'sdk/deprecated',
+        ]
+
+        non_b2g_modules = []
+        always_on_modules = []
+
+        for d, files in sorted(dirs_to_files.items()):
+            if d in non_b2g_paths:
+                non_b2g_modules.append((d, files))
+            else:
+                always_on_modules.append((d, files))
+
+        def list_to_js_modules(l, indent=''):
+            js_modules = []
+            for d, files in l:
+                if d == '':
+                    module_path = ''
+                    dir_path = ''
+                else:
+                    # Ensure that we don't have things like:
+                    #   EXTRA_JS_MODULES.commonjs.sdk.private-browsing
+                    # which would be a Python syntax error.
+                    path = d.split('/')
+                    module_path = ''.join('.' + p if p.find('-') == -1 else "['%s']" % p for p in path)
+                    dir_path = d + '/'
+                filelist = ["'source/lib/%s%s'" % (dir_path, f) for f in sorted(files)]
+                js_modules.append("EXTRA_JS_MODULES.commonjs%s += [\n    %s,\n]\n"
+                                  % (module_path, ',\n    '.join(filelist)))
+            stringified = '\n'.join(js_modules)
+            # This isn't the same thing as |js_modules|, since |js_modules| had
+            # embedded newlines.
+            lines = stringified.split('\n')
+            # Indent lines while avoiding trailing whitespace.
+            lines = [indent + line if line else line for line in lines]
+            return '\n'.join(lines)
+
+        moz_build_output = mozpath.join(addon_sdk_dir, 'moz.build')
+        moz_build_template = mozpath.join(addon_sdk_dir, 'mozbuild.template')
+        with open(moz_build_output, 'w') as f, open(moz_build_template, 'r') as t:
+            substs = { 'moz-build-template': t.read(),
+                       'non-b2g-modules': list_to_js_modules(non_b2g_modules,
+                                                             indent='    '),
+                       'always-on-modules': list_to_js_modules(always_on_modules) }
+            f.write(moz_build % substs)
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@ -1,3 +1,8 @@
+# AUTOMATICALLY GENERATED FROM moz.build.in AND mach.  DO NOT EDIT.
+# 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/.
+
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
@ -11,3 +16,431 @@ DIRS += ["source/modules/system"]
 EXTRA_JS_MODULES.sdk += [
    'source/app-extension/bootstrap.js',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk":
+    EXTRA_JS_MODULES.commonjs.method.test += [
+        'source/lib/method/test/browser.js',
+        'source/lib/method/test/common.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.deprecated += [
+        'source/lib/sdk/deprecated/api-utils.js',
+        'source/lib/sdk/deprecated/cortex.js',
+        'source/lib/sdk/deprecated/errors.js',
+        'source/lib/sdk/deprecated/events.js',
+        'source/lib/sdk/deprecated/light-traits.js',
+        'source/lib/sdk/deprecated/list.js',
+        'source/lib/sdk/deprecated/memory.js',
+        'source/lib/sdk/deprecated/symbiont.js',
+        'source/lib/sdk/deprecated/traits-worker.js',
+        'source/lib/sdk/deprecated/traits.js',
+        'source/lib/sdk/deprecated/unit-test-finder.js',
+        'source/lib/sdk/deprecated/unit-test.js',
+        'source/lib/sdk/deprecated/window-utils.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.frame += [
+        'source/lib/sdk/frame/hidden-frame.js',
+        'source/lib/sdk/frame/utils.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.panel += [
+        'source/lib/sdk/panel/events.js',
+        'source/lib/sdk/panel/utils.js',
+        'source/lib/sdk/panel/window.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.places += [
+        'source/lib/sdk/places/bookmarks.js',
+        'source/lib/sdk/places/contract.js',
+        'source/lib/sdk/places/events.js',
+        'source/lib/sdk/places/favicon.js',
+        'source/lib/sdk/places/history.js',
+        'source/lib/sdk/places/utils.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.places.host += [
+        'source/lib/sdk/places/host/host-bookmarks.js',
+        'source/lib/sdk/places/host/host-query.js',
+        'source/lib/sdk/places/host/host-tags.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.tabs += [
+        'source/lib/sdk/tabs/common.js',
+        'source/lib/sdk/tabs/events.js',
+        'source/lib/sdk/tabs/helpers.js',
+        'source/lib/sdk/tabs/namespace.js',
+        'source/lib/sdk/tabs/observer.js',
+        'source/lib/sdk/tabs/tab-fennec.js',
+        'source/lib/sdk/tabs/tab-firefox.js',
+        'source/lib/sdk/tabs/tab.js',
+        'source/lib/sdk/tabs/tabs-firefox.js',
+        'source/lib/sdk/tabs/utils.js',
+        'source/lib/sdk/tabs/worker.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.test += [
+        'source/lib/sdk/test/assert.js',
+        'source/lib/sdk/test/harness.js',
+        'source/lib/sdk/test/httpd.js',
+        'source/lib/sdk/test/loader.js',
+        'source/lib/sdk/test/memory.js',
+        'source/lib/sdk/test/options.js',
+        'source/lib/sdk/test/runner.js',
+        'source/lib/sdk/test/tmp-file.js',
+        'source/lib/sdk/test/utils.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.ui += [
+        'source/lib/sdk/ui/frame.js',
+        'source/lib/sdk/ui/id.js',
+        'source/lib/sdk/ui/sidebar.js',
+        'source/lib/sdk/ui/state.js',
+        'source/lib/sdk/ui/toolbar.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.ui.button += [
+        'source/lib/sdk/ui/button/action.js',
+        'source/lib/sdk/ui/button/contract.js',
+        'source/lib/sdk/ui/button/toggle.js',
+        'source/lib/sdk/ui/button/view.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.ui.sidebar += [
+        'source/lib/sdk/ui/sidebar/actions.js',
+        'source/lib/sdk/ui/sidebar/contract.js',
+        'source/lib/sdk/ui/sidebar/namespace.js',
+        'source/lib/sdk/ui/sidebar/utils.js',
+        'source/lib/sdk/ui/sidebar/view.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.window += [
+        'source/lib/sdk/window/browser.js',
+        'source/lib/sdk/window/events.js',
+        'source/lib/sdk/window/helpers.js',
+        'source/lib/sdk/window/namespace.js',
+        'source/lib/sdk/window/utils.js',
+    ]
+
+    EXTRA_JS_MODULES.commonjs.sdk.windows += [
+        'source/lib/sdk/windows/dom.js',
+        'source/lib/sdk/windows/fennec.js',
+        'source/lib/sdk/windows/firefox.js',
+        'source/lib/sdk/windows/loader.js',
+        'source/lib/sdk/windows/observer.js',
+        'source/lib/sdk/windows/tabs-fennec.js',
+        'source/lib/sdk/windows/tabs-firefox.js',
+    ]
+
+EXTRA_JS_MODULES.commonjs += [
+    'source/lib/test.js',
+]
+
+EXTRA_JS_MODULES.commonjs.dev += [
+    'source/lib/dev/debuggee.js',
+    'source/lib/dev/frame-script.js',
+    'source/lib/dev/panel.js',
+    'source/lib/dev/ports.js',
+    'source/lib/dev/toolbox.js',
+    'source/lib/dev/utils.js',
+    'source/lib/dev/volcan.js',
+]
+
+EXTRA_JS_MODULES.commonjs.diffpatcher += [
+    'source/lib/diffpatcher/diff.js',
+    'source/lib/diffpatcher/index.js',
+    'source/lib/diffpatcher/patch.js',
+    'source/lib/diffpatcher/rebase.js',
+]
+
+EXTRA_JS_MODULES.commonjs.diffpatcher.test += [
+    'source/lib/diffpatcher/test/common.js',
+    'source/lib/diffpatcher/test/diff.js',
+    'source/lib/diffpatcher/test/index.js',
+    'source/lib/diffpatcher/test/patch.js',
+    'source/lib/diffpatcher/test/tap.js',
+]
+
+EXTRA_JS_MODULES.commonjs.framescript += [
+    'source/lib/framescript/FrameScriptManager.jsm',
+    'source/lib/framescript/tab-events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.method += [
+    'source/lib/method/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.node += [
+    'source/lib/node/os.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk += [
+    'source/lib/sdk/addon-page.js',
+    'source/lib/sdk/base64.js',
+    'source/lib/sdk/clipboard.js',
+    'source/lib/sdk/context-menu.js',
+    'source/lib/sdk/hotkeys.js',
+    'source/lib/sdk/indexed-db.js',
+    'source/lib/sdk/l10n.js',
+    'source/lib/sdk/messaging.js',
+    'source/lib/sdk/notifications.js',
+    'source/lib/sdk/page-mod.js',
+    'source/lib/sdk/page-worker.js',
+    'source/lib/sdk/panel.js',
+    'source/lib/sdk/passwords.js',
+    'source/lib/sdk/private-browsing.js',
+    'source/lib/sdk/querystring.js',
+    'source/lib/sdk/request.js',
+    'source/lib/sdk/selection.js',
+    'source/lib/sdk/self.js',
+    'source/lib/sdk/simple-prefs.js',
+    'source/lib/sdk/simple-storage.js',
+    'source/lib/sdk/system.js',
+    'source/lib/sdk/tabs.js',
+    'source/lib/sdk/test.js',
+    'source/lib/sdk/timers.js',
+    'source/lib/sdk/ui.js',
+    'source/lib/sdk/url.js',
+    'source/lib/sdk/widget.js',
+    'source/lib/sdk/windows.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.addon += [
+    'source/lib/sdk/addon/events.js',
+    'source/lib/sdk/addon/host.js',
+    'source/lib/sdk/addon/installer.js',
+    'source/lib/sdk/addon/runner.js',
+    'source/lib/sdk/addon/window.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.browser += [
+    'source/lib/sdk/browser/events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.console += [
+    'source/lib/sdk/console/plain-text.js',
+    'source/lib/sdk/console/traceback.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.content += [
+    'source/lib/sdk/content/content-worker.js',
+    'source/lib/sdk/content/content.js',
+    'source/lib/sdk/content/events.js',
+    'source/lib/sdk/content/loader.js',
+    'source/lib/sdk/content/mod.js',
+    'source/lib/sdk/content/sandbox.js',
+    'source/lib/sdk/content/thumbnail.js',
+    'source/lib/sdk/content/utils.js',
+    'source/lib/sdk/content/worker.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.core += [
+    'source/lib/sdk/core/disposable.js',
+    'source/lib/sdk/core/heritage.js',
+    'source/lib/sdk/core/namespace.js',
+    'source/lib/sdk/core/observer.js',
+    'source/lib/sdk/core/promise.js',
+    'source/lib/sdk/core/reference.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.deprecated.events += [
+    'source/lib/sdk/deprecated/events/assembler.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.deprecated.traits += [
+    'source/lib/sdk/deprecated/traits/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.dom += [
+    'source/lib/sdk/dom/events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.dom.events += [
+    'source/lib/sdk/dom/events/keys.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.event += [
+    'source/lib/sdk/event/chrome.js',
+    'source/lib/sdk/event/core.js',
+    'source/lib/sdk/event/dom.js',
+    'source/lib/sdk/event/target.js',
+    'source/lib/sdk/event/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.fs += [
+    'source/lib/sdk/fs/path.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.input += [
+    'source/lib/sdk/input/browser.js',
+    'source/lib/sdk/input/customizable-ui.js',
+    'source/lib/sdk/input/frame.js',
+    'source/lib/sdk/input/system.js',
+    'source/lib/sdk/input/window.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.io += [
+    'source/lib/sdk/io/buffer.js',
+    'source/lib/sdk/io/byte-streams.js',
+    'source/lib/sdk/io/data.js',
+    'source/lib/sdk/io/file.js',
+    'source/lib/sdk/io/fs.js',
+    'source/lib/sdk/io/stream.js',
+    'source/lib/sdk/io/text-streams.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.keyboard += [
+    'source/lib/sdk/keyboard/hotkeys.js',
+    'source/lib/sdk/keyboard/observer.js',
+    'source/lib/sdk/keyboard/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.l10n += [
+    'source/lib/sdk/l10n/core.js',
+    'source/lib/sdk/l10n/html.js',
+    'source/lib/sdk/l10n/loader.js',
+    'source/lib/sdk/l10n/locale.js',
+    'source/lib/sdk/l10n/plural-rules.js',
+    'source/lib/sdk/l10n/prefs.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.l10n.json += [
+    'source/lib/sdk/l10n/json/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.l10n.properties += [
+    'source/lib/sdk/l10n/properties/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.lang += [
+    'source/lib/sdk/lang/functional.js',
+    'source/lib/sdk/lang/type.js',
+    'source/lib/sdk/lang/weak-set.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.lang.functional += [
+    'source/lib/sdk/lang/functional/concurrent.js',
+    'source/lib/sdk/lang/functional/core.js',
+    'source/lib/sdk/lang/functional/helpers.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.loader += [
+    'source/lib/sdk/loader/cuddlefish.js',
+    'source/lib/sdk/loader/sandbox.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.model += [
+    'source/lib/sdk/model/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.net += [
+    'source/lib/sdk/net/url.js',
+    'source/lib/sdk/net/xhr.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.output += [
+    'source/lib/sdk/output/system.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk['page-mod'] += [
+    'source/lib/sdk/page-mod/match-pattern.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.passwords += [
+    'source/lib/sdk/passwords/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.platform += [
+    'source/lib/sdk/platform/xpcom.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.preferences += [
+    'source/lib/sdk/preferences/event-target.js',
+    'source/lib/sdk/preferences/native-options.js',
+    'source/lib/sdk/preferences/service.js',
+    'source/lib/sdk/preferences/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk['private-browsing'] += [
+    'source/lib/sdk/private-browsing/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.stylesheet += [
+    'source/lib/sdk/stylesheet/style.js',
+    'source/lib/sdk/stylesheet/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.system += [
+    'source/lib/sdk/system/child_process.js',
+    'source/lib/sdk/system/environment.js',
+    'source/lib/sdk/system/events.js',
+    'source/lib/sdk/system/globals.js',
+    'source/lib/sdk/system/process.js',
+    'source/lib/sdk/system/runtime.js',
+    'source/lib/sdk/system/unload.js',
+    'source/lib/sdk/system/xul-app.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.system.child_process += [
+    'source/lib/sdk/system/child_process/subprocess.js',
+    'source/lib/sdk/system/child_process/subprocess_worker_unix.js',
+    'source/lib/sdk/system/child_process/subprocess_worker_win.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.tab += [
+    'source/lib/sdk/tab/events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.button.view += [
+    'source/lib/sdk/ui/button/view/events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.frame += [
+    'source/lib/sdk/ui/frame/model.js',
+    'source/lib/sdk/ui/frame/view.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.state += [
+    'source/lib/sdk/ui/state/events.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.toolbar += [
+    'source/lib/sdk/ui/toolbar/model.js',
+    'source/lib/sdk/ui/toolbar/view.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.url += [
+    'source/lib/sdk/url/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.util += [
+    'source/lib/sdk/util/array.js',
+    'source/lib/sdk/util/collection.js',
+    'source/lib/sdk/util/contract.js',
+    'source/lib/sdk/util/deprecate.js',
+    'source/lib/sdk/util/dispatcher.js',
+    'source/lib/sdk/util/iteration.js',
+    'source/lib/sdk/util/list.js',
+    'source/lib/sdk/util/match-pattern.js',
+    'source/lib/sdk/util/object.js',
+    'source/lib/sdk/util/registry.js',
+    'source/lib/sdk/util/rules.js',
+    'source/lib/sdk/util/sequence.js',
+    'source/lib/sdk/util/uuid.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.view += [
+    'source/lib/sdk/view/core.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.worker += [
+    'source/lib/sdk/worker/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.zip += [
+    'source/lib/sdk/zip/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.toolkit += [
+    'source/lib/toolkit/loader.js',
+]
--- a/addon-sdk/mozbuild.template
+++ b/addon-sdk/mozbuild.template
@ -0,0 +1,13 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+DIRS += ["source/modules/system"]
+
+EXTRA_JS_MODULES.sdk += [
+    'source/app-extension/bootstrap.js',
+]