From e125b9425935c29a2a759b69e4146adbc012a183 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 11 Sep 2007 17:46:39 +0000 Subject: * generic/tkConsole.c: Revised calls to Tcl_InitStubs() and * generic/tkMain.c: [package require Tcl] so that Tk Says What * generic/tkWindow.c: It Means using the new facilties of [package] * library/tk.tcl: in Tcl 8.5 about what version(s) of Tcl it * unix/Makefile.in: is willing to work with. [Bug 1578344]. * win/Makefile.in: * win/makefile.vc: --- ChangeLog | 10 ++++++++++ generic/tkConsole.c | 4 ++-- generic/tkMain.c | 4 ++-- generic/tkWindow.c | 4 ++-- library/tk.tcl | 9 ++++++--- unix/Makefile.in | 9 ++++----- win/Makefile.in | 10 +++++----- win/makefile.vc | 5 ++--- 8 files changed, 33 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11e3805..281f44a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-09-11 Don Porter + + * generic/tkConsole.c: Revised calls to Tcl_InitStubs() and + * generic/tkMain.c: [package require Tcl] so that Tk Says What + * generic/tkWindow.c: It Means using the new facilties of [package] + * library/tk.tcl: in Tcl 8.5 about what version(s) of Tcl it + * unix/Makefile.in: is willing to work with. [Bug 1578344]. + * win/Makefile.in: + * win/makefile.vc: + 2007-09-10 Jeff Hobbs * unix/README: typo corrections [Bug 1788682] diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 1996825..f5969ee 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkConsole.c,v 1.32 2007/09/10 13:35:42 dgp Exp $ + * RCS: @(#) $Id: tkConsole.c,v 1.33 2007/09/11 17:46:41 dgp Exp $ */ #include "tk.h" @@ -233,7 +233,7 @@ Tk_InitConsoleChannels( * only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL) { return; } diff --git a/generic/tkMain.c b/generic/tkMain.c index 3f15415..19ec30a 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMain.c,v 1.25 2007/09/10 13:35:42 dgp Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.26 2007/09/11 17:46:41 dgp Exp $ */ #include @@ -110,7 +110,7 @@ Tk_MainEx( * only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL) { abort(); } diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 541b533..bda5079 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.83 2007/09/10 13:35:42 dgp Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.84 2007/09/11 17:46:41 dgp Exp $ */ #include "tkInt.h" @@ -2948,7 +2948,7 @@ Initialize( * only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL) { return TCL_ERROR; } diff --git a/library/tk.tcl b/library/tk.tcl index 8ac9efa..c8d8587 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.63 2007/05/18 19:21:59 dgp Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.64 2007/09/11 17:46:41 dgp Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -12,8 +12,11 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# Insist on running with compatible versions of Tcl and Tk. -package require -exact Tcl 8.5a7 +package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp + ;# before using 8.5 [package] features. +# Insist on running with compatible version of Tcl +package require Tcl 8.5a7-8.6 +# Verify that we have Tk binary and script components from the same release package require -exact Tk 8.5a7 # Create a ::tk namespace diff --git a/unix/Makefile.in b/unix/Makefile.in index 4e2e8fa..bc105f4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.136 2007/09/06 19:34:02 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.137 2007/09/11 17:46:41 dgp Exp $ # Current Tk version; used in various names. @@ -706,11 +706,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish echo "Creating package index $(PKG_INDEX)"; \ rm -f $(PKG_INDEX); \ (\ - echo "if {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ + echo "if {[catch {package present Tcl\ + $(TCLVERSION)$(TCLPATCHL)}]} { return }";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(TCLPATCHL)\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > $(PKG_INDEX); \ fi diff --git a/win/Makefile.in b/win/Makefile.in index 9acbbba..29c6d66 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,11 +4,12 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.73 2007/05/14 20:58:28 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.74 2007/09/11 17:46:42 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ VERSION = @TK_VERSION@ +PATCH_LEVEL = @TK_PATCH_LEVEL@ #---------------------------------------------------------------- # Things you can change to personalize the Makefile for your own @@ -479,10 +480,9 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {![package vsatisfies [package provide Tcl] $(TCLVERSION)]} { return }";\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)$(TCLPATCHL)\ + echo "if {[catch {package present Tcl\ + $(TCLVERSION)$(TCLPATCHL)]} { return }";\ + echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ diff --git a/win/makefile.vc b/win/makefile.vc index 54d9fe2..c3bca2a 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.103 2007/05/15 23:20:17 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.104 2007/09/11 17:46:42 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -963,8 +963,7 @@ install-binaries: !if !$(STATIC_BUILD) @echo creating package index @type << > $(OUT_DIR)\pkgIndex.tcl -if {![package vsatisfies [package provide Tcl] $(TCL_DOTVERSION)]} { return } -if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } +if {[catch {package present Tcl $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)]} { return } package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] << @$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\" -- cgit v0.12