diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-08-09 10:20:13 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-09 10:20:13 -0700 |
| commit | dc3761167e3d518785611ab8405e462c138ed0d2 (patch) | |
| tree | 9517d550ba0b2a22f07023c077befab3b699dd01 | |
| parent | 4c8be1a462006db29ade93dc5093aab5374e56d8 (diff) | |
| parent | db911f46e14421b6f7807ab3179d3b078212347b (diff) | |
Merge pull request #1490 from juj/incoming
Fix file packager on Windows.
| -rw-r--r-- | tools/file_packager.py | 4 |
1 files changed, 2 insertions, 2 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'] + '".' |