summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2014-09-05 22:51:54 (GMT)
committerNed Deily <nad@acm.org>2014-09-05 22:51:54 (GMT)
commit5ceffa16ea2652a344c5da494bef7e80dcf817a9 (patch)
treee8e2000058718e1ed77f6ecfff975c7ea8de7e52 /Mac
parentea217728c3b00ddc4ceedd4a4c5c37a496a16b45 (diff)
downloadcpython-5ceffa16ea2652a344c5da494bef7e80dcf817a9.zip
cpython-5ceffa16ea2652a344c5da494bef7e80dcf817a9.tar.gz
cpython-5ceffa16ea2652a344c5da494bef7e80dcf817a9.tar.bz2
Update OS X installer build script for changes to documentation build:
as of 2.7.9, doc builds require an externally installed sphinx-build like 3.4+ builds do.
Diffstat (limited to 'Mac')
-rwxr-xr-xMac/BuildScript/build-installer.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 199b560..710e84d 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -615,8 +615,7 @@ def checkEnvironment():
# Ensure ws have access to hg and to sphinx-build.
# You may have to create links in /usr/bin for them.
runCommand('hg --version')
- if getVersionTuple() >= (3, 4):
- runCommand('sphinx-build --version')
+ runCommand('sphinx-build --version')
def parseOptions(args=None):
"""
@@ -929,15 +928,10 @@ def buildPythonDocs():
docdir = os.path.join(rootDir, 'pydocs')
curDir = os.getcwd()
os.chdir(buildDir)
- # The Doc build changed for 3.4 (technically, for 3.4.1)
- if getVersionTuple() < (3, 4):
- # This step does an svn checkout of sphinx and its dependencies
- runCommand('make update')
- runCommand("make html PYTHON='%s'" % os.path.abspath(sys.executable))
- else:
- runCommand('make clean')
- # Assume sphinx-build is on our PATH, checked in checkEnvironment
- runCommand('make html')
+ # The Doc build changed for 3.4 (technically, for 3.4.1) and for 2.7.9
+ runCommand('make clean')
+ # Assume sphinx-build is on our PATH, checked in checkEnvironment
+ runCommand('make html')
os.chdir(curDir)
if not os.path.exists(docdir):
os.mkdir(docdir)