Commit 1ff32a91 authored by Ned Deily's avatar Ned Deily

Keep Mac/build-installer.py in sync across branches (affects 2.7 only).

parent 848c8b29
...@@ -615,7 +615,6 @@ def checkEnvironment(): ...@@ -615,7 +615,6 @@ def checkEnvironment():
# Ensure ws have access to hg and to sphinx-build. # Ensure ws have access to hg and to sphinx-build.
# You may have to create links in /usr/bin for them. # You may have to create links in /usr/bin for them.
runCommand('hg --version') runCommand('hg --version')
if getVersionTuple() >= (3, 4):
runCommand('sphinx-build --version') runCommand('sphinx-build --version')
def parseOptions(args=None): def parseOptions(args=None):
...@@ -929,12 +928,7 @@ def buildPythonDocs(): ...@@ -929,12 +928,7 @@ def buildPythonDocs():
docdir = os.path.join(rootDir, 'pydocs') docdir = os.path.join(rootDir, 'pydocs')
curDir = os.getcwd() curDir = os.getcwd()
os.chdir(buildDir) os.chdir(buildDir)
# The Doc build changed for 3.4 (technically, for 3.4.1) # The Doc build changed for 3.4 (technically, for 3.4.1) and for 2.7.9
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') runCommand('make clean')
# Assume sphinx-build is on our PATH, checked in checkEnvironment # Assume sphinx-build is on our PATH, checked in checkEnvironment
runCommand('make html') runCommand('make html')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment