Fixed instrumenting to work with node

Author: tj

instrument-js.cpp

@@ -1392,20 +1392,7 @@ void jscoverage_instrument_js(const char * id, const uint16_t * characters, size
 
   /* write line number info to the output */
   Stream_write_string(output, "/* automatically generated by JSCoverage - do not edit */\n");
-  if (jscoverage_mozilla) {
-    Stream_write_string(output, "try {\n");
-    Stream_write_string(output, "  Components.utils.import('resource://gre/modules/jscoverage.jsm');\n");
-    Stream_printf(output, "  dump('%s: successfully imported jscoverage module\\n');\n", id);
-    Stream_write_string(output, "}\n");
-    Stream_write_string(output, "catch (e) {\n");
-    Stream_write_string(output, "  _$jscoverage = {};\n");
-    Stream_printf(output, "  dump('%s: failed to import jscoverage module - coverage not available for this file\\n');\n", id);
-    Stream_write_string(output, "}\n");
-  }
-  else {
-    Stream_write_string(output, "if (! top._$jscoverage) {\n  top._$jscoverage = {};\n}\n");
-    Stream_write_string(output, "var _$jscoverage = top._$jscoverage;\n");
-  }
+	Stream_write_string(output, "if (typeof _$jscoverage === 'undefined') _$jscoverage = {};\n");
   Stream_printf(output, "if (! _$jscoverage['%s']) {\n", file_id);
   Stream_printf(output, "  _$jscoverage['%s'] = [];\n", file_id);
   for (int i = 0; i < num_lines; i++) {

instrument.c

@@ -186,24 +186,9 @@ void jscoverage_instrument(const char * source,
 
   /* copy the resources */
   if (jscoverage_mozilla) {
-    char * chrome_directory = make_path(destination, "chrome");
     char * jscoverage_chrome_directory = make_path(chrome_directory, "jscoverage");
     mkdirs(jscoverage_chrome_directory);
-    copy_resource("jscoverage.manifest", chrome_directory);
-    copy_resource("jscoverage.html", jscoverage_chrome_directory);
-    copy_resource("jscoverage.css", jscoverage_chrome_directory);
-    copy_resource("jscoverage.js", jscoverage_chrome_directory);
-    copy_resource("jscoverage-throbber.gif", jscoverage_chrome_directory);
-    copy_resource("jscoverage-highlight.css", jscoverage_chrome_directory);
-    copy_resource("jscoverage.xul", jscoverage_chrome_directory);
-    copy_resource("jscoverage-overlay.js", jscoverage_chrome_directory);
     free(jscoverage_chrome_directory);
-    free(chrome_directory);
-
-    char * modules_directory = make_path(destination, "modules");
-    mkdirs(modules_directory);
-    copy_resource("jscoverage.jsm", modules_directory);
-    free(modules_directory);
   }
   else {
     jscoverage_copy_resources(destination);