From aa1e6e099a2a4cd48fad7ae0dcedd853c9d4648f Mon Sep 17 00:00:00 2001
From: "Silas S. Brown" <ssb22@cam.ac.uk>
Date: Fri, 27 Nov 2009 18:10:45 +0000
Subject: [PATCH] Gradint update
git-svn-id: http://svn.code.sf.net/p/e-guidedog/code/ssb22/gradint@463 29193198-4895-4776-b068-10539e920549
---
gradint-build/src/system.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradint-build/src/system.py b/gradint-build/src/system.py
index 9724aa9..6862612 100644
--- a/gradint-build/src/system.py
+++ b/gradint-build/src/system.py
@@ -286,6 +286,7 @@ Tk_might_display_wrong_hanzi = wrong_hanzi_message = ""
if macsound:
if sys.version.startswith("2.3.5"): Tk_might_display_wrong_hanzi="10.4"
elif sys.version[:5] == "2.5.1": # 10.5 (do NOT say >= because this bundle will NOT work on Python 2.6 in OS X 10.6)
+ Tk_might_display_wrong_hanzi="10.5"
f="/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-dynload/_tkinter.so"
if fileExists(f): # we might be able to patch this one up
if not isDirectory("Frameworks") and fileExists("Frameworks.tbz"): os.system("tar -jxvf Frameworks.tbz && rm Frameworks.tbz && chmod -R +w Frameworks")
@@ -294,7 +295,7 @@ if macsound:
os.system('ln -fs "$(pwd)/Frameworks" /tmp/gradint-Tk-Frameworks') # must be same length as /System/Library/Frameworks
sys.path.insert(0,os.getcwd()) ; import _tkinter ; del sys.path[0]
_tkinter.TK_VERSION = _tkinter.TCL_VERSION = "8.6"
- else: Tk_might_display_wrong_hanzi="10.5"
+ Tk_might_display_wrong_hanzi=""
elif sys.version[:5] > "2.5.1": Tk_might_display_wrong_hanzi=">10.5 (not tested)" # TODO Test on OS X 10.6 !!!
if Tk_might_display_wrong_hanzi: wrong_hanzi_message = "NB: In Mac OS "+Tk_might_display_wrong_hanzi+", Chinese\ncan display wrongly here." # so they don't panic when it does
--
GitLab