Merged revisions 68468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68468 | hirokazu.yamamoto | 2009-01-10 17:09:43 +0900 | 1 line
Bump up Tcl/Tk version on VC6. (tcl8.4.12 -> tcl8.5.2, tk8.4.12 -> tk8.5.2, tix8.4.0 -> tix8.4.3)
........
diff --git a/PC/VC6/_tkinter.dsp b/PC/VC6/_tkinter.dsp
index d06198c..fb35219 100644
--- a/PC/VC6/_tkinter.dsp
+++ b/PC/VC6/_tkinter.dsp
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib"
+# ADD LINK32 ..\..\..\tcltk\lib\tk85.lib ..\..\..\tcltk\lib\tcl85.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Release"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib"
+# ADD LINK32 ..\..\..\tcltk\lib\tk85.lib ..\..\..\tcltk\lib\tcl85.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index e5fb06f..5c91806 100644
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -63,18 +63,21 @@
_tkinter
Python wrapper for the Tk windowing system. Requires building
- Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.12.
+ Tcl/Tk first. Following are instructions for Tcl/Tk 8.5.2.
Get source
----------
In the dist directory, run
- svn export http://svn.python.org/projects/external/tcl8.4.12
- svn export http://svn.python.org/projects/external/tk8.4.12
- svn export http://svn.python.org/projects/external/tix-8.4.0
+ svn export http://svn.python.org/projects/external/tcl-8.5.2.1 tcl8.5.2
+ svn export http://svn.python.org/projects/external/tk-8.5.2.0 tk8.5.2
+ svn export http://svn.python.org/projects/external/tix-8.4.3.1 tix8.4.3
Build Tcl first (done here w/ MSVC 6 on Win2K)
---------------
- cd dist\tcl8.4.12\win
+ If your environment doesn't have struct _stat64, you need to apply
+ tcl852.patch in this directory to dist\tcl8.5.2\generic\tcl.h.
+
+ cd dist\tcl8.5.2\win
run vcvars32.bat
nmake -f makefile.vc
nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
@@ -84,16 +87,16 @@
Optional: run tests, via
nmake -f makefile.vc test
- all.tcl: Total 10835 Passed 10096 Skipped 732 Failed 7
- Sourced 129 Test Files.
- Files with failing tests: exec.test expr.test io.test main.test string.test stri
+ all.tcl: Total 24242 Passed 23358 Skipped 877 Failed 7
+ Sourced 137 Test Files.
+ Files with failing tests: exec.test http.test io.test main.test string.test stri
ngObj.test
Build Tk
--------
- cd dist\tk8.4.12\win
- nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
- nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
+ cd dist\tk8.5.2\win
+ nmake -f makefile.vc TCLDIR=..\..\tcl8.5.2
+ nmake -f makefile.vc TCLDIR=..\..\tcl8.5.2 INSTALLDIR=..\..\tcltk install
XXX Should we compile with OPTS=threads?
@@ -101,11 +104,11 @@
XXX failed. It popped up tons of little windows, and did lots of
XXX stuff, and nothing blew up.
- Built Tix
- ---------
- cd dist\tix-8.4.0\win
- nmake -f python.mak
- nmake -f python.mak install
+ Build Tix
+ ---------
+ cd dist\tix8.4.3\win
+ nmake -f python.mak TCL_MAJOR=8 TCL_MINOR=5 TCL_PATCH=2 MACHINE=IX86 DEBUG=0
+ nmake -f python.mak TCL_MAJOR=8 TCL_MINOR=5 TCL_PATCH=2 MACHINE=IX86 DEBUG=0 INSTALL_DIR=..\..\tcltk install
bz2
Python wrapper for the libbz2 compression library. Homepage
diff --git a/PC/VC6/tcl852.patch b/PC/VC6/tcl852.patch
new file mode 100644
index 0000000..b8071e4
--- /dev/null
+++ b/PC/VC6/tcl852.patch
@@ -0,0 +1,22 @@
+--- tcl8.5.2\generic\tcl.h Fri Jun 13 03:35:39 2008
++++ tcl8.5.2\generic\tcl.h Sun Jan 4 16:52:30 2009
+@@ -367,7 +367,7 @@
+ typedef struct stati64 Tcl_StatBuf;
+ # define TCL_LL_MODIFIER "L"
+ # else /* __BORLANDC__ */
+-# if _MSC_VER < 1400 && !defined(_M_IX86)
++# if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/
+ typedef struct _stati64 Tcl_StatBuf;
+ # else
+ typedef struct _stat64 Tcl_StatBuf;
+--- tcl8.5.2\generic\tcl.h Fri Jun 13 03:35:39 2008
++++ tcl8.5.2\generic\tcl.h Sun Jan 4 16:52:30 2009
+@@ -367,7 +367,7 @@
+ typedef struct stati64 Tcl_StatBuf;
+ # define TCL_LL_MODIFIER "L"
+ # else /* __BORLANDC__ */
+-# if _MSC_VER < 1400 && !defined(_M_IX86)
++# if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/
+ typedef struct _stati64 Tcl_StatBuf;
+ # else
+ typedef struct _stat64 Tcl_StatBuf;