From 1e0a998d13085d06eb5db0818a89d19b4a885ccd Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 20 Oct 2010 13:01:04 +0000 Subject: 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) ........ --- Mac/BuildScript/build-installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 8c44020..b18465a 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 -- cgit v0.12