Move all tk/tcl stuff to the 'tk' package, fix tcl file location

This commit is contained in:
rdb 2013-07-23 17:54:30 +00:00
parent 350b2aaf3c
commit ac3ba58e55
2 changed files with 11 additions and 8 deletions

View File

@ -162,9 +162,9 @@ class morepy(package):
'DocXMLRPCServer', 'audioop', 'imageop', 'aifc', 'sunau',
'wave', 'chunk', 'colorsys', 'imghdr', 'sndhdr',
'ossaudiodev', 'gettext', 'locale', 'cmd', 'shlex',
'Tkinter', 'Tix', 'ScrolledText', 'turtle', 'pydoc',
'doctest', 'unittest', 'test', 'test.test_support', 'bdb',
'pdb', 'hotshot', 'timeit', 'trace', 'sys', '__builtin__')
'pydoc', 'doctest', 'unittest', 'test',
'test.test_support', 'bdb', 'pdb', 'hotshot', 'timeit',
'trace', 'sys', '__builtin__')
module('future_builtins', 'warnings', 'contextlib', 'abc',
'atexit', 'traceback', '__future__', 'gc', 'inspect',
'site', 'user', 'fpectl', 'code', 'codeop', 'rexec',

View File

@ -33,17 +33,20 @@ class tk(package):
require('panda3d')
module('Tkinter', '_tkinter', required = True)
module('Tkconstants', 'Tkdnd', 'tkColorChooser',
'tkCommonDialog', 'tkFileDialog', 'tkFont',
'tkMessageBox', 'tkSimpleDialog')
module('Tkconstants', 'Tkdnd', 'Tix', 'ScrolledText', 'turtle',
'tkColorChooser', 'tkCommonDialog', 'tkFileDialog',
'tkFont', 'tkMessageBox', 'tkSimpleDialog')
module('direct.showbase.TkGlobal',
'direct.tkpanels',
'direct.tkwidgets')
try:
from Tkinter import Tcl
dir = Filename.fromOsSpecific(Tcl().eval("info library"))
file(Filename(dir, "*.tcl"), extract = True)
tcl = Tcl()
dir = Filename.fromOsSpecific(tcl.eval("info library"))
ver = tcl.eval("info tclversion")
file(Filename(dir, "*.tcl"), newDir = 'lib/tcl' + ver, extract = True)
except ImportError:
pass