aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-05-28 09:58:08 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-05-28 09:58:08 -0700
commita8db0c66afa1a348c2d26b290faaf7b3420d7dbc (patch)
tree71700e4ba034483367eedfd3240b079932e5bc06 /tools/shared.py
parent712bc9041e3470920d0db6a05e5b0af85d1b78e2 (diff)
require JAVA definition in ~/.emscripten
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 69343cc2..30de8685 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -81,9 +81,9 @@ def check_sanity(force=False):
sys.exit(0)
try:
- subprocess.call(['java', '-version'], stdout=PIPE, stderr=PIPE)
+ subprocess.call([JAVA, '-version'], stdout=PIPE, stderr=PIPE)
except:
- print >> sys.stderr, 'WARNING: java does not seem to exist, required for closure compiler. -O2 and above will fail.'
+ print >> sys.stderr, 'WARNING: java does not seem to exist, required for closure compiler. -O2 and above will fail. You need to define JAVA in ~/.emscripten (see settings.py)'
if not os.path.exists(CLOSURE_COMPILER):
print >> sys.stderr, 'WARNING: Closure compiler (%s) does not exist, check the paths in %s. -O2 and above will fail' % (CLOSURE_COMPILER, EM_CONFIG)
@@ -830,7 +830,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
# Something like this (adjust memory as needed):
# java -Xmx1024m -jar CLOSURE_COMPILER --compilation_level ADVANCED_OPTIMIZATIONS --variable_map_output_file src.cpp.o.js.vars --js src.cpp.o.js --js_output_file src.cpp.o.cc.js
- args = ['java',
+ args = [JAVA,
'-Xmx1024m',
'-jar', CLOSURE_COMPILER,
'--compilation_level', 'ADVANCED_OPTIMIZATIONS',