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)
........

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 8c4402025941db35faf60d8420edbdd7889e19f2..b18465aa6648462a5853fc067282060790016d2a 100755 (executable)
--- 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