Skip to content

C
cpython
Commit e0f8b3d5 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto
Browse files
Options

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)

parent 4c5ecb7c
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 18 deletions
PC/VC6/_tkinter.dsp
View file @ e0f8b3d5
......@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# 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 @@ BSC32=bscmake.exe
# 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
......
PC/VC6/readme.txt
View file @ e0f8b3d5
......@@ -63,18 +63,21 @@ unpack into new subdirectories of dist\.
_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 @@ _tkinter
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 @@ _tkinter
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
......
PC/VC6/tcl852.patch 0 → 100644
View file @ e0f8b3d5
--- 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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7