traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Ned Deily 2014-09-05 15:57:54 -07:00
parent 1aca6e1a91 1ff32a9169
commit cde69cdb81
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mac/BuildScript/build-installer.py
View File

@ -615,8 +615,7 @@ 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,15 +928,10 @@ 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): runCommand('make clean')
# This step does an svn checkout of sphinx and its dependencies # Assume sphinx-build is on our PATH, checked in checkEnvironment
runCommand('make update') runCommand('make html')
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')
os.chdir(curDir) os.chdir(curDir)
if not os.path.exists(docdir): if not os.path.exists(docdir):
os.mkdir(docdir) os.mkdir(docdir)