traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to Tcl/Tk 8.5.

This commit is contained in:
Martin v. Löwis 2008-06-12 18:52:00 +00:00
parent db2c9f48c5
commit 7630731af0
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -302,6 +302,8 @@ Library
Build
-----
- The Windows installer now includes Tk 8.5.
- Patch #1722225: Support QNX 6.
- ``Lib/lib-old`` is now added to sys.path.

8
PCbuild/pyproject.vsprops
View File

@ -94,18 +94,18 @@
/>
<UserMacro
Name="tcltkLib"
Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltkLibDebug"
Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
/>
<UserMacro
Name="tcltk64Lib"
Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
/>
<UserMacro
Name="tcltk64LibDebug"
Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
/>
</VisualStudioPropertySheet>

10
Tools/buildbot/external-amd64.bat
View File

@ -4,14 +4,14 @@
call "Tools\buildbot\external-common.bat"
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
if not exist tcltk64\bin\tcl84g.dll (
cd tcl-8.4.18.2\win
if not exist tcltk64\bin\tcl85g.dll (
cd tcl-8.5.2.1\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
cd ..\..
)
if not exist tcltk64\bin\tk84g.dll (
cd tk-8.4.18.1\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
if not exist tcltk64\bin\tk85g.dll (
cd tk-8.5.2.1\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install
cd ..\..
)

7
Tools/buildbot/external-common.bat
View File

@ -27,8 +27,11 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g
@rem tcl/tk
if not exist tcl-8.4.18.2 svn export http://svn.python.org/projects/external/tcl-8.4.18.2
if not exist tk-8.4.18.1 svn export http://svn.python.org/projects/external/tk-8.4.18.1
if not exist tcl-8.5.2.1 (
rd /s/q tcltk tcltk64
svn export http://svn.python.org/projects/external/tcl-8.5.2.1
)
if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
@rem sqlite3
if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4

10
Tools/buildbot/external.bat
View File

@ -4,14 +4,14 @@
call "Tools\buildbot\external-common.bat"
call "%VS90COMNTOOLS%\vsvars32.bat"
if not exist tcltk\bin\tcl84g.dll (
cd tcl-8.4.18.2\win
if not exist tcltk\bin\tcl85g.dll (
cd tcl-8.5.2.1\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install
cd ..\..
)
if not exist tcltk\bin\tk84g.dll (
cd tk-8.4.18.1\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.4.18.2 clean all install
if not exist tcltk\bin\tk85g.dll (
cd tk-8.5.2.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean all install
cd ..\..
)