fixes for using node as both compiler engine and code running engine. node is now default in settings.py

1 files changed, 16 insertions, 15 deletions

diff --git a/settings.py b/settings.py
index b294f8bd..82297db5 100644
--- a/settings.py
+++ b/settings.py
@@ -1,27 +1,28 @@
 # This file will be copied to ~/.emscripten if that file doesn't exist.
 # IMPORTANT: Edit it with the right paths!
 
-EMSCRIPTEN_ROOT=os.path.expanduser("~/Dev/emscripten") # TODO: Use this
-
-TEMP_DIR='/tmp'
-
 LLVM_ROOT=os.path.expanduser('~/Dev/llvm-3.0/cbuild/bin')
 
-COMPILER_OPTS = []
-
-SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n']
-V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')]
 NODE_JS = 'node'
+SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n'] # optional, but recommended
+V8_ENGINE = os.path.expanduser('~/Dev/v8/d8') # optional (mostly unneeded if you have node)
 
-#COMPILER_ENGINE=SPIDERMONKEY_ENGINE
-COMPILER_ENGINE=V8_ENGINE
-#COMPILER_ENGINE=[NODE_JS]
+CLOSURE_COMPILER = os.path.expanduser('~/Dev/closure-compiler/compiler.jar') # optional (needed for the benchmarks)
 
-JS_ENGINE=V8_ENGINE
+TEMP_DIR='/tmp'
+
+########################################################################################################
 
-TIMEOUT = None
+# Pick the JS engine to use for running the compiler. Any of the three will work. This engine
+# must exist, or nothing can be compiled.
+
+COMPILER_ENGINE=NODE_JS
+#COMPILER_ENGINE=SPIDERMONKEY_ENGINE
+#COMPILER_ENGINE=V8_ENGINE
 
-# Tools
+# JS engines to use when running the automatic tests. Modify this to include all
+# the JS engines you have installed. Not all these engines must exist, if they do not,
+# they will be skipped in the test runner.
 
-CLOSURE_COMPILER = os.path.expanduser('~/Dev/closure-compiler/compiler.jar')
+JS_ENGINES=[NODE_JS, SPIDERMONKEY_ENGINE]