[Python-checkins] r85743 - in python/branches/release27-maint: Mac/BuildScript/build-installer.py

Wed Oct 20 15:01:04 CEST 2010

Author: ronald.oussoren
Date: Wed Oct 20 15:01:04 2010
New Revision: 85743
Log:
Merged revisions 85742 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r85742 | ronald.oussoren | 2010年10月20日 14:56:56 +0200 (2010年10月20日) | 8 lines
 
 Don't lie about the supported architectures in the OSX installer
 
 Without this patch the i386/x86_64 installer for OSX 10.6
 lies in the ReadMe file and the "Important Information" screen
 of the installer (that is, the installer claims it supports
 the i386 and ppc architectures insetead of the ones it really
 supports)
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Mac/BuildScript/build-installer.py
Modified: python/branches/release27-maint/Mac/BuildScript/build-installer.py
==============================================================================

--- python/branches/release27-maint/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/release27-maint/Mac/BuildScript/build-installer.py	Wed Oct 20 15:01:04 2010
@@ -854,7 +854,7 @@
 data = data.replace('$FULL_VERSION', getFullVersion())
 data = data.replace('$VERSION', getVersion())
 data = data.replace('$MACOSX_DEPLOYMENT_TARGET', ''.join((DEPTARGET, ' or later')))
- data = data.replace('$ARCHITECTURES', "i386, ppc")
+ data = data.replace('$ARCHITECTURES', ", ".join(universal_opts_map[UNIVERSALARCHS]))
 data = data.replace('$INSTALL_SIZE', installSize())
 
 # This one is not handy as a template variable
