Skip to content

Commit 7cd9b22

Browse files
authored
bpo-29550: Temporarily skip "make touch" in Mac installer build. (#456)
1 parent 7030ca6 commit 7cd9b22

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Mac/BuildScript/build-installer.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Python 2.6.
1414
1515
In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script
16-
requires an installed version of hg and a third-party version of
16+
requires an installed version of git and a third-party version of
1717
Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
1818
(for 10.6 or later) installed in /Library/Frameworks. When installed,
1919
the Python built by this script will attempt to dynamically link first to
@@ -23,7 +23,7 @@
2323
2424
32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5
2525
and the installation of additional components, such as a newer Python
26-
(2.5 is needed for Python parser updates), hg, and for the documentation
26+
(2.5 is needed for Python parser updates), git, and for the documentation
2727
build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later).
2828
2929
Usage: see USAGE variable in the script.
@@ -635,9 +635,9 @@ def checkEnvironment():
635635
base_path = base_path + ':' + OLD_DEVELOPER_TOOLS
636636
os.environ['PATH'] = base_path
637637
print("Setting default PATH: %s"%(os.environ['PATH']))
638-
# Ensure ws have access to hg and to sphinx-build.
638+
# Ensure ws have access to git and to sphinx-build.
639639
# You may have to create links in /usr/bin for them.
640-
runCommand('hg --version')
640+
runCommand('git --version')
641641
runCommand('sphinx-build --version')
642642

643643
def parseOptions(args=None):
@@ -1142,8 +1142,9 @@ def buildPython():
11421142
shellQuote(WORKDIR)[1:-1],
11431143
shellQuote(WORKDIR)[1:-1]))
11441144

1145-
print("Running make touch")
1146-
runCommand("make touch")
1145+
# bpo-29550: avoid using make touch until it is fixed for git
1146+
# print("Running make touch")
1147+
# runCommand("make touch")
11471148

11481149
print("Running make")
11491150
runCommand("make")

0 commit comments

Comments
 (0)