diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-09-22 12:12:25 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-09-22 12:12:25 -0700 |
commit | 5c1d87ef5e3220b529733d2f983f0c64b3809de6 (patch) | |
tree | 2125da793f380e032ee54025835084ef9d8e80e5 /tools/shared.py | |
parent | a3e03954ae5a57cfad6cae7a1c364260c75cd2ea (diff) |
move settings.py to a less conspicuous place and rename it, to avoid confusion
Diffstat (limited to 'tools/shared.py')
-rw-r--r-- | tools/shared.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index 24e6b707..8adff34a 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -20,7 +20,7 @@ if '\n' in EM_CONFIG: else: CONFIG_FILE = os.path.expanduser(EM_CONFIG) if not os.path.exists(CONFIG_FILE): - shutil.copy(path_from_root('settings.py'), CONFIG_FILE) + shutil.copy(path_from_root('tools', 'settings_template_readonly.py'), CONFIG_FILE) print >> sys.stderr, ''' ============================================================================== Welcome to Emscripten! @@ -103,7 +103,7 @@ def check_sanity(force=False): try: 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. You need to define JAVA in ~/.emscripten (see settings.py)' + 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' 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) |