TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for Windows build when "." is not explicitly on the PATH

Browse Source
This commit is contained in:
David Rose 2013-01-26 02:00:49 +00:00
parent cdbd54c9be
commit 2c1dcdb7b4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makepanda/makepandacore.py
View File

@ -410,11 +410,18 @@ def LocateBinary(binary):
else: else:
p = os.environ["PATH"] p = os.environ["PATH"]
pathList = p.split(os.pathsep)
if GetHost() == 'windows':
if not binary.endswith('.exe'):
# Append .exe if necessary # Append .exe if necessary
if GetHost() == 'windows' and not binary.endswith('.exe'):
binary += '.exe' binary += '.exe'
for path in p.split(os.pathsep): # On Windows the current directory is always implicitly
# searched before anything else on PATH.
pathList = ['.'] + pathList
for path in pathList:
binpath = os.path.join(os.path.expanduser(path), binary) binpath = os.path.join(os.path.expanduser(path), binary)
if os.access(binpath, os.X_OK): if os.access(binpath, os.X_OK):
return os.path.abspath(os.path.realpath(binpath)) return os.path.abspath(os.path.realpath(binpath))