Bug 1069682 - part 1 - ensure the addon-sdk's JS modules include .html files; r=erikvold
authorNathan Froyd <froydnj@mozilla.com>
Fri, 19 Sep 2014 09:34:15 -0400
changeset 207175 a6e93c843089fdbb24b3f8802b8ec119d652c699
parent 207174 432cdf1c88a97c8a64335269a0d4455253a4bba1
child 207176 c0c410aed86fee0501e1f6fdb996e9c43200687e
push id8987
push usercbook@mozilla.com
push dateThu, 25 Sep 2014 13:28:48 +0000
treeherderfx-team@822ade44d100 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserikvold
bugs1069682
milestone35.0a1
Bug 1069682 - part 1 - ensure the addon-sdk's JS modules include .html files; r=erikvold
addon-sdk/mach_commands.py
addon-sdk/moz.build
--- a/addon-sdk/mach_commands.py
+++ b/addon-sdk/mach_commands.py
@@ -43,17 +43,17 @@ class MachCommands(MachCommandBase):
     @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'))]
+            js_files = [f for f in files if f.endswith(('.js', '.jsm', '.html'))]
             if not js_files:
                 continue
 
             relative = mozpath.relpath(path, js_src_dir)
             dirs_to_files[relative] = js_files
 
         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
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -394,16 +394,17 @@ EXTRA_JS_MODULES.commonjs.sdk.tab += [
 ]
 
 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.html',
     '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 += [