From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 20 Oct 2010 12:56:56 +0000 (+0000)
Subject: Don't lie about the supported architectures in the OSX installer
X-Git-Tag: v3.2a4~412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0103292f052d3d5735d5b2d0a2307b02b75b8c3;p=thirdparty%2FPython%2Fcpython.git

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 e1263087fc61..9ddfda989af5 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -866,7 +866,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