Bug 1069682 - part 0 - ensure changes to addon-sdk's moz.build are reflected in the mozbuild.template; r=erikvold
authorNathan Froyd <froydnj@mozilla.com>
Fri, 19 Sep 2014 09:33:50 -0400
changeset 207140 432cdf1c88a97c8a64335269a0d4455253a4bba1
parent 207139 8bba4620826b0887d16cd6d631220e2eaf4c7207
child 207141 a6e93c843089fdbb24b3f8802b8ec119d652c699
push id27546
push usercbook@mozilla.com
push dateThu, 25 Sep 2014 12:23:21 +0000
treeherdermozilla-central@c3660fb07ffd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserikvold
bugs1069682
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1069682 - part 0 - ensure changes to addon-sdk's moz.build are reflected in the mozbuild.template; r=erikvold
addon-sdk/mach_commands.py
addon-sdk/mozbuild.template
--- a/addon-sdk/mach_commands.py
+++ b/addon-sdk/mach_commands.py
@@ -50,17 +50,17 @@ class MachCommands(MachCommandBase):
         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.
+        moz_build = """# AUTOMATICALLY GENERATED FROM mozbuild.template 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"""
--- a/addon-sdk/mozbuild.template
+++ b/addon-sdk/mozbuild.template
@@ -3,13 +3,16 @@
 # 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']
 JETPACK_PACKAGE_MANIFESTS += ['source/test/jetpack-package.ini']
 JETPACK_ADDON_MANIFESTS += ['source/test/addons/jetpack-addon.ini']
 
-DIRS += ["source/modules/system"]
-
 EXTRA_JS_MODULES.sdk += [
     'source/app-extension/bootstrap.js',
 ]
+
+EXTRA_JS_MODULES.sdk.system += [
+    'source/modules/system/Startup.js',
+    'source/modules/system/XulApp.js',
+]