diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:42:53 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:42:53 (GMT) |
| commit | 3564c4622fb5c3bb654bafd8b0169a7244c3f39c (patch) | |
| tree | 2a6e3b7e7cbc4df9b9668a9c15d593a8c9b05166 | |
| parent | 43fd99c8f83868285422e277c7b4d7265102d41a (diff) | |
| download | cpython-3564c4622fb5c3bb654bafd8b0169a7244c3f39c.zip cpython-3564c4622fb5c3bb654bafd8b0169a7244c3f39c.tar.gz cpython-3564c4622fb5c3bb654bafd8b0169a7244c3f39c.tar.bz2 | |
Port of revision 51902 in release25-maint to the trunk
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 1 | ||||
| -rw-r--r-- | Mac/Tools/fixapplepython23.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 083209b..a581814 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -945,6 +945,7 @@ def setIcon(filePath, icnsPath): ref, isDirectory = Carbon.File.FSPathMakeRef(filePath) if isDirectory: + return tmpPath = os.path.join(filePath, "Icon\r") if not os.path.exists(tmpPath): fp = open(tmpPath, 'w') diff --git a/Mac/Tools/fixapplepython23.py b/Mac/Tools/fixapplepython23.py index fb8645a..6ba5401 100644 --- a/Mac/Tools/fixapplepython23.py +++ b/Mac/Tools/fixapplepython23.py @@ -123,7 +123,8 @@ def main(): makescript(GXX_SCRIPT, "g++") # Finally fix the makefile rv = fix(MAKEFILE, do_apply) - sys.exit(rv) + #sys.exit(rv) + sys.exit(0) if __name__ == '__main__': main() |