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

Merge pull request #7421 from darkdukey/fix_setup_script 

Fix setup.py can't resolve symlink
This commit is contained in:
minggo 2014-07-12 20:17:57 +08:00
parent 7a8f52ab82 85b2029b3f
commit c371eb0b9d
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
setup.py
View File

@ -218,7 +218,7 @@ class SetEnvVar(object):
return ret
def _find_environment_variable(self, var):
print(" ->Find environment variable %s..." % var)
print(" ->Search for environment variable %s..." % var)
ret = None
try:
ret = os.environ[var]
@ -529,49 +529,31 @@ class SetEnvVar(object):
return ret
def _get_ant_path(self):
print(" ->Find command ant in system...")
ret = None
if not self._isWindows():
import commands
state, result = commands.getstatusoutput("which ant")
if state == 0:
ret = os.path.dirname(result)
if ret is not None:
print(" ->Path \"%s\" was found\n" % ret)
else:
print(" ->Command ant not found\n")
return ret
return self._get_sdkpath_for_cmd("ant", False)
def _get_androidsdk_path(self):
print(" ->Find command android in system...")
ret = None
if not self._isWindows():
import commands
state, result = commands.getstatusoutput("which android")
if state == 0:
ret = os.path.dirname(result)
if ret is not None:
ret = os.path.abspath(os.path.join(ret,os.pardir))
print(" ->Path \"%s\" was found\n" % ret)
else:
print(" ->Command android not found\n")
return ret
return self._get_sdkpath_for_cmd("android")
def _get_ndkbuild_path(self):
print(" ->Find command ndk-build in system...")
return self._get_sdkpath_for_cmd("ndk-build", False)
def _get_sdkpath_for_cmd(self, cmd, has_bin_folder=True):
ret = None
print(" ->Search for command " + cmd + " in system...")
if not self._isWindows():
import commands
state, result = commands.getstatusoutput("which ndk-build")
state, result = commands.getstatusoutput("which " + cmd)
if state == 0:
ret = os.path.dirname(result)
ret = os.path.realpath(result)
ret = os.path.dirname(ret)
# Use parent folder if has_bin_folder was set
if has_bin_folder:
ret = os.path.dirname(ret)
if ret is not None:
print(" ->Path \"%s\" was found\n" % ret)
print(" ->Path " + ret + " was found\n")
else:
print(" ->Command ndk-build not found\n")
print(" ->Command " + ret + " not found\n")
return ret
def _find_value_from_sys(self, var_name):