Skip to content

Commit

Permalink
Backport Mac installer fixes for git-based workflow (#2838)
Browse files Browse the repository at this point in the history
  • Loading branch information
ned-deily committed Jul 24, 2017
1 parent 002f778 commit dbe6aba
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Mac/BuildScript/build-installer.py
Expand Up @@ -13,7 +13,7 @@
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
Expand All @@ -23,7 +23,7 @@
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.
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit dbe6aba

Please sign in to comment.