Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #3781, use custom python executeable if PYTHON_BIN defined

This commit is contained in:
lihex 2014-02-10 12:50:23 +08:00
parent 1fbde6d8d5
commit b06d54f706
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/tojs/genbindings.py
View File

@ -13,18 +13,31 @@ import re
from contextlib import contextmanager from contextlib import contextmanager
def _check_environment_variables(): def _check_ndk_root_env():
''' Checking the environment NDK_ROOT, which will be used for building ''' Checking the environment NDK_ROOT, which will be used for building
''' '''
try: try:
NDK_ROOT = os.environ['NDK_ROOT'] NDK_ROOT = os.environ['NDK_ROOT']
except Exception: except Exception:
print "NDK_ROOT not defined. Please define NDK_ROOT in your environment" print "NDK_ROOT not defined. Please define NDK_ROOT in your environment."
sys.exit(1) sys.exit(1)
return NDK_ROOT return NDK_ROOT
def _check_python_bin_env():
''' Checking the environment PYTHON_BIN, which will be used for building
'''
try:
PYTHON_BIN = os.environ['PYTHON_BIN']
except Exception:
print "PYTHON_BIN not defined, use current python."
PYTHON_BIN = sys.executable
return PYTHON_BIN
class CmdError(Exception): class CmdError(Exception):
pass pass
@ -46,9 +59,10 @@ def main():
cur_platform= '??' cur_platform= '??'
llvm_path = '??' llvm_path = '??'
ndk_root = _check_environment_variables() ndk_root = _check_ndk_root_env()
# del the " in the path # del the " in the path
ndk_root = re.sub(r"\"", "", ndk_root) ndk_root = re.sub(r"\"", "", ndk_root)
python_bin = _check_python_bin_env()
platform = sys.platform platform = sys.platform
if platform == 'win32': if platform == 'win32':
@ -116,7 +130,6 @@ def main():
'cocos2dx_spine.ini' : ('cocos2dx_spine', 'jsb_cocos2dx_spine_auto'), \ 'cocos2dx_spine.ini' : ('cocos2dx_spine', 'jsb_cocos2dx_spine_auto'), \
} }
target = 'spidermonkey' target = 'spidermonkey'
python_bin = sys.executable
generator_py = '%s/generator.py' % cxx_generator_root generator_py = '%s/generator.py' % cxx_generator_root
for key in cmd_args.keys(): for key in cmd_args.keys():
args = cmd_args[key] args = cmd_args[key]

21
tools/tolua/genbindings.py
View File

@ -13,18 +13,31 @@ import re
from contextlib import contextmanager from contextlib import contextmanager
def _check_environment_variables(): def _check_ndk_root_env():
''' Checking the environment NDK_ROOT, which will be used for building ''' Checking the environment NDK_ROOT, which will be used for building
''' '''
try: try:
NDK_ROOT = os.environ['NDK_ROOT'] NDK_ROOT = os.environ['NDK_ROOT']
except Exception: except Exception:
print "NDK_ROOT not defined. Please define NDK_ROOT in your environment" print "NDK_ROOT not defined. Please define NDK_ROOT in your environment."
sys.exit(1) sys.exit(1)
return NDK_ROOT return NDK_ROOT
def _check_python_bin_env():
''' Checking the environment PYTHON_BIN, which will be used for building
'''
try:
PYTHON_BIN = os.environ['PYTHON_BIN']
except Exception:
print "PYTHON_BIN not defined, use current python."
PYTHON_BIN = sys.executable
return PYTHON_BIN
class CmdError(Exception): class CmdError(Exception):
pass pass
@ -46,9 +59,10 @@ def main():
cur_platform= '??' cur_platform= '??'
llvm_path = '??' llvm_path = '??'
ndk_root = _check_environment_variables() ndk_root = _check_ndk_root_env()
# del the " in the path # del the " in the path
ndk_root = re.sub(r"\"", "", ndk_root) ndk_root = re.sub(r"\"", "", ndk_root)
python_bin = _check_python_bin_env()
platform = sys.platform platform = sys.platform
if platform == 'win32': if platform == 'win32':
@ -116,7 +130,6 @@ def main():
'cocos2dx_physics.ini' : ('cocos2dx_physics', 'lua_cocos2dx_physics_auto'), \ 'cocos2dx_physics.ini' : ('cocos2dx_physics', 'lua_cocos2dx_physics_auto'), \
} }
target = 'lua' target = 'lua'
python_bin = sys.executable
generator_py = '%s/generator.py' % cxx_generator_root generator_py = '%s/generator.py' % cxx_generator_root
for key in cmd_args.keys(): for key in cmd_args.keys():
args = cmd_args[key] args = cmd_args[key]