From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Fri, 30 Apr 2010 14:59:42 +0000 (+0000)
Subject: Merged revisions 80653 via svnmerge from
X-Git-Tag: v2.6.6rc1~379
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=309bf3beb377951a36ddb522152e619b6da2302b;p=python

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
........
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 0d0a9b7278..277bd6fd4b 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1093,13 +1093,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)))