Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #23968: Make OS X installer build script aware of renamed platform 

directory and sysconfigdata file name.  This is a workaround for 3.6.0a4
pending resolution of other #23968 items.
This commit is contained in:
Ned Deily 2016-08-15 14:37:14 -04:00
parent 0a891d70de
commit 652bad4f4a
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1249,6 +1249,8 @@ def buildPython():
LDVERSION = LDVERSION.replace('$(VERSION)', VERSION) LDVERSION = LDVERSION.replace('$(VERSION)', VERSION)
LDVERSION = LDVERSION.replace('$(ABIFLAGS)', ABIFLAGS) LDVERSION = LDVERSION.replace('$(ABIFLAGS)', ABIFLAGS)
config_suffix = '-' + LDVERSION config_suffix = '-' + LDVERSION
if getVersionMajorMinor() >= (3, 6):
config_suffix = config_suffix + '-darwin'
else: else:
config_suffix = '' # Python 2.x config_suffix = '' # Python 2.x
@ -1274,7 +1276,7 @@ def buildPython():
fp.write(data) fp.write(data)
fp.close() fp.close()
# fix _sysconfigdata if it exists # fix _sysconfigdata
# #
# TODO: make this more robust! test_sysconfig_module of # TODO: make this more robust! test_sysconfig_module of
# distutils.tests.test_sysconfig.SysconfigTestCase tests that # distutils.tests.test_sysconfig.SysconfigTestCase tests that
@ -1288,8 +1290,10 @@ def buildPython():
# _sysconfigdata.py). # _sysconfigdata.py).
import pprint import pprint
if getVersionMajorMinor() >= (3, 6):
path = os.path.join(path_to_lib, 'plat-darwin', '_sysconfigdata_m.py')
else:
path = os.path.join(path_to_lib, '_sysconfigdata.py') path = os.path.join(path_to_lib, '_sysconfigdata.py')
if os.path.exists(path):
fp = open(path, 'r') fp = open(path, 'r')
data = fp.read() data = fp.read()
fp.close() fp.close()