Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6de2d4d

Browse files
loewisloewis
committed
Bump Tk version to 8.4.7. Build into tcltk directory.
1 parent 356a459 commit 6de2d4d

2 files changed

Lines changed: 28 additions & 36 deletions

File tree

‎PCbuild/_tkinter.vcproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Name="VCCLCompilerTool"
2222
Optimization="2"
2323
InlineFunctionExpansion="1"
24-
AdditionalIncludeDirectories="..\..\tcl84\include,..\Include,..\PC"
24+
AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
2525
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
2626
StringPooling="TRUE"
2727
RuntimeLibrary="2"
@@ -39,11 +39,11 @@
3939
Name="VCCustomBuildTool"/>
4040
<Tool
4141
Name="VCLinkerTool"
42-
AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
42+
AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
4343
OutputFile="./_tkinter.pyd"
4444
LinkIncremental="1"
4545
SuppressStartupBanner="TRUE"
46-
AdditionalLibraryDirectories="C:\Program Files\Tcl\lib"
46+
AdditionalLibraryDirectories=""
4747
GenerateDebugInformation="TRUE"
4848
ProgramDatabaseFile=".\./_tkinter.pdb"
4949
SubSystem="2"
@@ -89,7 +89,7 @@
8989
<Tool
9090
Name="VCCLCompilerTool"
9191
Optimization="0"
92-
AdditionalIncludeDirectories="..\..\tcl84\include,..\Include,..\PC"
92+
AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
9393
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT"
9494
RuntimeLibrary="3"
9595
UsePrecompiledHeader="2"
@@ -105,11 +105,11 @@
105105
Name="VCCustomBuildTool"/>
106106
<Tool
107107
Name="VCLinkerTool"
108-
AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
108+
AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
109109
OutputFile="./_tkinter_d.pyd"
110110
LinkIncremental="1"
111111
SuppressStartupBanner="TRUE"
112-
AdditionalLibraryDirectories="C:\Program Files\Tcl\lib"
112+
AdditionalLibraryDirectories=""
113113
GenerateDebugInformation="TRUE"
114114
ProgramDatabaseFile=".\./_tkinter_d.pdb"
115115
SubSystem="2"
@@ -157,7 +157,7 @@
157157
AdditionalOptions=" /USECL:MS_ITANIUM"
158158
Optimization="2"
159159
InlineFunctionExpansion="1"
160-
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\..\tcl84\include,..\Include,..\PC"
160+
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\..\tcltk\include,..\Include,..\PC"
161161
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
162162
StringPooling="TRUE"
163163
BasicRuntimeChecks="0"
@@ -179,11 +179,11 @@
179179
<Tool
180180
Name="VCLinkerTool"
181181
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
182-
AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
182+
AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
183183
OutputFile="./_tkinter.pyd"
184184
LinkIncremental="1"
185185
SuppressStartupBanner="TRUE"
186-
AdditionalLibraryDirectories="C:\Program Files\Tcl\lib"
186+
AdditionalLibraryDirectories=""
187187
GenerateDebugInformation="TRUE"
188188
ProgramDatabaseFile=".\./_tkinter.pdb"
189189
SubSystem="2"

‎PCbuild/readme.txt‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,67 +63,59 @@ unpack into new subdirectories of dist\.
6363

6464
_tkinter
6565
Python wrapper for the Tk windowing system. Requires building
66-
Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.5; these
66+
Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.7; these
6767
should work for version 8.4.6 too, with suitable substitutions:
6868

6969
Get source
7070
----------
7171
Go to
7272
http://prdownloads.sourceforge.net/tcl/
7373
and download
74-
tcl845-src.zip
75-
tk845-src.zip
74+
tcl847-src.zip
75+
tk847-src.zip
7676
Unzip into
77-
dist\tcl8.4.5\
78-
dist\tk8.4.5\
77+
dist\tcl8.4.7\
78+
dist\tk8.4.7\
7979
respectively.
8080

8181
Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
8282
---------------
8383
Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
8484
-> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
8585
to get a shell window with the correct environment settings
86-
cd dist\tcl8.4.5\win
86+
cd dist\tcl8.4.7\win
8787
nmake -f makefile.vc
88-
nmake -f makefile.vc INSTALLDIR=..\..\tcl84 install
88+
nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
8989

9090
XXX Should we compile with OPTS=threads?
9191

9292
Optional: run tests, via
9393
nmake -f makefile.vc test
9494

95-
On WinXP Pro, wholly up to date as of 11-Apr-2004:
96-
all.tcl: Total 10564 Passed 9855 Skipped 708 Failed 1
95+
On WinXP Pro, wholly up to date as of 30-Aug-2004:
96+
all.tcl: Total 10572 Passed 9869 Skipped 703 Failed 0
9797
Sourced 129 Test Files.
98-
Files with failing tests: httpold.test
98+
Files with failing tests: ioCmd.test
9999

100100
Build Tk
101101
--------
102-
cd dist\tk8.4.5\win
103-
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5
104-
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5 INSTALLDIR=..\..\tcl84 install
102+
cd dist\tk8.4.7\win
103+
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7
104+
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 INSTALLDIR=..\..\tcltk install
105105

106106
XXX Should we compile with OPTS=threads?
107107

108108
XXX Our installer copies a lot of stuff out of the Tcl/Tk install
109109
XXX directory. Is all of that really needed for Python use of Tcl/Tk?
110110

111111
Optional: run tests, via
112-
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.5 test
113-
114-
On WinXP Pro, wholly up to date as of 11-Apr-2004:
115-
all.tcl: Total 8327 Passed 6717 Skipped 1579 Failed 31
116-
Sourced 182 Test Files.
117-
Files with failing tests: canvImg.test scale.test scrollbar.test textWind.test winWm.test
118-
119-
120-
Make sure the installer matches
121-
-------------------------------
122-
Ensure that the Wise compiler vrbl _TCLDIR_ is set to the name of
123-
the common Tcl/Tk installation directory (tcl84 for the instructions
124-
above). This is needed so the installer can copy various Tcl/Tk
125-
files into the Python distribution.
112+
nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 test
126113

114+
On WinXP Pro, wholly up to date as of 30-Aug-2004:
115+
all.tcl: Total 8421 Passed 6826 Skipped 1581 Failed 14
116+
Sourced 91 Test Files.
117+
Files with failing tests: frame.test scrollbar.test textWind.test winDialog.test
118+
winWm.test winfo.test
127119

128120
zlib
129121
Python wrapper for the zlib compression library. Get the source code

0 commit comments

Comments
 (0)