aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authormax99x <max99x@gmail.com>2011-07-07 10:38:35 +0300
committermax99x <max99x@gmail.com>2011-07-07 12:24:09 +0300
commit7dcdb044d329babc697363eb1652d8e65f17c699 (patch)
treeb523f3eedaea0e89bce0f03bc0b0b1d8cee07c18 /tools/shared.py
parentd94b2423aef4593ce2b07725e992b7eb25d5f34c (diff)
Rewrite of emscripten.py:
* Uses option arguments instead of positional ones. * Allows linking to dlmalloc. * Accepts both .bc and .ll files and takes care of annotations. * Allows running the LLVM optimization pass automatically. * Updated test runner to use the new emscripten.py interface. Refactoring: * Moved settings.py to root folder. It no longer applies just to tests. * Updated references to settings.py. * Added an __init__.py to tools, so we don't have to hack around imports.
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/shared.py b/tools/shared.py
index c172a322..ca18d790 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -1,10 +1,9 @@
-
-import shutil, time
+import shutil, time, os
from subprocess import Popen, PIPE, STDOUT
CONFIG_FILE = os.path.expanduser('~/.emscripten')
if not os.path.exists(CONFIG_FILE):
- shutil.copy(path_from_root('tests', 'settings.py'), CONFIG_FILE)
+ shutil.copy(path_from_root('settings.py'), CONFIG_FILE)
exec(open(CONFIG_FILE, 'r').read())
# Tools
@@ -67,4 +66,3 @@ def line_splitter(data):
def limit_size(string, MAX=80*20):
if len(string) < MAX: return string
return string[0:MAX] + '...'
-