cpython-lru_cache-weakref: Mac/BuildScript/build-installer.py annotate

annotate Mac/BuildScript/build-installer.py @ 84007:dbfbdf2b5c19 3.3

Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted.

author	Senthil Kumaran <senthil@uthcode.com>
date	Sat, 01 Jun 2013 08:27:06 -0700
parents	6e6a76166c47
children	c57d99a8fc42 3ffd9a270e14

rev	line source
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1 #!/usr/bin/env python
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	2 """
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	3 This script is used to build "official" universal installers on Mac OS X.
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	4 It requires at least Mac OS X 10.5, Xcode 3, and the 10.4u SDK for
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	5 32-bit builds. 64-bit or four-way universal builds require at least
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	6 OS X 10.5 and the 10.5 SDK.
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	7
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	8 Please ensure that this script keeps working with Python 2.5, to avoid
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	9 bootstrap issues (/usr/bin/python is Python 2.5 on OSX 10.5). Sphinx,
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	10 which is used to build the documentation, currently requires at least
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	11 Python 2.4.
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	12
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	13 In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	14 requires an installed version of hg and a third-party version of
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	15 Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	16 (for 10.6 or later) installed in /Library/Frameworks. When installed,
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	17 the Python built by this script will attempt to dynamically link first to
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	18 Tcl and Tk frameworks in /Library/Frameworks if available otherwise fall
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	19 back to the ones in /System/Library/Framework. For the build, we recommend
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	20 installing the most recent ActiveTcl 8.4 or 8.5 version.
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	21
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	22 32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	23 and the installation of additional components, such as a newer Python
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	24 (2.5 is needed for Python parser updates), hg, and svn (for the documentation
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	25 build).
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	26
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	27 Usage: see USAGE variable in the script.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	28 """
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	29 import platform, os, sys, getopt, textwrap, shutil, stat, time, pwd, grp
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	30 try:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	31 import urllib2 as urllib_request
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	32 except ImportError:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	33 import urllib.request as urllib_request
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	34
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	35 STAT_0o755 = ( stat.S_IRUSR \| stat.S_IWUSR \| stat.S_IXUSR
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	36 \| stat.S_IRGRP \| stat.S_IXGRP
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	37 \| stat.S_IROTH \| stat.S_IXOTH )
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	38
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	39 STAT_0o775 = ( stat.S_IRUSR \| stat.S_IWUSR \| stat.S_IXUSR
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	40 \| stat.S_IRGRP \| stat.S_IWGRP \| stat.S_IXGRP
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	41 \| stat.S_IROTH \| stat.S_IXOTH )
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	42
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	43 INCLUDE_TIMESTAMP = 1
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	44 VERBOSE = 1
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	45
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	46 from plistlib import Plist
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	47
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	48 try:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	49 from plistlib import writePlist
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	50 except ImportError:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	51 # We're run using python2.3
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	52 def writePlist(plist, path):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	53 plist.write(path)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	54
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	55 def shellQuote(value):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	56 """
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	57 Return the string value in a form that can safely be inserted into
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	58 a shell command.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	59 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	60 return "'%s'"%(value.replace("'", "'\"'\"'"))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	61
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	62 def grepValue(fn, variable):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	63 variable = variable + '='
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	64 for ln in open(fn, 'r'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	65 if ln.startswith(variable):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	66 value = ln[len(variable):].strip()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	67 return value[1:-1]
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	68 raise RuntimeError("Cannot find variable %s" % variable[:-1])
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	69
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	70 _cache_getVersion = None
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	71
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	72 def getVersion():
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	73 global _cache_getVersion
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	74 if _cache_getVersion is None:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	75 _cache_getVersion = grepValue(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	76 os.path.join(SRCDIR, 'configure'), 'PACKAGE_VERSION')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	77 return _cache_getVersion
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	78
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	79 def getVersionTuple():
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	80 return tuple([int(n) for n in getVersion().split('.')])
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	81
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	82 def getVersionMajorMinor():
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	83 return tuple([int(n) for n in getVersion().split('.', 2)])
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	84
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	85 _cache_getFullVersion = None
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	86
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	87 def getFullVersion():
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	88 global _cache_getFullVersion
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	89 if _cache_getFullVersion is not None:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	90 return _cache_getFullVersion
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	91 fn = os.path.join(SRCDIR, 'Include', 'patchlevel.h')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	92 for ln in open(fn):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	93 if 'PY_VERSION' in ln:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	94 _cache_getFullVersion = ln.split()[-1][1:-1]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	95 return _cache_getFullVersion
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	96 raise RuntimeError("Cannot find full version??")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	97
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	98 # The directory we'll use to create the build (will be erased and recreated)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	99 WORKDIR = "/tmp/_py"
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	100
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	101 # The directory we'll use to store third-party sources. Set this to something
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	102 # else if you don't want to re-fetch required libraries every time.
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	103 DEPSRC = os.path.join(WORKDIR, 'third-party')
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	104 DEPSRC = os.path.expanduser('~/Universal/other-sources')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	105
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	106 # Location of the preferred SDK
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	107
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	108 ### There are some issues with the SDK selection below here,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	109 ### The resulting binary doesn't work on all platforms that
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	110 ### it should. Always default to the 10.4u SDK until that
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	111 ### isue is resolved.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	112 ###
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	113 ##if int(os.uname()[2].split('.')[0]) == 8:
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	114 ## # Explicitly use the 10.4u (universal) SDK when
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	115 ## # building on 10.4, the system headers are not
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	116 ## # useable for a universal build
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	117 ## SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	118 ##else:
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	119 ## SDKPATH = "/"
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	120
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	121 SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	122
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	123 universal_opts_map = { '32-bit': ('i386', 'ppc',),
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	124 '64-bit': ('x86_64', 'ppc64',),
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	125 'intel': ('i386', 'x86_64'),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	126 '3-way': ('ppc', 'i386', 'x86_64'),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	127 'all': ('i386', 'ppc', 'x86_64', 'ppc64',) }
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	128 default_target_map = {
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	129 '64-bit': '10.5',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	130 '3-way': '10.5',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	131 'intel': '10.5',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	132 'all': '10.5',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	133 }
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	134
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	135 UNIVERSALOPTS = tuple(universal_opts_map.keys())
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	136
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	137 UNIVERSALARCHS = '32-bit'
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	138
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	139 ARCHLIST = universal_opts_map[UNIVERSALARCHS]
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	140
68488 0991b40e895d #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 61121 diff changeset	141 # Source directory (assume we're in Mac/BuildScript)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	142 SRCDIR = os.path.dirname(
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	143 os.path.dirname(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	144 os.path.dirname(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	145 os.path.abspath(__file__
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	146 ))))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	147
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	148 # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	149 DEPTARGET = '10.3'
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	150
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	151 target_cc_map = {
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	152 '10.3': ('gcc-4.0', 'g++-4.0'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	153 '10.4': ('gcc-4.0', 'g++-4.0'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	154 '10.5': ('gcc-4.2', 'g++-4.2'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	155 '10.6': ('gcc-4.2', 'g++-4.2'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	156 '10.7': ('clang', 'clang++'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	157 '10.8': ('clang', 'clang++'),
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	158 }
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	159
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	160 CC, CXX = target_cc_map[DEPTARGET]
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	161
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	162 PYTHON_3 = getVersionTuple() >= (3, 0)
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	163
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	164 USAGE = textwrap.dedent("""\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	165 Usage: build_python [options]
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	166
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	167 Options:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	168 -? or -h: Show this message
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	169 -b DIR
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	170 --build-dir=DIR: Create build here (default: %(WORKDIR)r)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	171 --third-party=DIR: Store third-party sources here (default: %(DEPSRC)r)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	172 --sdk-path=DIR: Location of the SDK (default: %(SDKPATH)r)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	173 --src-dir=DIR: Location of the Python sources (default: %(SRCDIR)r)
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	174 --dep-target=10.n OS X deployment target (default: %(DEPTARGET)r)
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	175 --universal-archs=x universal architectures (options: %(UNIVERSALOPTS)r, default: %(UNIVERSALARCHS)r)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	176 """)% globals()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	177
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	178 # Dict of object file names with shared library names to check after building.
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	179 # This is to ensure that we ended up dynamically linking with the shared
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	180 # library paths and versions we expected. For example:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	181 # EXPECTED_SHARED_LIBS['_tkinter.so'] = [
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	182 # '/Library/Frameworks/Tcl.framework/Versions/8.5/Tcl',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	183 # '/Library/Frameworks/Tk.framework/Versions/8.5/Tk']
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	184 EXPECTED_SHARED_LIBS = {}
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	185
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	186 # Instructions for building libraries that are necessary for building a
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	187 # batteries included python.
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	188 # [The recipes are defined here for convenience but instantiated later after
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	189 # command line options have been processed.]
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	190 def library_recipes():
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	191 result = []
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	192
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	193 LT_10_5 = bool(DEPTARGET < '10.5')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	194
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	195 if getVersionTuple() >= (3, 3):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	196 result.extend([
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	197 dict(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	198 name="XZ 5.0.3",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	199 url="http://tukaani.org/xz/xz-5.0.3.tar.gz",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	200 checksum='fefe52f9ecd521de2a8ce38c21a27574',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	201 configure_pre=[
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	202 '--disable-dependency-tracking',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	203 ]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	204 ),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	205 ])
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	206
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	207 result.extend([
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	208 dict(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	209 name="NCurses 5.9",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	210 url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	211 checksum='8cb9c412e5f2d96bc6f459aa8c6282a1',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	212 configure_pre=[
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	213 "--enable-widec",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	214 "--without-cxx",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	215 "--without-cxx-binding",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	216 "--without-ada",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	217 "--without-curses-h",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	218 "--enable-shared",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	219 "--with-shared",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	220 "--without-debug",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	221 "--without-normal",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	222 "--without-tests",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	223 "--without-manpages",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	224 "--datadir=/usr/share",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	225 "--sysconfdir=/etc",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	226 "--sharedstatedir=/usr/com",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	227 "--with-terminfo-dirs=/usr/share/terminfo",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	228 "--with-default-terminfo-dir=/usr/share/terminfo",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	229 "--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib"%(getVersion(),),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	230 ],
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	231 patchscripts=[
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	232 ("ftp://invisible-island.net/ncurses//5.9/ncurses-5.9-20120616-patch.sh.bz2",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	233 "f54bf02a349f96a7c4f0d00922f3a0d4"),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	234 ],
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	235 useLDFlags=False,
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	236 install='make && make install DESTDIR=%s && cd %s/usr/local/lib && ln -fs ../../../Library/Frameworks/Python.framework/Versions/%s/lib/lib* .'%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	237 shellQuote(os.path.join(WORKDIR, 'libraries')),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	238 shellQuote(os.path.join(WORKDIR, 'libraries')),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	239 getVersion(),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	240 ),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	241 ),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	242 dict(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	243 name="SQLite 3.7.13",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	244 url="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz",
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	245 checksum='c97df403e8a3d5b67bb408fcd6aabd8e',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	246 extra_cflags=('-Os '
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	247 '-DSQLITE_ENABLE_FTS4 '
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	248 '-DSQLITE_ENABLE_FTS3_PARENTHESIS '
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	249 '-DSQLITE_ENABLE_RTREE '
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	250 '-DSQLITE_TCL=0 '
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	251 '%s' % ('','-DSQLITE_WITHOUT_ZONEMALLOC ')[LT_10_5]),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	252 configure_pre=[
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	253 '--enable-threadsafe',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	254 '--enable-shared=no',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	255 '--enable-static=yes',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	256 '--disable-readline',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	257 '--disable-dependency-tracking',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	258 ]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	259 ),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	260 ])
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	261
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	262 if DEPTARGET < '10.5':
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	263 result.extend([
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	264 dict(
67598 48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	265 name="Bzip2 1.0.6",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	266 url="http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	267 checksum='00b516f4704d4a7cb50a1d97e6e8e15b',
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	268 configure=None,
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	269 install='make install CC=%s CXX=%s, PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	270 CC, CXX,
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	271 shellQuote(os.path.join(WORKDIR, 'libraries')),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	272 ' -arch '.join(ARCHLIST),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	273 SDKPATH,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	274 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	275 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	276 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	277 name="ZLib 1.2.3",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	278 url="http://www.gzip.org/zlib/zlib-1.2.3.tar.gz",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	279 checksum='debc62758716a169df9f62e6ab2bc634',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	280 configure=None,
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	281 install='make install CC=%s CXX=%s, prefix=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	282 CC, CXX,
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	283 shellQuote(os.path.join(WORKDIR, 'libraries')),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	284 ' -arch '.join(ARCHLIST),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	285 SDKPATH,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	286 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	287 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	288 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	289 # Note that GNU readline is GPL'd software
67598 48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	290 name="GNU Readline 6.1.2",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	291 url="http://ftp.gnu.org/pub/gnu/readline/readline-6.1.tar.gz" ,
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	292 checksum='fc2f7e714fe792db1ce6ddc4c9fb4ef3',
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	293 patchlevel='0',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	294 patches=[
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	295 # The readline maintainers don't do actual micro releases, but
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	296 # just ship a set of patches.
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	297 ('http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-001',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	298 'c642f2e84d820884b0bf9fd176bc6c3f'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	299 ('http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-002',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	300 '1a76781a1ea734e831588285db7ec9b1'),
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	301 ]
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	302 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	303 ])
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	304
67598 48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	305 if not PYTHON_3:
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	306 result.extend([
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	307 dict(
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	308 name="Sleepycat DB 4.7.25",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	309 url="http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	310 checksum='ec2b87e833779681a0c3a814aa71359e',
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	311 buildDir="build_unix",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	312 configure="../dist/configure",
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	313 configure_pre=[
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	314 '--includedir=/usr/local/include/db4',
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	315 ]
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	316 ),
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	317 ])
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	318
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	319 return result
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	320
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	321
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	322 # Instructions for building packages inside the .mpkg.
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	323 def pkg_recipes():
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	324 unselected_for_python3 = ('selected', 'unselected')[PYTHON_3]
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	325 result = [
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	326 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	327 name="PythonFramework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	328 long_name="Python Framework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	329 source="/Library/Frameworks/Python.framework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	330 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	331 This package installs Python.framework, that is the python
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	332 interpreter and the standard library. This also includes Python
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	333 wrappers for lots of Mac OS X API's.
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	334 """,
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	335 postflight="scripts/postflight.framework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	336 selected='selected',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	337 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	338 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	339 name="PythonApplications",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	340 long_name="GUI Applications",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	341 source="/Applications/Python %(VER)s",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	342 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	343 This package installs IDLE (an interactive Python IDE),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	344 Python Launcher and Build Applet (create application bundles
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	345 from python scripts).
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	346
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	347 It also installs a number of examples and demos.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	348 """,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	349 required=False,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	350 selected='selected',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	351 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	352 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	353 name="PythonUnixTools",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	354 long_name="UNIX command-line tools",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	355 source="/usr/local/bin",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	356 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	357 This package installs the unix tools in /usr/local/bin for
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	358 compatibility with older releases of Python. This package
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	359 is not necessary to use Python.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	360 """,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	361 required=False,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	362 selected='selected',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	363 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	364 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	365 name="PythonDocumentation",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	366 long_name="Python Documentation",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	367 topdir="/Library/Frameworks/Python.framework/Versions/%(VER)s/Resources/English.lproj/Documentation",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	368 source="/pydocs",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	369 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	370 This package installs the python documentation at a location
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	371 that is useable for pydoc and IDLE.
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	372 """,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	373 postflight="scripts/postflight.documentation",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	374 required=False,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	375 selected='selected',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	376 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	377 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	378 name="PythonProfileChanges",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	379 long_name="Shell profile updater",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	380 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	381 This packages updates your shell profile to make sure that
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	382 the Python tools are found by your shell in preference of
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	383 the system provided Python tools.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	384
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	385 If you don't install this package you'll have to add
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	386 "/Library/Frameworks/Python.framework/Versions/%(VER)s/bin"
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	387 to your PATH by hand.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	388 """,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	389 postflight="scripts/postflight.patch-profile",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	390 topdir="/Library/Frameworks/Python.framework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	391 source="/empty-dir",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	392 required=False,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	393 selected=unselected_for_python3,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	394 ),
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	395 ]
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	396
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	397 if DEPTARGET < '10.4' and not PYTHON_3:
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	398 result.append(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	399 dict(
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	400 name="PythonSystemFixes",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	401 long_name="Fix system Python",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	402 readme="""\
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	403 This package updates the system python installation on
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	404 Mac OS X 10.3 to ensure that you can build new python extensions
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	405 using that copy of python after installing this version.
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	406 """,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	407 postflight="../Tools/fixapplepython23.py",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	408 topdir="/Library/Frameworks/Python.framework",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	409 source="/empty-dir",
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	410 required=False,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	411 selected=unselected_for_python3,
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	412 )
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	413 )
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	414 return result
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	415
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	416 def fatal(msg):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	417 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	418 A fatal error, bail out.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	419 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	420 sys.stderr.write('FATAL: ')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	421 sys.stderr.write(msg)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	422 sys.stderr.write('\n')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	423 sys.exit(1)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	424
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	425 def fileContents(fn):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	426 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	427 Return the contents of the named file
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	428 """
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	429 return open(fn, 'r').read()
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	430
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	431 def runCommand(commandline):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	432 """
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68488 diff changeset	433 Run a command and raise RuntimeError if it fails. Output is suppressed
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	434 unless the command fails.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	435 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	436 fd = os.popen(commandline, 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	437 data = fd.read()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	438 xit = fd.close()
46222 aed698c8647b Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 43102 diff changeset	439 if xit is not None:
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	440 sys.stdout.write(data)
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	441 raise RuntimeError("command failed: %s"%(commandline,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	442
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	443 if VERBOSE:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	444 sys.stdout.write(data); sys.stdout.flush()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	445
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	446 def captureCommand(commandline):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	447 fd = os.popen(commandline, 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	448 data = fd.read()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	449 xit = fd.close()
46222 aed698c8647b Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 43102 diff changeset	450 if xit is not None:
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	451 sys.stdout.write(data)
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	452 raise RuntimeError("command failed: %s"%(commandline,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	453
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	454 return data
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	455
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	456 def getTclTkVersion(configfile, versionline):
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	457 """
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	458 search Tcl or Tk configuration file for version line
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	459 """
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	460 try:
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	461 f = open(configfile, "r")
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	462 except:
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	463 fatal("Framework configuration file not found: %s" % configfile)
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	464
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	465 for l in f:
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	466 if l.startswith(versionline):
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	467 f.close()
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	468 return l
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	469
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	470 fatal("Version variable %s not found in framework configuration file: %s"
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	471 % (versionline, configfile))
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	472
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	473 def checkEnvironment():
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	474 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	475 Check that we're running on a supported system.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	476 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	477
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	478 if sys.version_info[0:2] < (2, 4):
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	479 fatal("This script must be run with Python 2.4 or later")
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	480
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	481 if platform.system() != 'Darwin':
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	482 fatal("This script should be run on a Mac OS X 10.4 (or later) system")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	483
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	484 if int(platform.release().split('.')[0]) < 8:
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	485 fatal("This script should be run on a Mac OS X 10.4 (or later) system")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	486
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	487 if not os.path.exists(SDKPATH):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	488 fatal("Please install the latest version of Xcode and the %s SDK"%(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	489 os.path.basename(SDKPATH[:-4])))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	490
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	491 # Because we only support dynamic load of only one major/minor version of
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	492 # Tcl/Tk, ensure:
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	493 # 1. there are no user-installed frameworks of Tcl/Tk with version
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	494 # higher than the Apple-supplied system version in
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	495 # SDKROOT/System/Library/Frameworks
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	496 # 2. there is a user-installed framework (usually ActiveTcl) in (or linked
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	497 # in) SDKROOT/Library/Frameworks with the same version as the system
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	498 # version. This allows users to choose to install a newer patch level.
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	499
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	500 frameworks = {}
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	501 for framework in ['Tcl', 'Tk']:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	502 fwpth = 'Library/Frameworks/%s.framework/Versions/Current' % framework
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	503 sysfw = os.path.join(SDKPATH, 'System', fwpth)
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	504 libfw = os.path.join(SDKPATH, fwpth)
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	505 usrfw = os.path.join(os.getenv('HOME'), fwpth)
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	506 frameworks[framework] = os.readlink(sysfw)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	507 if not os.path.exists(libfw):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	508 fatal("Please install a link to a current %s %s as %s so "
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	509 "the user can override the system framework."
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	510 % (framework, frameworks[framework], libfw))
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	511 if os.readlink(libfw) != os.readlink(sysfw):
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	512 fatal("Version of %s must match %s" % (libfw, sysfw) )
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	513 if os.path.exists(usrfw):
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	514 fatal("Please rename %s to avoid possible dynamic load issues."
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	515 % usrfw)
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	516
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	517 if frameworks['Tcl'] != frameworks['Tk']:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	518 fatal("The Tcl and Tk frameworks are not the same version.")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	519
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	520 # add files to check after build
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	521 EXPECTED_SHARED_LIBS['_tkinter.so'] = [
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	522 "/Library/Frameworks/Tcl.framework/Versions/%s/Tcl"
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	523 % frameworks['Tcl'],
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	524 "/Library/Frameworks/Tk.framework/Versions/%s/Tk"
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	525 % frameworks['Tk'],
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	526 ]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	527
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	528 # Remove inherited environment variables which might influence build
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	529 environ_var_prefixes = ['CPATH', 'C_INCLUDE_', 'DYLD_', 'LANG', 'LC_',
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	530 'LD_', 'LIBRARY_', 'PATH', 'PYTHON']
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	531 for ev in list(os.environ):
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	532 for prefix in environ_var_prefixes:
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	533 if ev.startswith(prefix) :
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	534 print("INFO: deleting environment variable %s=%s" % (
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	535 ev, os.environ[ev]))
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	536 del os.environ[ev]
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	537
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	538 base_path = '/bin:/sbin:/usr/bin:/usr/sbin'
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	539 if 'SDK_TOOLS_BIN' in os.environ:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	540 base_path = os.environ['SDK_TOOLS_BIN'] + ':' + base_path
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	541 # Xcode 2.5 on OS X 10.4 does not include SetFile in its usr/bin;
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	542 # add its fixed location here if it exists
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	543 OLD_DEVELOPER_TOOLS = '/Developer/Tools'
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	544 if os.path.isdir(OLD_DEVELOPER_TOOLS):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	545 base_path = base_path + ':' + OLD_DEVELOPER_TOOLS
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	546 os.environ['PATH'] = base_path
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	547 print("Setting default PATH: %s"%(os.environ['PATH']))
60740 8c9828c15040 Merged revisions 80232 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60692 diff changeset	548
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	549
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	550 def parseOptions(args=None):
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	551 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	552 Parse arguments and update global settings.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	553 """
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	554 global WORKDIR, DEPSRC, SDKPATH, SRCDIR, DEPTARGET
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	555 global UNIVERSALOPTS, UNIVERSALARCHS, ARCHLIST, CC, CXX
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	556
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	557 if args is None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	558 args = sys.argv[1:]
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	559
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	560 try:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	561 options, args = getopt.getopt(args, '?hb',
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	562 [ 'build-dir=', 'third-party=', 'sdk-path=' , 'src-dir=',
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	563 'dep-target=', 'universal-archs=', 'help' ])
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	564 except getopt.GetoptError:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	565 print(sys.exc_info()[1])
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	566 sys.exit(1)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	567
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	568 if args:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	569 print("Additional arguments")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	570 sys.exit(1)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	571
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	572 deptarget = None
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	573 for k, v in options:
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	574 if k in ('-h', '-?', '--help'):
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	575 print(USAGE)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	576 sys.exit(0)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	577
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	578 elif k in ('-d', '--build-dir'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	579 WORKDIR=v
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	580
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	581 elif k in ('--third-party',):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	582 DEPSRC=v
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	583
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	584 elif k in ('--sdk-path',):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	585 SDKPATH=v
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	586
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	587 elif k in ('--src-dir',):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	588 SRCDIR=v
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	589
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	590 elif k in ('--dep-target', ):
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	591 DEPTARGET=v
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	592 deptarget=v
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	593
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	594 elif k in ('--universal-archs', ):
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	595 if v in UNIVERSALOPTS:
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	596 UNIVERSALARCHS = v
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	597 ARCHLIST = universal_opts_map[UNIVERSALARCHS]
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	598 if deptarget is None:
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	599 # Select alternate default deployment
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	600 # target
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	601 DEPTARGET = default_target_map.get(v, '10.3')
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	602 else:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	603 raise NotImplementedError(v)
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	604
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	605 else:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	606 raise NotImplementedError(k)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	607
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	608 SRCDIR=os.path.abspath(SRCDIR)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	609 WORKDIR=os.path.abspath(WORKDIR)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	610 SDKPATH=os.path.abspath(SDKPATH)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	611 DEPSRC=os.path.abspath(DEPSRC)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	612
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	613 CC, CXX=target_cc_map[DEPTARGET]
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	614
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	615 print("Settings:")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	616 print(" * Source directory:", SRCDIR)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	617 print(" * Build directory: ", WORKDIR)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	618 print(" * SDK location: ", SDKPATH)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	619 print(" * Third-party source:", DEPSRC)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	620 print(" * Deployment target:", DEPTARGET)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	621 print(" * Universal architectures:", ARCHLIST)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	622 print(" * C compiler:", CC)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	623 print(" * C++ compiler:", CXX)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	624 print("")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	625
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	626
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	627
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	628
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	629 def extractArchive(builddir, archiveName):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	630 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	631 Extract a source archive into 'builddir'. Returns the path of the
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	632 extracted archive.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	633
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	634 XXX: This function assumes that archives contain a toplevel directory
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	635 that is has the same name as the basename of the archive. This is
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	636 save enough for anything we use.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	637 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	638 curdir = os.getcwd()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	639 try:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	640 os.chdir(builddir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	641 if archiveName.endswith('.tar.gz'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	642 retval = os.path.basename(archiveName[:-7])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	643 if os.path.exists(retval):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	644 shutil.rmtree(retval)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	645 fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	646
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	647 elif archiveName.endswith('.tar.bz2'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	648 retval = os.path.basename(archiveName[:-8])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	649 if os.path.exists(retval):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	650 shutil.rmtree(retval)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	651 fp = os.popen("tar jxf %s 2>&1"%(shellQuote(archiveName),), 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	652
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	653 elif archiveName.endswith('.tar'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	654 retval = os.path.basename(archiveName[:-4])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	655 if os.path.exists(retval):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	656 shutil.rmtree(retval)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	657 fp = os.popen("tar xf %s 2>&1"%(shellQuote(archiveName),), 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	658
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	659 elif archiveName.endswith('.zip'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	660 retval = os.path.basename(archiveName[:-4])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	661 if os.path.exists(retval):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	662 shutil.rmtree(retval)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	663 fp = os.popen("unzip %s 2>&1"%(shellQuote(archiveName),), 'r')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	664
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	665 data = fp.read()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	666 xit = fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	667 if xit is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	668 sys.stdout.write(data)
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	669 raise RuntimeError("Cannot extract %s"%(archiveName,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	670
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	671 return os.path.join(builddir, retval)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	672
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	673 finally:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	674 os.chdir(curdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	675
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	676 def downloadURL(url, fname):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	677 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	678 Download the contents of the url into the file.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	679 """
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	680 fpIn = urllib_request.urlopen(url)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	681 fpOut = open(fname, 'wb')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	682 block = fpIn.read(10240)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	683 try:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	684 while block:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	685 fpOut.write(block)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	686 block = fpIn.read(10240)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	687 fpIn.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	688 fpOut.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	689 except:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	690 try:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	691 os.unlink(fname)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	692 except:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	693 pass
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	694
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	695 def verifyThirdPartyFile(url, checksum, fname):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	696 """
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	697 Download file from url to filename fname if it does not already exist.
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	698 Abort if file contents does not match supplied md5 checksum.
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	699 """
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	700 name = os.path.basename(fname)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	701 if os.path.exists(fname):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	702 print("Using local copy of %s"%(name,))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	703 else:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	704 print("Did not find local copy of %s"%(name,))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	705 print("Downloading %s"%(name,))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	706 downloadURL(url, fname)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	707 print("Archive for %s stored as %s"%(name, fname))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	708 if os.system(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	709 'MD5=$(openssl md5 %s) ; test "${MD5##*= }" = "%s"'
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	710 % (shellQuote(fname), checksum) ):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	711 fatal('MD5 checksum mismatch for file %s' % fname)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	712
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	713 def buildRecipe(recipe, basedir, archList):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	714 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	715 Build software using a recipe. This function does the
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	716 'configure;make;make install' dance for C software, with a possibility
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	717 to customize this process, basically a poor-mans DarwinPorts.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	718 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	719 curdir = os.getcwd()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	720
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	721 name = recipe['name']
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	722 url = recipe['url']
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	723 configure = recipe.get('configure', './configure')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	724 install = recipe.get('install', 'make && make install DESTDIR=%s'%(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	725 shellQuote(basedir)))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	726
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	727 archiveName = os.path.split(url)[-1]
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	728 sourceArchive = os.path.join(DEPSRC, archiveName)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	729
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	730 if not os.path.exists(DEPSRC):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	731 os.mkdir(DEPSRC)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	732
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	733 verifyThirdPartyFile(url, recipe['checksum'], sourceArchive)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	734 print("Extracting archive for %s"%(name,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	735 buildDir=os.path.join(WORKDIR, '_bld')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	736 if not os.path.exists(buildDir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	737 os.mkdir(buildDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	738
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	739 workDir = extractArchive(buildDir, sourceArchive)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	740 os.chdir(workDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	741 if 'buildDir' in recipe:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	742 os.chdir(recipe['buildDir'])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	743
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	744 for patch in recipe.get('patches', ()):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	745 if isinstance(patch, tuple):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	746 url, checksum = patch
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	747 fn = os.path.join(DEPSRC, os.path.basename(url))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	748 verifyThirdPartyFile(url, checksum, fn)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	749 else:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	750 # patch is a file in the source directory
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	751 fn = os.path.join(curdir, patch)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	752 runCommand('patch -p%s < %s'%(recipe.get('patchlevel', 1),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	753 shellQuote(fn),))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	754
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	755 for patchscript in recipe.get('patchscripts', ()):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	756 if isinstance(patchscript, tuple):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	757 url, checksum = patchscript
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	758 fn = os.path.join(DEPSRC, os.path.basename(url))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	759 verifyThirdPartyFile(url, checksum, fn)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	760 else:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	761 # patch is a file in the source directory
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	762 fn = os.path.join(curdir, patchscript)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	763 if fn.endswith('.bz2'):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	764 runCommand('bunzip2 -fk %s' % shellQuote(fn))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	765 fn = fn[:-4]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	766 runCommand('sh %s' % shellQuote(fn))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	767 os.unlink(fn)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	768
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	769 if configure is not None:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	770 configure_args = [
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	771 "--prefix=/usr/local",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	772 "--enable-static",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	773 "--disable-shared",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	774 #"CPP=gcc -arch %s -E"%(' -arch '.join(archList,),),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	775 ]
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	776
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	777 if 'configure_pre' in recipe:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	778 args = list(recipe['configure_pre'])
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	779 if '--disable-static' in args:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	780 configure_args.remove('--enable-static')
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	781 if '--enable-shared' in args:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	782 configure_args.remove('--disable-shared')
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	783 configure_args.extend(args)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	784
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	785 if recipe.get('useLDFlags', 1):
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	786 configure_args.extend([
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	787 "CFLAGS=%s-mmacosx-version-min=%s -arch %s -isysroot %s "
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	788 "-I%s/usr/local/include"%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	789 recipe.get('extra_cflags', ''),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	790 DEPTARGET,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	791 ' -arch '.join(archList),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	792 shellQuote(SDKPATH)[1:-1],
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	793 shellQuote(basedir)[1:-1],),
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	794 "LDFLAGS=-mmacosx-version-min=%s -syslibroot,%s -L%s/usr/local/lib -arch %s"%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	795 DEPTARGET,
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	796 shellQuote(SDKPATH)[1:-1],
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	797 shellQuote(basedir)[1:-1],
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	798 ' -arch '.join(archList)),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	799 ])
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	800 else:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	801 configure_args.extend([
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	802 "CFLAGS=%s-mmacosx-version-min=%s -arch %s -isysroot %s "
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	803 "-I%s/usr/local/include"%(
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	804 recipe.get('extra_cflags', ''),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	805 DEPTARGET,
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	806 ' -arch '.join(archList),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	807 shellQuote(SDKPATH)[1:-1],
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	808 shellQuote(basedir)[1:-1],),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	809 ])
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	810
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	811 if 'configure_post' in recipe:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	812 configure_args = configure_args + list(recipe['configure_post'])
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	813
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	814 configure_args.insert(0, configure)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	815 configure_args = [ shellQuote(a) for a in configure_args ]
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	816
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	817 print("Running configure for %s"%(name,))
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	818 runCommand(' '.join(configure_args) + ' 2>&1')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	819
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	820 print("Running install for %s"%(name,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	821 runCommand('{ ' + install + ' ;} 2>&1')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	822
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	823 print("Done %s"%(name,))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	824 print("")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	825
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	826 os.chdir(curdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	827
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	828 def buildLibraries():
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	829 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	830 Build our dependencies into $WORKDIR/libraries/usr/local
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	831 """
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	832 print("")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	833 print("Building required libraries")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	834 print("")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	835 universal = os.path.join(WORKDIR, 'libraries')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	836 os.mkdir(universal)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	837 os.makedirs(os.path.join(universal, 'usr', 'local', 'lib'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	838 os.makedirs(os.path.join(universal, 'usr', 'local', 'include'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	839
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	840 for recipe in library_recipes():
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	841 buildRecipe(recipe, universal, ARCHLIST)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	842
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	843
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	844
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	845 def buildPythonDocs():
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	846 # This stores the documentation as Resources/English.lproj/Documentation
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	847 # inside the framwork. pydoc and IDLE will pick it up there.
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	848 print("Install python documentation")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	849 rootDir = os.path.join(WORKDIR, '_root')
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	850 buildDir = os.path.join('../../Doc')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	851 docdir = os.path.join(rootDir, 'pydocs')
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	852 curDir = os.getcwd()
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	853 os.chdir(buildDir)
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	854 runCommand('make update')
60861 3a8a6184f40a Merged revisions 80355 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 60740 diff changeset	855 runCommand("make html PYTHON='%s'" % os.path.abspath(sys.executable))
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	856 os.chdir(curDir)
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	857 if not os.path.exists(docdir):
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	858 os.mkdir(docdir)
54202 8f17363b93e6 MACOSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 52645 diff changeset	859 os.rename(os.path.join(buildDir, 'build', 'html'), docdir)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	860
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	861
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	862 def buildPython():
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	863 print("Building a universal python for %s architectures" % UNIVERSALARCHS)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	864
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	865 buildDir = os.path.join(WORKDIR, '_bld', 'python')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	866 rootDir = os.path.join(WORKDIR, '_root')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	867
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	868 if os.path.exists(buildDir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	869 shutil.rmtree(buildDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	870 if os.path.exists(rootDir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	871 shutil.rmtree(rootDir)
67598 48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	872 os.makedirs(buildDir)
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	873 os.makedirs(rootDir)
48454765d8e0 #10843: Update third-party library versions used in OS X 32-bit Ned Deily <nad@acm.org> parents: 66780 diff changeset	874 os.makedirs(os.path.join(rootDir, 'empty-dir'))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	875 curdir = os.getcwd()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	876 os.chdir(buildDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	877
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	878 # Not sure if this is still needed, the original build script
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	879 # claims that parts of the install assume python.exe exists.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	880 os.symlink('python', os.path.join(buildDir, 'python.exe'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	881
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	882 # Extract the version from the configure file, needed to calculate
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	883 # several paths.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	884 version = getVersion()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	885
52470 52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	886 # Since the extra libs are not in their installed framework location
52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	887 # during the build, augment the library path so that the interpreter
52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	888 # will find them during its extension import sanity checks.
52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	889 os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR,
52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	890 'libraries', 'usr', 'local', 'lib')
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	891 print("Running configure...")
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	892 runCommand("%s -C --enable-framework --enable-universalsdk=%s "
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	893 "--with-universal-archs=%s "
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	894 "%s "
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	895 "LDFLAGS='-g -L%s/libraries/usr/local/lib' "
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	896 "OPT='-g -O3 -I%s/libraries/usr/local/include' 2>&1"%(
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	897 shellQuote(os.path.join(SRCDIR, 'configure')), shellQuote(SDKPATH),
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	898 UNIVERSALARCHS,
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	899 (' ', '--with-computed-gotos ')[PYTHON_3],
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	900 shellQuote(WORKDIR)[1:-1],
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	901 shellQuote(WORKDIR)[1:-1]))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	902
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	903 print("Running make")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	904 runCommand("make")
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	905
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	906 print("Running make install")
54202 8f17363b93e6 MACOSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 52645 diff changeset	907 runCommand("make install DESTDIR=%s"%(
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	908 shellQuote(rootDir)))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	909
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	910 print("Running make frameworkinstallextras")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	911 runCommand("make frameworkinstallextras DESTDIR=%s"%(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	912 shellQuote(rootDir)))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	913
52470 52c36e450a48 Merged revisions 70746 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52462 diff changeset	914 del os.environ['DYLD_LIBRARY_PATH']
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	915 print("Copying required shared libraries")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	916 if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	917 runCommand("mv %s/* %s"%(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	918 shellQuote(os.path.join(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	919 WORKDIR, 'libraries', 'Library', 'Frameworks',
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	920 'Python.framework', 'Versions', getVersion(),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	921 'lib')),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	922 shellQuote(os.path.join(WORKDIR, '_root', 'Library', 'Frameworks',
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	923 'Python.framework', 'Versions', getVersion(),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	924 'lib'))))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	925
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	926 print("Fix file modes")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	927 frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework')
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	928 gid = grp.getgrnam('admin').gr_gid
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	929
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	930 shared_lib_error = False
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	931 for dirpath, dirnames, filenames in os.walk(frmDir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	932 for dn in dirnames:
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	933 os.chmod(os.path.join(dirpath, dn), STAT_0o775)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	934 os.chown(os.path.join(dirpath, dn), -1, gid)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	935
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	936 for fn in filenames:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	937 if os.path.islink(fn):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	938 continue
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	939
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	940 # "chmod g+w $fn"
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	941 p = os.path.join(dirpath, fn)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	942 st = os.stat(p)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	943 os.chmod(p, stat.S_IMODE(st.st_mode) \| stat.S_IWGRP)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	944 os.chown(p, -1, gid)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	945
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	946 if fn in EXPECTED_SHARED_LIBS:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	947 # check to see that this file was linked with the
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	948 # expected library path and version
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	949 data = captureCommand("otool -L %s" % shellQuote(p))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	950 for sl in EXPECTED_SHARED_LIBS[fn]:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	951 if ("\t%s " % sl) not in data:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	952 print("Expected shared lib %s was not linked with %s"
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	953 % (sl, p))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	954 shared_lib_error = True
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	955
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	956 if shared_lib_error:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	957 fatal("Unexpected shared library errors.")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	958
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	959 if PYTHON_3:
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	960 LDVERSION=None
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	961 VERSION=None
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	962 ABIFLAGS=None
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	963
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	964 fp = open(os.path.join(buildDir, 'Makefile'), 'r')
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	965 for ln in fp:
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	966 if ln.startswith('VERSION='):
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	967 VERSION=ln.split()[1]
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	968 if ln.startswith('ABIFLAGS='):
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	969 ABIFLAGS=ln.split()[1]
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	970 if ln.startswith('LDVERSION='):
50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	971 LDVERSION=ln.split()[1]
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	972 fp.close()
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	973
67799 334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	974 LDVERSION = LDVERSION.replace('$(VERSION)', VERSION)
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	975 LDVERSION = LDVERSION.replace('$(ABIFLAGS)', ABIFLAGS)
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	976 config_suffix = '-' + LDVERSION
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	977 else:
334812ba5874 Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with Ned Deily <nad@acm.org> parents: 67598 diff changeset	978 config_suffix = '' # Python 2.x
66780 50de9f1a6d54 Two small changes to adjust framework builds to the new stable ABI Ronald Oussoren <ronaldoussoren@mac.com> parents: 65555 diff changeset	979
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	980 # We added some directories to the search path during the configure
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	981 # phase. Remove those because those directories won't be there on
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	982 # the end-users system. Also remove the directories from _sysconfigdata.py
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	983 # (added in 3.3) if it exists.
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	984
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	985 path_to_lib = os.path.join(rootDir, 'Library', 'Frameworks',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	986 'Python.framework', 'Versions',
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	987 version, 'lib', 'python%s'%(version,))
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	988 paths = [os.path.join(path_to_lib, 'config' + config_suffix, 'Makefile'),
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	989 os.path.join(path_to_lib, '_sysconfigdata.py')]
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	990 for path in paths:
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	991 if not os.path.exists(path):
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	992 continue
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	993 fp = open(path, 'r')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	994 data = fp.read()
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	995 fp.close()
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	996
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	997 data = data.replace(' -L%s/libraries/usr/local/lib'%(WORKDIR,), '')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	998 data = data.replace(' -I%s/libraries/usr/local/include'%(WORKDIR,), '')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	999 fp = open(path, 'w')
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1000 fp.write(data)
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1001 fp.close()
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1002
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1003 # Add symlinks in /usr/local/bin, using relative links
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1004 usr_local_bin = os.path.join(rootDir, 'usr', 'local', 'bin')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1005 to_framework = os.path.join('..', '..', '..', 'Library', 'Frameworks',
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1006 'Python.framework', 'Versions', version, 'bin')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1007 if os.path.exists(usr_local_bin):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1008 shutil.rmtree(usr_local_bin)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1009 os.makedirs(usr_local_bin)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1010 for fn in os.listdir(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1011 os.path.join(frmDir, 'Versions', version, 'bin')):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1012 os.symlink(os.path.join(to_framework, fn),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1013 os.path.join(usr_local_bin, fn))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1014
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1015 os.chdir(curdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1016
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1017 if PYTHON_3:
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1018 # Remove the 'Current' link, that way we don't accidently mess
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1019 # with an already installed version of python 2
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1020 os.unlink(os.path.join(rootDir, 'Library', 'Frameworks',
acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1021 'Python.framework', 'Versions', 'Current'))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1022
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1023 def patchFile(inPath, outPath):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1024 data = fileContents(inPath)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1025 data = data.replace('$FULL_VERSION', getFullVersion())
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1026 data = data.replace('$VERSION', getVersion())
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1027 data = data.replace('$MACOSX_DEPLOYMENT_TARGET', ''.join((DEPTARGET, ' or later')))
65555 3baecd4e0c12 Don't lie about the supported architectures in the OSX installer Ronald Oussoren <ronaldoussoren@mac.com> parents: 61121 diff changeset	1028 data = data.replace('$ARCHITECTURES', ", ".join(universal_opts_map[UNIVERSALARCHS]))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1029 data = data.replace('$INSTALL_SIZE', installSize())
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1030
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1031 # This one is not handy as a template variable
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1032 data = data.replace('$PYTHONFRAMEWORKINSTALLDIR', '/Library/Frameworks/Python.framework')
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1033 fp = open(outPath, 'w')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1034 fp.write(data)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1035 fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1036
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1037 def patchScript(inPath, outPath):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1038 data = fileContents(inPath)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1039 data = data.replace('@PYVER@', getVersion())
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1040 fp = open(outPath, 'w')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1041 fp.write(data)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1042 fp.close()
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1043 os.chmod(outPath, STAT_0o755)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1044
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1045
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1046
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1047 def packageFromRecipe(targetDir, recipe):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1048 curdir = os.getcwd()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1049 try:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1050 # The major version (such as 2.5) is included in the package name
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1051 # because having two version of python installed at the same time is
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1052 # common.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1053 pkgname = '%s-%s'%(recipe['name'], getVersion())
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1054 srcdir = recipe.get('source')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1055 pkgroot = recipe.get('topdir', srcdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1056 postflight = recipe.get('postflight')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1057 readme = textwrap.dedent(recipe['readme'])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1058 isRequired = recipe.get('required', True)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1059
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1060 print("- building package %s"%(pkgname,))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1061
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1062 # Substitute some variables
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1063 textvars = dict(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1064 VER=getVersion(),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1065 FULLVER=getFullVersion(),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1066 )
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1067 readme = readme % textvars
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1068
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1069 if pkgroot is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1070 pkgroot = pkgroot % textvars
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1071 else:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1072 pkgroot = '/'
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1073
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1074 if srcdir is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1075 srcdir = os.path.join(WORKDIR, '_root', srcdir[1:])
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1076 srcdir = srcdir % textvars
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1077
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1078 if postflight is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1079 postflight = os.path.abspath(postflight)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1080
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1081 packageContents = os.path.join(targetDir, pkgname + '.pkg', 'Contents')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1082 os.makedirs(packageContents)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1083
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1084 if srcdir is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1085 os.chdir(srcdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1086 runCommand("pax -wf %s . 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.pax')),))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1087 runCommand("gzip -9 %s 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.pax')),))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1088 runCommand("mkbom . %s 2>&1"%(shellQuote(os.path.join(packageContents, 'Archive.bom')),))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1089
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1090 fn = os.path.join(packageContents, 'PkgInfo')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1091 fp = open(fn, 'w')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1092 fp.write('pmkrpkg1')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1093 fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1094
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1095 rsrcDir = os.path.join(packageContents, "Resources")
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1096 os.mkdir(rsrcDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1097 fp = open(os.path.join(rsrcDir, 'ReadMe.txt'), 'w')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1098 fp.write(readme)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1099 fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1100
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1101 if postflight is not None:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1102 patchScript(postflight, os.path.join(rsrcDir, 'postflight'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1103
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1104 vers = getFullVersion()
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1105 major, minor = getVersionMajorMinor()
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1106 pl = Plist(
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1107 CFBundleGetInfoString="Python.%s %s"%(pkgname, vers,),
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1108 CFBundleIdentifier='org.python.Python.%s'%(pkgname,),
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1109 CFBundleName='Python.%s'%(pkgname,),
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1110 CFBundleShortVersionString=vers,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1111 IFMajorVersion=major,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1112 IFMinorVersion=minor,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1113 IFPkgFormatVersion=0.10000000149011612,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1114 IFPkgFlagAllowBackRev=False,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1115 IFPkgFlagAuthorizationAction="RootAuthorization",
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1116 IFPkgFlagDefaultLocation=pkgroot,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1117 IFPkgFlagFollowLinks=True,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1118 IFPkgFlagInstallFat=True,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1119 IFPkgFlagIsRequired=isRequired,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1120 IFPkgFlagOverwritePermissions=False,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1121 IFPkgFlagRelocatable=False,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1122 IFPkgFlagRestartAction="NoRestart",
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1123 IFPkgFlagRootVolumeOnly=True,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1124 IFPkgFlagUpdateInstalledLangauges=False,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1125 )
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1126 writePlist(pl, os.path.join(packageContents, 'Info.plist'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1127
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1128 pl = Plist(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1129 IFPkgDescriptionDescription=readme,
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1130 IFPkgDescriptionTitle=recipe.get('long_name', "Python.%s"%(pkgname,)),
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1131 IFPkgDescriptionVersion=vers,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1132 )
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1133 writePlist(pl, os.path.join(packageContents, 'Resources', 'Description.plist'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1134
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1135 finally:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1136 os.chdir(curdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1137
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1138
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1139 def makeMpkgPlist(path):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1140
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1141 vers = getFullVersion()
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1142 major, minor = getVersionMajorMinor()
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1143
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1144 pl = Plist(
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1145 CFBundleGetInfoString="Python %s"%(vers,),
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1146 CFBundleIdentifier='org.python.Python',
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1147 CFBundleName='Python',
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1148 CFBundleShortVersionString=vers,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1149 IFMajorVersion=major,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1150 IFMinorVersion=minor,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1151 IFPkgFlagComponentDirectory="Contents/Packages",
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1152 IFPkgFlagPackageList=[
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1153 dict(
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1154 IFPkgFlagPackageLocation='%s-%s.pkg'%(item['name'], getVersion()),
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1155 IFPkgFlagPackageSelection=item.get('selected', 'selected'),
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1156 )
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1157 for item in pkg_recipes()
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1158 ],
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1159 IFPkgFormatVersion=0.10000000149011612,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1160 IFPkgFlagBackgroundScaling="proportional",
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1161 IFPkgFlagBackgroundAlignment="left",
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1162 IFPkgFlagAuthorizationAction="RootAuthorization",
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1163 )
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1164
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1165 writePlist(pl, path)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1166
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1167
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1168 def buildInstaller():
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1169
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1170 # Zap all compiled files
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1171 for dirpath, _, filenames in os.walk(os.path.join(WORKDIR, '_root')):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1172 for fn in filenames:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1173 if fn.endswith('.pyc') or fn.endswith('.pyo'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1174 os.unlink(os.path.join(dirpath, fn))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1175
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1176 outdir = os.path.join(WORKDIR, 'installer')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1177 if os.path.exists(outdir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1178 shutil.rmtree(outdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1179 os.mkdir(outdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1180
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1181 pkgroot = os.path.join(outdir, 'Python.mpkg', 'Contents')
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1182 pkgcontents = os.path.join(pkgroot, 'Packages')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1183 os.makedirs(pkgcontents)
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1184 for recipe in pkg_recipes():
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1185 packageFromRecipe(pkgcontents, recipe)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1186
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1187 rsrcDir = os.path.join(pkgroot, 'Resources')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1188
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1189 fn = os.path.join(pkgroot, 'PkgInfo')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1190 fp = open(fn, 'w')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1191 fp.write('pmkrpkg1')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1192 fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1193
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1194 os.mkdir(rsrcDir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1195
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1196 makeMpkgPlist(os.path.join(pkgroot, 'Info.plist'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1197 pl = Plist(
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1198 IFPkgDescriptionTitle="Python",
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1199 IFPkgDescriptionVersion=getVersion(),
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1200 )
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1201
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1202 writePlist(pl, os.path.join(pkgroot, 'Resources', 'Description.plist'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1203 for fn in os.listdir('resources'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1204 if fn == '.svn': continue
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1205 if fn.endswith('.jpg'):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1206 shutil.copy(os.path.join('resources', fn), os.path.join(rsrcDir, fn))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1207 else:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1208 patchFile(os.path.join('resources', fn), os.path.join(rsrcDir, fn))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1209
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1210 shutil.copy("../../LICENSE", os.path.join(rsrcDir, 'License.txt'))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1211
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1212
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1213 def installSize(clear=False, _saved=[]):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1214 if clear:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1215 del _saved[:]
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1216 if not _saved:
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1217 data = captureCommand("du -ks %s"%(
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1218 shellQuote(os.path.join(WORKDIR, '_root'))))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1219 _saved.append("%d"%((0.5 + (int(data.split()[0]) / 1024.0)),))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1220 return _saved[0]
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1221
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1222
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1223 def buildDMG():
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1224 """
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	1225 Create DMG containing the rootDir.
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1226 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1227 outdir = os.path.join(WORKDIR, 'diskimage')
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1228 if os.path.exists(outdir):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1229 shutil.rmtree(outdir)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1230
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1231 imagepath = os.path.join(outdir,
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1232 'python-%s-macosx%s'%(getFullVersion(),DEPTARGET))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1233 if INCLUDE_TIMESTAMP:
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1234 imagepath = imagepath + '-%04d-%02d-%02d'%(time.localtime()[:3])
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1235 imagepath = imagepath + '.dmg'
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1236
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1237 os.mkdir(outdir)
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1238 volname='Python %s'%(getFullVersion())
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1239 runCommand("hdiutil create -format UDRW -volname %s -srcfolder %s %s"%(
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1240 shellQuote(volname),
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1241 shellQuote(os.path.join(WORKDIR, 'installer')),
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1242 shellQuote(imagepath + ".tmp.dmg" )))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1243
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1244
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1245 if not os.path.exists(os.path.join(WORKDIR, "mnt")):
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1246 os.mkdir(os.path.join(WORKDIR, "mnt"))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1247 runCommand("hdiutil attach %s -mountroot %s"%(
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1248 shellQuote(imagepath + ".tmp.dmg"), shellQuote(os.path.join(WORKDIR, "mnt"))))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1249
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1250 # Custom icon for the DMG, shown when the DMG is mounted.
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1251 shutil.copy("../Icons/Disk Image.icns",
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1252 os.path.join(WORKDIR, "mnt", volname, ".VolumeIcon.icns"))
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1253 runCommand("SetFile -a C %s/"%(
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1254 shellQuote(os.path.join(WORKDIR, "mnt", volname)),))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1255
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1256 runCommand("hdiutil detach %s"%(shellQuote(os.path.join(WORKDIR, "mnt", volname))))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1257
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1258 setIcon(imagepath + ".tmp.dmg", "../Icons/Disk Image.icns")
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1259 runCommand("hdiutil convert %s -format UDZO -o %s"%(
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1260 shellQuote(imagepath + ".tmp.dmg"), shellQuote(imagepath)))
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1261 setIcon(imagepath, "../Icons/Disk Image.icns")
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1262
857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1263 os.unlink(imagepath + ".tmp.dmg")
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1264
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1265 return imagepath
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1266
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1267
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1268 def setIcon(filePath, icnsPath):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1269 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1270 Set the custom icon for the specified file or directory.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1271 """
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1272
61121 e47aea86f714 Merged revisions 80653 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60861 diff changeset	1273 dirPath = os.path.normpath(os.path.dirname(__file__))
e47aea86f714 Merged revisions 80653 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60861 diff changeset	1274 toolPath = os.path.join(dirPath, "seticon.app/Contents/MacOS/seticon")
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1275 if not os.path.exists(toolPath) or os.stat(toolPath).st_mtime < os.stat(dirPath + '/seticon.m').st_mtime:
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1276 # NOTE: The tool is created inside an .app bundle, otherwise it won't work due
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1277 # to connections to the window server.
61121 e47aea86f714 Merged revisions 80653 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60861 diff changeset	1278 appPath = os.path.join(dirPath, "seticon.app/Contents/MacOS")
e47aea86f714 Merged revisions 80653 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60861 diff changeset	1279 if not os.path.exists(appPath):
e47aea86f714 Merged revisions 80653 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 60861 diff changeset	1280 os.makedirs(appPath)
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1281 runCommand("cc -o %s %s/seticon.m -framework Cocoa"%(
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1282 shellQuote(toolPath), shellQuote(dirPath)))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1283
52452 08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1284 runCommand("%s %s %s"%(shellQuote(os.path.abspath(toolPath)), shellQuote(icnsPath),
08bf31848a42 Merged revisions 70727 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 51563 diff changeset	1285 shellQuote(filePath)))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1286
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1287 def main():
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1288 # First parse options and check if we can perform our work
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1289 parseOptions()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1290 checkEnvironment()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1291
52461 857be5d95120 Merged revisions 70737 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52452 diff changeset	1292 os.environ['MACOSX_DEPLOYMENT_TARGET'] = DEPTARGET
59741 acc3e3583fac update mac installer script from the trunk #8068 Benjamin Peterson <benjamin@python.org> parents: 54359 diff changeset	1293 os.environ['CC'] = CC
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1294 os.environ['CXX'] = CXX
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1295
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1296 if os.path.exists(WORKDIR):
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1297 shutil.rmtree(WORKDIR)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1298 os.mkdir(WORKDIR)
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1299
60692 bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	1300 os.environ['LC_ALL'] = 'C'
bedd6ee03e60 Merged revisions 80179 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 59741 diff changeset	1301
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1302 # Then build third-party libraries such as sleepycat DB4.
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1303 buildLibraries()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1304
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1305 # Now build python itself
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1306 buildPython()
52515 e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1307
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1308 # And then build the documentation
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1309 # Remove the Deployment Target from the shell
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1310 # environment, it's no longer needed and
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1311 # an unexpected build target can cause problems
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1312 # when Sphinx and its dependencies need to
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1313 # be (re-)installed.
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1314 del os.environ['MACOSX_DEPLOYMENT_TARGET']
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1315 buildPythonDocs()
52515 e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1316
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1317
e4778ea8e4b2 Merged revisions 70802 via svnmerge from Ronald Oussoren <ronaldoussoren@mac.com> parents: 52470 diff changeset	1318 # Prepare the applications folder
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1319 fn = os.path.join(WORKDIR, "_root", "Applications",
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48356 diff changeset	1320 "Python %s"%(getVersion(),), "Update Shell Profile.command")
51563 971bb47ff70b Fix for issue5224 ("Update Shell Profile.command" contains wrong Python version on OSX) Ronald Oussoren <ronaldoussoren@mac.com> parents: 50377 diff changeset	1321 patchScript("scripts/postflight.patch-profile", fn)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1322
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48356 diff changeset	1323 folder = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%(
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1324 getVersion(),))
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1325 os.chmod(folder, STAT_0o755)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1326 setIcon(folder, "../Icons/Python Folder.icns")
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1327
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1328 # Create the installer
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1329 buildInstaller()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1330
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1331 # And copy the readme into the directory containing the installer
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1332 patchFile('resources/ReadMe.txt', os.path.join(WORKDIR, 'installer', 'ReadMe.txt'))
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1333
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1334 # Ditto for the license file.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	1335 shutil.copy('../../LICENSE', os.path.join(WORKDIR, 'installer', 'License.txt'))
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1336
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1337 fp = open(os.path.join(WORKDIR, 'installer', 'Build.txt'), 'w')
81800 d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1338 fp.write("# BUILD INFO\n")
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1339 fp.write("# Date: %s\n" % time.ctime())
d54330c8daaa Issue #14018: Backport OS X installer updates from 3.3. Ned Deily <nad@acm.org> parents: 68586 diff changeset	1340 fp.write("# By: %s\n" % pwd.getpwuid(os.getuid()).pw_gecos)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1341 fp.close()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1342
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1343 # And copy it to a DMG
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1344 buildDMG()
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1345
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1346 if __name__ == "__main__":
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: diff changeset	1347 main()

Mercurial > cpython-lru_cache-weakref

annotate Mac/BuildScript/build-installer.py @ 84007:dbfbdf2b5c19 3.3