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

Merge pull request #5594 from minggo/install 

check validation of ndk_root
This commit is contained in:
minggo 2014-03-06 17:20:40 +08:00
parent 461cfeb702 8f7a4ba64a
commit 0bc0bbce01
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
setup.py
View File

@ -152,6 +152,13 @@ class SetEnvVar(object):
self.variable_found_in_env = False self.variable_found_in_env = False
return False return False
def _check_validation_ndk_root(self):
ndk_build = os.path.join(self.ndk_root, 'ndk-build')
if os.path.isfile(ndk_build):
return True
else:
return False
def _get_ndk_root(self): def _get_ndk_root(self):
if not self._find_environment_variable(NDK_ROOT): if not self._find_environment_variable(NDK_ROOT):
@ -173,7 +180,7 @@ class SetEnvVar(object):
label_content = """ label_content = """
Please select path for NDK_ROOT. NDK is needed to develop Android native application. Please select path for NDK_ROOT. NDK is needed to develop Android native application.
More information of NDK please refer to https://developer.android.com/tools/sdk/ndk/index.html. More information of NDK please refer to https://developer.android.com/tools/sdk/ndk/index.html.
You can skip to it now without problem. But you will need it later to build the game for Android. You can skip it now without problem. But you will need it later to build the game for Android.
""" """
Tkinter.Label(root, text=label_content).pack() Tkinter.Label(root, text=label_content).pack()
@ -209,10 +216,14 @@ You can skip to it now without problem. But you will need it later to build the
ndk_root_selected = self._get_ndk_root() ndk_root_selected = self._get_ndk_root()
if self.ndk_root: if self.ndk_root:
os.environ[NDK_ROOT] = self.ndk_root if self._check_validation_ndk_root():
self._set_environment_variable(NDK_ROOT, self.ndk_root) os.environ[NDK_ROOT] = self.ndk_root
ndk_root_updated = True self._set_environment_variable(NDK_ROOT, self.ndk_root)
print 'OK' ndk_root_updated = True
print 'OK'
else:
ndk_root_updated = False
print '\nWarning: %s is not a valid path of NDK_ROOT, skip it' % self.ndk_root
else: else:
ndk_root_updated = False ndk_root_updated = False
if not ndk_root_selected: if not ndk_root_selected: