summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-10-20 13:01:04 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2010-10-20 13:01:04 +0000
commit4f4ad6fe9de930e927e0b2dc18af82b53ab02497 (patch)
treea7df6932236984f2c3612643006df84f8a3468fc
parent7e76743e9ba64ff3498083be66d1652711935e2d (diff)
downloadcpython-4f4ad6fe9de930e927e0b2dc18af82b53ab02497.tar.gz
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 (Wed, 20 Oct 2010) | 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) ........
-rwxr-xr-xMac/BuildScript/build-installer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 8c44020259..b18465aa66 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -854,7 +854,7 @@ def patchFile(inPath, outPath):
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