bpo-29550: Temporarily skip "make touch" in Mac installer build. (#456) · python/cpython@7cd9b22 (original) (raw)

`@@ -13,7 +13,7 @@

13

`Python 2.6.

14

15

`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

17

`Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5

18

`(for 10.6 or later) installed in /Library/Frameworks. When installed,

19

`the Python built by this script will attempt to dynamically link first to

`@@ -23,7 +23,7 @@

23

24

`32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5

25

`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

27

`build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later).

28

29

`Usage: see USAGE variable in the script.

`@@ -635,9 +635,9 @@ def checkEnvironment():

635

`base_path = base_path + ':' + OLD_DEVELOPER_TOOLS

636

`os.environ['PATH'] = base_path

637

`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.

639

`# You may have to create links in /usr/bin for them.

640

runCommand('hg --version')

640

runCommand('git --version')

641

`runCommand('sphinx-build --version')

642

643

`def parseOptions(args=None):

`@@ -1142,8 +1142,9 @@ def buildPython():

1142

`shellQuote(WORKDIR)[1:-1],

1143

`shellQuote(WORKDIR)[1:-1]))

1144

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")

1147

1148

1149

`print("Running make")

1149

1150

`runCommand("make")