aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xem++1
-rwxr-xr-xem-config11
-rwxr-xr-xemar7
-rw-r--r--emcc.py2
-rwxr-xr-xemmake3
-rwxr-xr-xemranlib1
-rwxr-xr-xemscons6
7 files changed, 19 insertions, 12 deletions
diff --git a/em++ b/em++
index 1af8b7e4..ba09e1a2 100755
--- a/em++
+++ b/em++
@@ -9,3 +9,4 @@ from tools import shared
os.environ['EMMAKEN_CXX'] = '1'
exit(subprocess.call([shared.PYTHON, shared.EMCC] + sys.argv[1:]))
+
diff --git a/em-config b/em-config
index 324cf691..785b04e5 100755
--- a/em-config
+++ b/em-config
@@ -5,7 +5,7 @@ This is a helper tool which is designed to make it possible
for other apps to read emscripten's configuration variables
in a unified way. Usage:
- em-config VAR_NAME
+ em-config VAR_NAME
This tool prints the value of the variable to stdout if one
is found, or exits with 1 if the variable does not exist.
@@ -15,9 +15,10 @@ import os, sys, re
from tools import shared
if len(sys.argv) != 2 or \
- not re.match(r"^[\w\W_][\w\W_\d]*$", sys.argv[1]) or \
- not (sys.argv[1] in dir(shared)):
- print 'Usage: em-config VAR_NAME'
- exit(1)
+ not re.match(r"^[\w\W_][\w\W_\d]*$", sys.argv[1]) or \
+ not (sys.argv[1] in dir(shared)):
+ print 'Usage: em-config VAR_NAME'
+ exit(1)
print eval('shared.' + sys.argv[1])
+
diff --git a/emar b/emar
index 50803f99..5646f444 100755
--- a/emar
+++ b/emar
@@ -12,12 +12,13 @@ from tools import shared
DEBUG = os.environ.get('EMCC_DEBUG')
if DEBUG == "0":
- DEBUG = None
+ DEBUG = None
newargs = [shared.LLVM_AR] + sys.argv[1:]
if DEBUG:
- print >> sys.stderr, 'emar:', sys.argv, ' ==> ', newargs
+ print >> sys.stderr, 'emar:', sys.argv, ' ==> ', newargs
if len(newargs) > 2:
- subprocess.call(newargs)
+ subprocess.call(newargs)
+
diff --git a/emcc.py b/emcc.py
index bf0c9808..2c715b99 100644
--- a/emcc.py
+++ b/emcc.py
@@ -1,3 +1,5 @@
+
# necessary to work around process pool limitations on windows - the js optimizer will end up trying to import this. see issue 663
import tools.js_optimizer
+
diff --git a/emmake b/emmake
index d6dc9c93..e8f34f41 100755
--- a/emmake
+++ b/emmake
@@ -4,7 +4,7 @@
This is a helper script. It runs make for you, setting
the environment variables to use emcc and so forth. Usage:
- emmake make [FLAGS]
+ emmake make [FLAGS]
Note that if you ran configure with emconfigure, then
the environment variables have already been detected
@@ -26,3 +26,4 @@ try:
shared.Building.make(sys.argv[1:])
except CalledProcessError, e:
sys.exit(e.returncode)
+
diff --git a/emranlib b/emranlib
index 0ccce8ed..35cb44c9 100755
--- a/emranlib
+++ b/emranlib
@@ -6,3 +6,4 @@ emcc - ranlib helper script
This script acts as a frontend replacement for ranlib. See emcc.
'''
+
diff --git a/emscons b/emscons
index ed11a517..2666f18c 100755
--- a/emscons
+++ b/emscons
@@ -4,9 +4,8 @@
Wrapping the scons invocation, EMSCRIPTEN_TOOL_PATH is set in the process
environment, and can be used to locate the emscripten SCons Tool.
Example:
-
- # Load emscripten Tool
- my_env = Environment(tools=['emscripten'], toolpath=[os.environ['EMSCRIPTEN_TOOL_PATH']])
+# Load emscripten Tool
+my_env = Environment(tools=['emscripten'], toolpath=[os.environ['EMSCRIPTEN_TOOL_PATH']])
'''
import os, subprocess, sys
@@ -18,3 +17,4 @@ env = os.environ.copy()
env[ 'EMSCRIPTEN_TOOL_PATH' ] = tool_path
exit(subprocess.call(sys.argv[1:], env=env))
+