Skip to content

Commit b49fad3

Browse files
author
minggo
committed
Merge pull request cocos2d#165 from natural-law/develop
If the engine path has spaces, there will be error when compiling scripts.
2 parents 1a71fe7 + af7b822 commit b49fad3

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

plugins/plugin_jscompile/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ def compile_js(self, jsfile, output_file):
114114
cocos.Logging.debug("compiling js (%s) to bytecode..." % jsfile)
115115
jsbcc_exe_path = os.path.join(self._workingdir, "bin", "jsbcc");
116116

117-
self._run_cmd(jsbcc_exe_path + " " + jsfile+" "+output_file)
117+
cmd_str = "\"%s\" \"%s\" \"%s\"" % (jsbcc_exe_path, jsfile, output_file)
118+
self._run_cmd(cmd_str)
118119

119120
def compress_js(self):
120121
"""
@@ -126,7 +127,7 @@ def compress_js(self):
126127
jsfiles = jsfiles + " --js ".join(self._js_files[src_dir]) + " "
127128

128129
compiler_jar_path = os.path.join(self._workingdir, "bin", "compiler.jar")
129-
command = "java -jar %s %s --js %s --js_output_file %s" % (compiler_jar_path, self._closure_params, jsfiles, self._compressed_js_path)
130+
command = "java -jar \"%s\" %s --js %s --js_output_file \"%s\"" % (compiler_jar_path, self._closure_params, jsfiles, self._compressed_js_path)
130131
self._run_cmd(command)
131132

132133
def deep_iterate_dir(self, rootDir):

plugins/plugin_luacompile/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ def compile_lua(self, lua_file, output_file):
187187
cocos.Logging.debug("compiling lua (%s) to bytecode..." % lua_file)
188188

189189
with cocos.pushd(self._luajit_dir):
190-
self._run_cmd(self._luajit_exe_path + " -b " + lua_file+ " " + output_file)
190+
cmd_str = "\"%s\" -b \"%s\" \"%s\"" % (self._luajit_exe_path, lua_file, output_file)
191+
self._run_cmd(cmd_str)
191192

192193
# TODO
193194
# def compress_js(self):

plugins/project_compile/project_compile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def compile_scripts(self, src_dir, dst_dir):
326326
cocos_cmd_path = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "cocos")
327327
if self._project._is_lua_project():
328328
rm_ext = ".lua"
329-
compile_cmd = "%s luacompile -s \"%s\" -d \"%s\"" % (cocos_cmd_path, src_dir, dst_dir)
329+
compile_cmd = "\"%s\" luacompile -s \"%s\" -d \"%s\"" % (cocos_cmd_path, src_dir, dst_dir)
330330
if self._lua_encrypt:
331331
add_para = ""
332332
if self._lua_encrypt_key is not None:
@@ -338,7 +338,7 @@ def compile_scripts(self, src_dir, dst_dir):
338338
compile_cmd = "%s -e %s" % (compile_cmd, add_para)
339339
elif self._project._is_js_project():
340340
rm_ext = ".js"
341-
compile_cmd = "%s jscompile -s \"%s\" -d \"%s\"" % (cocos_cmd_path, src_dir, dst_dir)
341+
compile_cmd = "\"%s\" jscompile -s \"%s\" -d \"%s\"" % (cocos_cmd_path, src_dir, dst_dir)
342342

343343
# run compile command
344344
self._run_cmd(compile_cmd)
@@ -584,7 +584,7 @@ def build_ios(self):
584584
"%s" % "-arch i386" if self.use_sdk == 'iphonesimulator' else '',
585585
"-sdk",
586586
"%s" % self.use_sdk,
587-
"CONFIGURATION_BUILD_DIR=%s" % (output_dir),
587+
"CONFIGURATION_BUILD_DIR=\"%s\"" % (output_dir),
588588
"%s" % "VALID_ARCHS=\"i386\"" if self.use_sdk == 'iphonesimulator' else ''
589589
])
590590

@@ -706,7 +706,7 @@ def build_mac(self):
706706
"%s" % 'Debug' if self._mode == 'debug' else 'Release',
707707
"-target",
708708
"\"%s\"" % targetName,
709-
"CONFIGURATION_BUILD_DIR=%s" % (output_dir)
709+
"CONFIGURATION_BUILD_DIR=\"%s\"" % (output_dir)
710710
])
711711

712712
self._run_cmd(command)

0 commit comments

Comments
 (0)