mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #15663: merge build-installer.py changes

Browse source
This commit is contained in:
Ned Deily 2013-11-05 02:50:49 -08:00
commit be47cffcb2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mac/BuildScript/build-installer.py
View file

@ -193,7 +193,7 @@ def library_recipes():
LT_10_5 = bool(DEPTARGET < '10.5') LT_10_5 = bool(DEPTARGET < '10.5')
if DEPTARGET > '10.5': if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 4)):
result.extend([ result.extend([
dict( dict(
name="Tcl 8.5.15", name="Tcl 8.5.15",
@ -571,7 +571,7 @@ def checkEnvironment():
# - the traditional version (renamed to _tkinter_library.so) linked # - the traditional version (renamed to _tkinter_library.so) linked
# with /Library/Frameworks/{Tcl,Tk}.framework # with /Library/Frameworks/{Tcl,Tk}.framework
# - the default version linked with our builtin copies of Tcl and Tk # - the default version linked with our builtin copies of Tcl and Tk
if DEPTARGET > '10.5': if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 4)):
EXPECTED_SHARED_LIBS['_tkinter_library.so'] = \ EXPECTED_SHARED_LIBS['_tkinter_library.so'] = \
EXPECTED_SHARED_LIBS['_tkinter.so'] EXPECTED_SHARED_LIBS['_tkinter.so']
EXPECTED_SHARED_LIBS['_tkinter.so'] = [ EXPECTED_SHARED_LIBS['_tkinter.so'] = [
@ -971,7 +971,7 @@ def buildPython():
# out-of-date and has critical bugs. Save the _tkinter.so that was # out-of-date and has critical bugs. Save the _tkinter.so that was
# linked with /Library/Frameworks/{Tck,Tk}.framework and build # linked with /Library/Frameworks/{Tck,Tk}.framework and build
# another _tkinter.so linked with our builtin Tcl and Tk libs. # another _tkinter.so linked with our builtin Tcl and Tk libs.
if DEPTARGET > '10.5': if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 4)):
runCommand("find build -name '_tkinter.so' " runCommand("find build -name '_tkinter.so' "
" -execdir mv '{}' _tkinter_library.so \;") " -execdir mv '{}' _tkinter_library.so \;")
print("Running make to build builtin _tkinter") print("Running make to build builtin _tkinter")
@ -1012,7 +1012,7 @@ def buildPython():
# users to select which to import by manipulating sys.path # users to select which to import by manipulating sys.path
# directly or with PYTHONPATH. # directly or with PYTHONPATH.
if DEPTARGET > '10.5': if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 4)):
TKINTERS = ['builtin', 'library'] TKINTERS = ['builtin', 'library']
tkinter_moves = [('_tkinter_' + tkn + '.so', tkinter_moves = [('_tkinter_' + tkn + '.so',
os.path.join(path_to_lib, 'lib-tkinter', tkn)) os.path.join(path_to_lib, 'lib-tkinter', tkn))
@ -1059,7 +1059,7 @@ def buildPython():
# The files are moved after the entire tree has been walked # The files are moved after the entire tree has been walked
# since the shared library checking depends on the files # since the shared library checking depends on the files
# having unique names. # having unique names.
if DEPTARGET > '10.5': if (DEPTARGET > '10.5') and (getVersionTuple() >= (3, 4)):
for tkm in tkinter_moves: for tkm in tkinter_moves:
if fn == tkm[0]: if fn == tkm[0]:
moves_list.append( moves_list.append(