mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 11:45:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove check for git binary in Mac installer build

Browse source
This commit is contained in:
Ned Deily 2017-06-16 21:00:49 -04:00
parent 4da52247d6
commit 4f05ef4e48
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mac/BuildScript/build-installer.py
View file

@ -13,7 +13,7 @@ sphinx-build and the current versions of Sphinx now require at least
Python 2.6. Python 2.6.
In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script
requires an installed version of git 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 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, (for 10.6 or later) installed in /Library/Frameworks. When installed,
the Python built by this script will attempt to dynamically link first to 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 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 and the installation of additional components, such as a newer Python
(2.5 is needed for Python parser updates), git, 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). build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later).
Usage: see USAGE variable in the script. Usage: see USAGE variable in the script.
@ -635,9 +635,8 @@ def checkEnvironment():
base_path = base_path + ':' + OLD_DEVELOPER_TOOLS base_path = base_path + ':' + OLD_DEVELOPER_TOOLS
os.environ['PATH'] = base_path os.environ['PATH'] = base_path
print("Setting default PATH: %s"%(os.environ['PATH'])) print("Setting default PATH: %s"%(os.environ['PATH']))
# Ensure ws have access to git and to sphinx-build. # Ensure we have access to sphinx-build.
# You may have to create links in /usr/bin for them. # You may have to create a link in /usr/bin for it.
runCommand('git --version')
runCommand('sphinx-build --version') runCommand('sphinx-build --version')
def parseOptions(args=None): def parseOptions(args=None):