diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-09-02 11:41:14 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-09-02 11:41:14 -0700 |
| commit | e9a8ed85db9f445a107e147493751feb477cfd5a (patch) | |
| tree | 75bb3749e438b8f26c10f51220a534f41f34e3a7 | |
| parent | f27b4df94e2cf18c76143d8d6b47de2be354dcc6 (diff) | |
| parent | 65423e7b73fa7f164a36b65059ac86890462cf7c (diff) | |
Merge pull request #555 from nuisanceofcats/incoming
More sensible default emscripten settings that can be overriden with env...
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | settings.py | 11 |
2 files changed, 7 insertions, 5 deletions
@@ -32,3 +32,4 @@ a license to everyone to use it as detailed in LICENSE.) * Xingxing Pan <forandom@gmail.com> * Justin Kerk <dopefishjustin@gmail.com> * Andrea Bedini <andrea.bedini@gmail.com> +* James Pike <totoro.friend@chilon.net> diff --git a/settings.py b/settings.py index 1133a656..bb749945 100644 --- a/settings.py +++ b/settings.py @@ -2,14 +2,15 @@ # IMPORTANT: Edit the *copy* with the right paths! # Note: If you put paths relative to the home directory, do not forget os.path.expanduser -EMSCRIPTEN_ROOT = os.path.expanduser('~/Dev/emscripten') # this helps projects using emscripten find it - -LLVM_ROOT = os.path.expanduser('~/Dev/llvm/cbuild/bin') +# this helps projects using emscripten find it +EMSCRIPTEN_ROOT = os.path.expanduser(os.getenv('EMSCRIPTEN') or '/opt/emscripten') +LLVM_ROOT = os.path.expanduser(os.getenv('LLVM') or '/usr/bin') # See below for notes on which JS engine(s) you need NODE_JS = 'node' -SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n'] -V8_ENGINE = os.path.expanduser('~/Dev/v8/d8') +SPIDERMONKEY_ENGINE = [ + os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js'), '-m', '-n'] +V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8') JAVA = 'java' |