summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-03-31 13:23:26 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-03-31 13:23:26 (GMT)
commit85da5e83de6bf0d5b670dffaed5b646c5ca5887b (patch)
tree10ad9d4bb8b683ae9a655b3371333b8ea8a17bd4 /Mac
parent60098040c8a1782f4e68a0833cf351b9b2023162 (diff)
downloadcpython-85da5e83de6bf0d5b670dffaed5b646c5ca5887b.zip
cpython-85da5e83de6bf0d5b670dffaed5b646c5ca5887b.tar.gz
cpython-85da5e83de6bf0d5b670dffaed5b646c5ca5887b.tar.bz2
Merged revisions 70802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70802 | ronald.oussoren | 2009-03-31 08:20:45 -0500 (Tue, 31 Mar 2009) | 4 lines Minor update to OSX build-installer script, needed to ensure that the build will succeed in a clean checkout and with a non-default deployment target. ........
Diffstat (limited to 'Mac')
-rwxr-xr-xMac/BuildScript/build-installer.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index d5da074..8d85434 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1018,7 +1018,18 @@ def main():
# Now build python itself
buildPython()
+
+ # And then build the documentation
+ # Remove the Deployment Target from the shell
+ # environment, it's no longer needed and
+ # an unexpected build target can cause problems
+ # when Sphinx and its dependencies need to
+ # be (re-)installed.
+ del os.environ['MACOSX_DEPLOYMENT_TARGET']
buildPythonDocs()
+
+
+ # Prepare the applications folder
fn = os.path.join(WORKDIR, "_root", "Applications",
"Python %s"%(getVersion(),), "Update Shell Profile.command")
patchScript("scripts/postflight.patch-profile", fn)