look for compiled inspector interface in both XPTs

mozilla · Mar 3, 2017 · 7851df5 · 7851df5
1 parent 660bbc4
commit 7851df5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/devtools-mac.manifest b/devtools-mac.manifest
@@ -1,4 +1,10 @@
+# The location of the jsinspector interface depends on how the runtime
+# is packaged.  In a downloaded nightly build, it's in interfaces.xpt,
+# while in a local build it's in jsinspector.xpt.  We cover both bases,
+# since nothing bad happens if one or the other file isn't found.
 interfaces dist/Runtime.app/Contents/Resources/browser/components/interfaces.xpt
+interfaces dist/Runtime.app/Contents/Resources/browser/components/jsinspector.xpt
+
 locale devtools en-US dist/Runtime.app/Contents/Resources/browser/chrome/en-US/locale/en-US/devtools/client/
 locale devtools-shared en-US dist/Runtime.app/Contents/Resources/browser/chrome/en-US/locale/en-US/devtools/shared/
 content devtools dist/Runtime.app/Contents/Resources/browser/chrome/devtools/content/

diff --git a/devtools.manifest b/devtools.manifest
@@ -1,4 +1,10 @@
+# The location of the jsinspector interface depends on how the runtime
+# is packaged.  In a downloaded nightly build, it's in interfaces.xpt,
+# while in a local build it's in jsinspector.xpt.  We cover both bases,
+# since nothing bad happens if one or the other file isn't found.
 interfaces dist/firefox/browser/components/interfaces.xpt
+interfaces dist/firefox/browser/components/jsinspector.xpt
+
 locale devtools en-US dist/firefox/browser/chrome/en-US/locale/en-US/devtools/client/
 locale devtools-shared en-US dist/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/
 content devtools dist/firefox/browser/chrome/devtools/content/