Merged revisions 80655 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80655 | ronald.oussoren | 2010-04-30 17:00:26 +0200 (Fri, 30 Apr 2010) | 9 lines Merged revisions 80653 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80653 | ronald.oussoren | 2010-04-30 16:58:39 +0200 (Fri, 30 Apr 2010) | 2 lines Fix for issue 8476 ........ ................
This commit is contained in:
parent
c03342c667
commit
72a8b7d22d
|
@ -1111,13 +1111,14 @@ def setIcon(filePath, icnsPath):
|
|||
Set the custom icon for the specified file or directory.
|
||||
"""
|
||||
|
||||
toolPath = os.path.join(os.path.dirname(__file__), "seticon.app/Contents/MacOS/seticon")
|
||||
dirPath = os.path.dirname(__file__)
|
||||
dirPath = os.path.normpath(os.path.dirname(__file__))
|
||||
toolPath = os.path.join(dirPath, "seticon.app/Contents/MacOS/seticon")
|
||||
if not os.path.exists(toolPath) or os.stat(toolPath).st_mtime < os.stat(dirPath + '/seticon.m').st_mtime:
|
||||
# NOTE: The tool is created inside an .app bundle, otherwise it won't work due
|
||||
# to connections to the window server.
|
||||
if not os.path.exists('seticon.app/Contents/MacOS'):
|
||||
os.makedirs('seticon.app/Contents/MacOS')
|
||||
appPath = os.path.join(dirPath, "seticon.app/Contents/MacOS")
|
||||
if not os.path.exists(appPath):
|
||||
os.makedirs(appPath)
|
||||
runCommand("cc -o %s %s/seticon.m -framework Cocoa"%(
|
||||
shellQuote(toolPath), shellQuote(dirPath)))
|
||||
|
||||
|
|
Loading…
Reference in New Issue