Update to Tk 8.4.12 and Tix 8.4.0

3 files changed, 27 insertions, 130 deletions

diff --git a/PC/tix.diff b/PC/tix.diff
deleted file mode 100644
index 93a271f..0000000
--- a/PC/tix.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -ur tix-8.1.4/win/common.mak tix-8.1.4.new/win/common.mak
---- tix-8.1.4/win/common.mak	2002-12-11 07:19:42.000000000 +0100
-+++ tix-8.1.4.new/win/common.mak	2004-08-03 21:45:09.859375000 +0200
-@@ -18,10 +18,10 @@
- #	    support files
- #
- #----------------------------------------------------------------------
--TCL_VER          = 8.3
-+TCL_VER          = 8.4
- ITCL_VER          = 
- 
--INSTALLDIR      = C:\progra~1\tcl
-+INSTALLDIR      = ..\..\tcltk
- 
- !IFNDEF TIX_DEBUG
- NODEBUG = 1
-@@ -61,7 +61,7 @@
- !IF "$(TCL_VER)" == "8.4"
- TCLMAJOR=8
- TCLMINOR=4
--TCLPATCH=1
-+TCLPATCH=7
- TMPDIR          = tk$(TCL_VER)
- !ENDIF
- 
-@@ -176,14 +176,14 @@
- 	$(TMPDIR)\tixWinWm.obj
- 
- RMDIR		= $(TCLDIR)\win\rmd.bat
--MKDIR		= $(TCLDIR)\win\mkd.bat
-+MKDIR		= mkdir
- RM		= del
- 
- install:    install-binaries install-libraries
- 
- install-binaries: $(TCLSH)
--	$(MKDIR) "$(BIN_INSTALL_DIR)"
--	$(MKDIR) "$(LIB_INSTALL_DIR)"
-+	-$(MKDIR) "$(BIN_INSTALL_DIR)"
-+	-$(MKDIR) "$(LIB_INSTALL_DIR)"
- 	@echo installing $(TIXDLL)
- 	@copy "$(TIXDLL)" "$(BIN_INSTALL_DIR)"
- 	@copy "$(TIXLIB)" "$(LIB_INSTALL_DIR)"
-diff -ur tix-8.1.4/win/makefile.vc tix-8.1.4.new/win/makefile.vc
---- tix-8.1.4/win/makefile.vc	2002-12-02 04:02:54.000000000 +0100
-+++ tix-8.1.4.new/win/makefile.vc	2004-08-03 21:42:07.953125000 +0200
-@@ -54,12 +54,11 @@
- DBGX = d
- !ENDIF
- 
--cc32   = "$(TOOLS32)\bin\cl.exe"
--rc32   = "$(TOOLS32_rc)\bin\rc.exe"
--link32 = "$(TOOLS32)\bin\link.exe"
--include32 = -I"$(TOOLS32)\include"
-+cc32   = "cl.exe"
-+rc32   = "rc.exe"
-+link32 = "link.exe"
- 
--TIX_INCLUDES = $(include32) \
-+TIX_INCLUDES = \
- 	-I$(ROOT)\win -I$(ROOT)\generic \
- 	-I$(TKDIR)\generic -I$(TKDIR)\win -I$(TKDIR)\xlib \
- 	-I$(TCLDIR)\generic $(ITCL_CFLAGS)
-@@ -171,7 +170,7 @@
- #
- cvarsdll  = -D_X86_=1 -DWIN32 -D_WIN32 -D_MT -D_DLL
- cflagsdll = $(cvarsdll) -c -W3 -nologo -Fp$(TMPDIR)\ -YX -MD \
--	    -Oti -Gs -GD
-+	    -Oti -Gs -Gd
- 
- ######################################################################
- # Project specific targets
-@@ -181,7 +180,6 @@
- 
- $(DUMPEXTS): $(WINDIR)\winDumpExts.c
- 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ /c $?
--	set LIB="$(TOOLS32)\lib"
- 	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
- 		$(TMPDIR)\winDumpExts.obj 
- 
-@@ -193,7 +191,6 @@
- # (ToDo) $(TIXDLL) doesn't have resources to define its icon, etc.
- #
- $(TIXDLL): $(TIXOBJS) $(TMPDIR)\tixvc.def
--	set LIB="$(TOOLS32)\lib"
- 	$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tixvc.def \
- 		$(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \
- 		$(ITCL_LIBS) -out:$@ @<<
-@@ -202,7 +199,6 @@
- 
- 
- $(TIXWISH): $(WISHOBJS) $(TIXOBJS) $(TIXLIB) $(TMPDIR)\tixwish.res
--	set LIB="$(TOOLS32)\lib"
- 	$(link32) $(ldebug) $(guilflags) \
- 		$(WISHOBJS) $(TMPDIR)\tixwish.res $(TIXLIB) \
- 		$(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \
-diff -ur tix-8.1.4/win/tk8.4/pkgIndex.tcl tix-8.1.4.new/win/tk8.4/pkgIndex.tcl
---- tix-8.1.4/win/tk8.4/pkgIndex.tcl	2002-12-15 04:21:54.000000000 +0100
-+++ tix-8.1.4.new/win/tk8.4/pkgIndex.tcl	2004-08-31 08:38:43.921875000 +0200
-@@ -15,7 +15,7 @@
- # We look in the ../../bin directory (an installed Tcl)
- lappend dirs ../../bin
- # We look in the ../../DLLs directory (an installed Python)
--lappend dirs ../../Dlls
-+lappend dirs [file join [file dirname [info nameofexe]] DLLs]
- # If not, this pkgIndex.tcl will probably fail.
- 
- 
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index a27b90f..4ca52ee 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -64,27 +64,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.7; these
-    should work for version 8.4.6 too, with suitable substitutions:
+    Tcl/Tk first.  Following are instructions for Tcl/Tk 8.4.12.
 
     Get source
     ----------
-    Go to
-        http://prdownloads.sourceforge.net/tcl/
-    and download
-        tcl847-src.zip
-        tk847-src.zip
-    Unzip into
-        dist\tcl8.4.7\
-        dist\tk8.4.7\
-    respectively.
+    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
 
     Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
     ---------------
     Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
          -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
     to get a shell window with the correct environment settings
-    cd dist\tcl8.4.7\win
+    cd dist\tcl8.4.12\win
     nmake -f makefile.vc
     nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
 
@@ -99,9 +93,9 @@ _tkinter
 
     Build Tk
     --------
-    cd dist\tk8.4.7\win
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 INSTALLDIR=..\..\tcltk install
+    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
 
     XXX Should we compile with OPTS=threads?
 
@@ -109,7 +103,7 @@ _tkinter
     XXX directory.  Is all of that really needed for Python use of Tcl/Tk?
 
     Optional:  run tests, via
-        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.7 test
+        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test
 
         On WinXP Pro, wholly up to date as of 30-Aug-2004:
         all.tcl:        Total   8420    Passed  6826    Skipped 1581    Failed  13
@@ -118,12 +112,9 @@ _tkinter
 
    Built Tix
    ---------
-   Download from http://prdownloads.sourceforge.net/tix/tix-8.1.4.tar.gz
-   cd dist\tix-8.1.4
-   [cygwin]patch -p1 < ..\..\python\PC\tix.diff
-   cd win
-   nmake -f makefile.vc
-   nmake -f makefile.vc install
+   cd dist\tix-8.4.0\win
+   nmake -f python.mak
+   nmake -f python.mak install
 
 bz2
     Python wrapper for the libbz2 compression library.  Homepage
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 9ce42b5..1195072 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -15,3 +15,17 @@ if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
 

 @rem OpenSSL

 if not exist openssl-0.9.8a svn export http://svn.python.org/projects/external/openssl-0.9.8a

+

+@rem tcltk

+if not exist tcl8.4.12 (

+   if exist tcltk rd /s/q tcltk

+   svn export http://svn.python.org/projects/external/tcl8.4.12

+   svn export http://svn.python.org/projects/external/tk8.4.12

+   cd tcl8.4.12\win

+   nmake -f makefile.vc

+   nmake -f makefile.vc INSTALLDIR=..\..\tcltk install

+   cd ..\..

+   cd tk8.4.12\win

+   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12

+   nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install

+)