summaryrefslogtreecommitdiffstats
path: root/devtools
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-09-26 17:49:21 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-09-26 17:49:21 -0400
commita549e0c4a3aceedacd3bd70f9df9629cac57f0c4 (patch)
tree4b4d5316f0092383c9678fccda4f40d064f3449f /devtools
parent6297b563deedb5c7c9d2f135c02bc4c1214aacf4 (diff)
downloadUXP-a549e0c4a3aceedacd3bd70f9df9629cac57f0c4.tar
UXP-a549e0c4a3aceedacd3bd70f9df9629cac57f0c4.tar.gz
UXP-a549e0c4a3aceedacd3bd70f9df9629cac57f0c4.tar.lz
UXP-a549e0c4a3aceedacd3bd70f9df9629cac57f0c4.tar.xz
UXP-a549e0c4a3aceedacd3bd70f9df9629cac57f0c4.zip
Build nsJSInspector regardless of devtools
Diffstat (limited to 'devtools')
-rw-r--r--devtools/moz.build7
-rw-r--r--devtools/server/moz.build12
-rw-r--r--devtools/shared/jsinspector/moz.build17
-rw-r--r--devtools/shared/jsinspector/nsIJSInspector.idl (renamed from devtools/server/nsIJSInspector.idl)0
-rw-r--r--devtools/shared/jsinspector/nsJSInspector.cpp (renamed from devtools/server/nsJSInspector.cpp)0
-rw-r--r--devtools/shared/jsinspector/nsJSInspector.h (renamed from devtools/server/nsJSInspector.h)0
-rw-r--r--devtools/shared/moz.build1
7 files changed, 23 insertions, 14 deletions
diff --git a/devtools/moz.build b/devtools/moz.build
index dd9f90c5a..e6bcdd00d 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -13,11 +13,14 @@ if CONFIG['MOZ_DEVTOOLS_SERVER']:
'shared',
]
else:
- DIRS += ['shared/heapsnapshot/']
+ DIRS += [
+ 'shared/heapsnapshot',
+ 'shared/jsinspector',
+ ]
# /browser uses DIST_SUBDIR. We opt-in to this treatment when building
# DevTools for the browser to keep the root omni.ja slim for use by external XUL
# apps. Mulet also uses this since it includes /browser.
-if CONFIG['MOZ_BUILD_APP'] == 'b2g/dev' or CONFIG['MOZ_PHOENIX']:
+if CONFIG['MOZ_PHOENIX']:
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
diff --git a/devtools/server/moz.build b/devtools/server/moz.build
index 383505fe2..e4a6d2051 100644
--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -16,18 +16,6 @@ BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-XPIDL_SOURCES += [
- 'nsIJSInspector.idl',
-]
-
-XPIDL_MODULE = 'jsinspector'
-
-SOURCES += [
- 'nsJSInspector.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-
DevToolsModules(
'child.js',
'content-globals.js',
diff --git a/devtools/shared/jsinspector/moz.build b/devtools/shared/jsinspector/moz.build
new file mode 100644
index 000000000..fc81f7e1e
--- /dev/null
+++ b/devtools/shared/jsinspector/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; 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/.
+
+XPIDL_SOURCES += [
+ 'nsIJSInspector.idl',
+]
+
+XPIDL_MODULE = 'jsinspector'
+
+SOURCES += [
+ 'nsJSInspector.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
diff --git a/devtools/server/nsIJSInspector.idl b/devtools/shared/jsinspector/nsIJSInspector.idl
index 40ad49523..40ad49523 100644
--- a/devtools/server/nsIJSInspector.idl
+++ b/devtools/shared/jsinspector/nsIJSInspector.idl
diff --git a/devtools/server/nsJSInspector.cpp b/devtools/shared/jsinspector/nsJSInspector.cpp
index 6d717af5b..6d717af5b 100644
--- a/devtools/server/nsJSInspector.cpp
+++ b/devtools/shared/jsinspector/nsJSInspector.cpp
diff --git a/devtools/server/nsJSInspector.h b/devtools/shared/jsinspector/nsJSInspector.h
index 4e60b0428..4e60b0428 100644
--- a/devtools/server/nsJSInspector.h
+++ b/devtools/shared/jsinspector/nsJSInspector.h
diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build
index e4de1d84a..6c61206dd 100644
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -17,6 +17,7 @@ DIRS += [
'heapsnapshot',
'inspector',
'jsbeautify',
+ 'jsinspector',
'layout',
'locales',
'node-properties',