Bug 786743 - Disable JS minification for debug builds.

js/src/Makefile.in

@@ -809,9 +809,13 @@ selfhosted_out_h_deps := \
   $(srcdir)/builtin/js2c.py \
   $(srcdir)/builtin/embedjs.py
 
+ifeq ($(MOZ_DEBUG),1)
+selfhosting_embed_flags += -d
+endif
+
 selfhosted.out.h: $(selfhosted_out_h_deps)
-	$(PYTHON) $(srcdir)/builtin/embedjs.py $@ $(srcdir)/js.msg \
-	  $(srcdir)/builtin/macros.py $(selfhosting_srcs)
+	$(PYTHON) $(srcdir)/builtin/embedjs.py $(selfhosting_embed_flags) $@ \
+	  $(srcdir)/js.msg $(srcdir)/builtin/macros.py $(selfhosting_srcs)
 
 ###############################################
 # BEGIN kludges for the Nitro assembler

js/src/builtin/embedjs.py

@@ -36,13 +36,16 @@ def replaceMessages(line, messages):
     return line
 
 def main():
+    debug = sys.argv[1] == '-d'
+    if debug:
+        sys.argv.pop(1)
     output_file = sys.argv[1]
     messages_file = sys.argv[2]
     macros_file = sys.argv[3]
     source_files = sys.argv[4:]
     combined_file = 'combined.js'
     replaceErrorMsgs(source_files, messages_file, combined_file)
-    js2c.JS2C([combined_file, macros_file], [output_file], { 'TYPE': 'CORE', 'COMPRESSION': 'off' })
+    js2c.JS2C([combined_file, macros_file], [output_file], { 'TYPE': 'CORE', 'COMPRESSION': 'off', 'DEBUG':debug })
     os.remove(combined_file)
 
 if __name__ == "__main__":

js/src/builtin/js2c.py

@@ -278,7 +278,8 @@ def JS2C(source, target, env):
     lines = ExpandConstants(lines, consts)
     lines = ExpandMacros(lines, macros)
     Validate(lines, filename)
-    lines = minifier.JSMinify(lines)
+    if not env['DEBUG']:
+      lines = minifier.JSMinify(lines)
     id = (os.path.split(filename)[1])[:-3]
     if debugger: id = id[:-9]
     raw_length = len(lines)