traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround for bug #1558983 

There is an issue with custom icons on directories in the 2.5c2 installer,
don't set a custom icon on "/Applications/MacPython 2.5" for now.

Also make sure that the installer doesn't crap out when the Makefile in the
system's python installation has other customizations than we expect.
This commit is contained in:
Ronald Oussoren 2006-09-17 18:40:15 +00:00
parent 137c789e83
commit 736fc567b2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mac/BuildScript/build-installer.py
View File

@ -945,6 +945,10 @@ def setIcon(filePath, icnsPath):
ref, isDirectory = Carbon.File.FSPathMakeRef(filePath) ref, isDirectory = Carbon.File.FSPathMakeRef(filePath)
if isDirectory: if isDirectory:
# There is a problem with getting this into the pax(1) archive,
# just ignore directory icons for now.
return
tmpPath = os.path.join(filePath, "Icon\r") tmpPath = os.path.join(filePath, "Icon\r")
if not os.path.exists(tmpPath): if not os.path.exists(tmpPath):
fp = open(tmpPath, 'w') fp = open(tmpPath, 'w')

3
Mac/Tools/fixapplepython23.py
View File

@ -123,7 +123,8 @@ def main():
makescript(GXX_SCRIPT, "g++") makescript(GXX_SCRIPT, "g++")
# Finally fix the makefile # Finally fix the makefile
rv = fix(MAKEFILE, do_apply) rv = fix(MAKEFILE, do_apply)
sys.exit(rv) #sys.exit(rv)
sys.exit(0)
if __name__ == '__main__': if __name__ == '__main__':
main() main()