diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/file_packager.py | 4 | ||||
| -rw-r--r-- | tools/shared.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py index 9861e330..33ccebad 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -40,7 +40,7 @@ TODO: You can also provide .crn files yourself, pre-crunched. With this o ''' import os, sys, shutil, random, uuid, ctypes - +import posixpath import shared from shared import Compression, execute, suffix, unsuffixed from subprocess import Popen, PIPE, STDOUT @@ -217,7 +217,7 @@ for file_ in data_files: if file_['dstpath'].endswith('/'): # If user has submitted a directory name as the destination but omitted the destination filename, use the filename from source file file_['dstpath'] = file_['dstpath'] + os.path.basename(file_['srcpath']) # make destination path always relative to the root - file_['dstpath'] = os.path.normpath(os.path.join('/', file_['dstpath'])) + file_['dstpath'] = posixpath.normpath(os.path.join('/', file_['dstpath'])) if DEBUG: print >> sys.stderr, 'Packaging file "' + file_['srcpath'] + '" to VFS in path "' + file_['dstpath'] + '".' diff --git a/tools/shared.py b/tools/shared.py index b3689c88..37d568e7 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -290,7 +290,7 @@ def check_node_version(): # we re-check sanity when the settings are changed) # We also re-check sanity and clear the cache when the version changes -EMSCRIPTEN_VERSION = '1.5.3' +EMSCRIPTEN_VERSION = '1.5.5' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT |