diff options
author | Ned Deily <nad@python.org> | 2017-07-24 08:58:00 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-24 08:58:00 (GMT) |
commit | dbe6aba47b8b1f91de9b1ce087d3eb322ba1297c (patch) | |
tree | 5616c770cc937ea4cdd45cee548a50a50184f347 | |
parent | 002f778ecab98f4725a08f35d68f78559a13e47a (diff) | |
download | cpython-dbe6aba47b8b1f91de9b1ce087d3eb322ba1297c.zip cpython-dbe6aba47b8b1f91de9b1ce087d3eb322ba1297c.tar.gz cpython-dbe6aba47b8b1f91de9b1ce087d3eb322ba1297c.tar.bz2 |
Backport Mac installer fixes for git-based workflow (#2838)
-rwxr-xr-x | Mac/BuildScript/build-installer.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 09bd20e..518eeb9 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -13,7 +13,7 @@ sphinx-build and the current versions of Sphinx now require at least Python 2.6. In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script -requires an installed version of hg and a third-party version of +requires an installed third-party version of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5 (for 10.6 or later) installed in /Library/Frameworks. When installed, the Python built by this script will attempt to dynamically link first to @@ -23,7 +23,7 @@ installing the most recent ActiveTcl 8.4 or 8.5 version. 32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5 and the installation of additional components, such as a newer Python -(2.5 is needed for Python parser updates), hg, and for the documentation +(2.5 is needed for Python parser updates) and for the documentation build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later). Usage: see USAGE variable in the script. @@ -663,9 +663,8 @@ def checkEnvironment(): base_path = base_path + ':' + OLD_DEVELOPER_TOOLS os.environ['PATH'] = base_path print("Setting default PATH: %s"%(os.environ['PATH'])) - # Ensure ws have access to hg and to sphinx-build. - # You may have to create links in /usr/bin for them. - runCommand('hg --version') + # Ensure we have access to sphinx-build. + # You may have to create a link in /usr/bin for it. runCommand('sphinx-build --version') def parseOptions(args=None): |