5 files changed, 22 insertions, 18 deletions
diff --git a/devtools/client/sourceeditor/tern/def.js b/devtools/client/sourceeditor/tern/def.js
index 71f6e7991..f4a7ba9c8 100755
--- a/devtools/client/sourceeditor/tern/def.js
+++ b/devtools/client/sourceeditor/tern/def.js
@@ -77,7 +77,8 @@
       }
     },
     word: function(re) {
-      var word = "", ch, re = re || /[\w$]/;
+      var word = "", ch;
+      re = re || /[\w$]/;
       while ((ch = this.spec.charAt(this.pos)) && re.test(ch)) { word += ch; ++this.pos; }
       return word;
     },
@@ -187,7 +188,7 @@
         if (top && this.forceNew) return new infer.Obj(base);
         return infer.getInstance(base);
       } else if (this.eat(":")) {
-        var name = this.word(/[\w$\.]/)
+        name = this.word(/[\w$\.]/)
         return infer.getSymbol(name)
       } else if (comp && this.eat("!")) {
         var arg = this.word(/\d/);
diff --git a/devtools/moz.build b/devtools/moz.build
index 8e368facb..dd9f90c5a 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -7,11 +7,13 @@
 if CONFIG['MOZ_DEVTOOLS']:
     DIRS += ['client']
 
-
-DIRS += [
-    'server',
-    'shared',
-]
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += [
+        'server',
+        'shared',
+    ]
+else:
+  DIRS += ['shared/heapsnapshot/']
 
 # /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
diff --git a/devtools/server/child.js b/devtools/server/child.js
index e2838f08d..c69b0a3fb 100644
--- a/devtools/server/child.js
+++ b/devtools/server/child.js
@@ -61,7 +61,7 @@ try {
       try {
         m = require(module);
 
-        if (!setupChild in m) {
+        if (!(setupChild in m)) {
           dumpn(`ERROR: module '${module}' does not export '${setupChild}'`);
           return false;
         }
diff --git a/devtools/server/main.js b/devtools/server/main.js
index 475995493..ac76adb83 100644
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -1040,7 +1040,7 @@ var DebuggerServer = {
       try {
         m = require(module);
 
-        if (!setupParent in m) {
+        if (!(setupParent in m)) {
           dumpn(`ERROR: module '${module}' does not export '${setupParent}'`);
           return false;
         }
diff --git a/devtools/shared/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build
index d020da727..fa9ef3915 100644
--- a/devtools/shared/heapsnapshot/moz.build
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -48,15 +48,16 @@ DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
 FINAL_LIBRARY = 'xul'
 
-DevToolsModules(
-    'census-tree-node.js',
-    'CensusUtils.js',
-    'DominatorTreeNode.js',
-    'HeapAnalysesClient.js',
-    'HeapAnalysesWorker.js',
-    'HeapSnapshotFileUtils.js',
-    'shortest-paths.js',
-)
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DevToolsModules(
+        'census-tree-node.js',
+        'CensusUtils.js',
+        'DominatorTreeNode.js',
+        'HeapAnalysesClient.js',
+        'HeapAnalysesWorker.js',
+        'HeapSnapshotFileUtils.js',
+        'shortest-paths.js',
+    )
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']