From 168f23611e9fa0c2610f77988a1e60b933588cc1 Mon Sep 17 00:00:00 2001 From: andreas_kupries Date: Mon, 25 Sep 2006 17:28:20 +0000 Subject: * generic/tkConsole.c: Complete reversal of the changes of Sep 22. * generic/tkMain.c: For compat reason the Tcl core will not change * generic/tkWindow.c: the registered version to include the patchlevel, * library/tk.tcl: making the changes to Tk unnecessary. * unix/configure: * unix/Makefile.in: * unix/tcl.m4: * win/configure: * win/Makefile.in: * win/makefile.vc: * win/rules.vc: * win/tcl.m4: FossilOrigin-Name: 8a215ea28667a92a96b020e42d065bc49ba78303 --- ChangeLog | 15 +++++++++++++++ generic/tkConsole.c | 4 ++-- generic/tkMain.c | 4 ++-- generic/tkWindow.c | 8 ++++---- library/tk.tcl | 6 +++--- unix/Makefile.in | 7 +++---- win/Makefile.in | 6 +++--- win/makefile.vc | 6 +++--- 8 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 009268d..4902342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-09-25 Andreas Kupries + + * generic/tkConsole.c: Complete reversal of the changes of Sep 22. + * generic/tkMain.c: For compat reason the Tcl core will not change + * generic/tkWindow.c: the registered version to include the patchlevel, + * library/tk.tcl: making the changes to Tk unnecessary. + * unix/configure: + * unix/Makefile.in: + * unix/tcl.m4: + * win/configure: + * win/Makefile.in: + * win/makefile.vc: + * win/rules.vc: + * win/tcl.m4: + 2006-09-22 Andreas Kupries * generic/tkConsole.c: TIP #268 update regarding registered package diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 0aadf8b..13e755e 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.18.2.5 2006/09/22 19:01:50 andreas_kupries Exp $ + * RCS: @(#) $Id: tkConsole.c,v 1.18.2.6 2006/09/25 17:28:20 andreas_kupries Exp $ * */ @@ -240,7 +240,7 @@ Tk_InitConsoleChannels(interp) * really only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { return; } diff --git a/generic/tkMain.c b/generic/tkMain.c index fdc78c6..0e87228 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.15.2.4 2006/09/22 19:01:50 andreas_kupries Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.15.2.5 2006/09/25 17:28:20 andreas_kupries Exp $ */ #include @@ -117,7 +117,7 @@ Tk_MainEx(argc, argv, appInitProc, interp) * really only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { abort(); } diff --git a/generic/tkWindow.c b/generic/tkWindow.c index e6918b4..eb21177 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,7 +12,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.56.2.13 2006/09/22 19:01:50 andreas_kupries Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.56.2.14 2006/09/25 17:28:20 andreas_kupries Exp $ */ #include "tkPort.h" @@ -2945,7 +2945,7 @@ Initialize(interp) * really only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 1) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { return TCL_ERROR; } @@ -3167,7 +3167,7 @@ Initialize(interp) geometry = NULL; } - if (Tcl_PkgRequire(interp, "Tcl", TCL_PATCH_LEVEL, 1) == NULL) { + if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) { code = TCL_ERROR; goto done; } @@ -3176,7 +3176,7 @@ Initialize(interp) * Provide Tk and its stub table. */ - code = Tcl_PkgProvideEx(interp, "Tk", TK_PATCH_LEVEL, (ClientData) &tkStubs); + code = Tcl_PkgProvideEx(interp, "Tk", TK_VERSION, (ClientData) &tkStubs); if (code != TCL_OK) { goto done; } else { diff --git a/library/tk.tcl b/library/tk.tcl index 74544b7..2abd90f 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.46.2.5 2006/09/22 19:01:51 andreas_kupries Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.46.2.6 2006/09/25 17:28:20 andreas_kupries Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -13,8 +13,8 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # Insist on running with compatible versions of Tcl and Tk. -package require -exact Tk 8.4.14 -package require -exact Tcl 8.4.14 +package require -exact Tk 8.4 +package require -exact Tcl 8.4 # Create a ::tk namespace namespace eval ::tk { diff --git a/unix/Makefile.in b/unix/Makefile.in index 7601716..44c4695 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.87.2.18 2006/09/22 19:01:51 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.19 2006/09/25 17:28:20 andreas_kupries Exp $ # Current Tk version; used in various names. @@ -631,10 +631,9 @@ 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 vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { 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 "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > $(PKG_INDEX); \ fi diff --git a/win/Makefile.in b/win/Makefile.in index af501d9..9cb4273 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.59.2.5 2006/09/22 19:01:52 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59.2.6 2006/09/25 17:28:21 andreas_kupries Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -427,8 +427,8 @@ install-binaries: binaries @$(RM) $(PKG_INDEX); @(\ echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)$(TCLPATCHL)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)$(TCLPATCHL)\ + $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(VERSION)\ [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 bea4261..bf0aeb0 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.67.2.15 2006/09/22 19:01:52 andreas_kupries Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.16 2006/09/25 17:28:21 andreas_kupries Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -542,8 +542,8 @@ install-binaries: !if !$(STATIC_BUILD) @echo Creating package index "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" -del "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl" - echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)$(TCL_PATCHLEVEL)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" - echo package ifneeded Tk $(DOTVERSION)$(TCL_PATCHLEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" + echo if {[package vcompare [package provide Tcl] $(TCL_DOTVERSION)] != 0} { return } > "$(OUT_DIR)\pkgIndex.tcl" + echo package ifneeded Tk $(DOTVERSION) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk] >>"$(OUT_DIR)\pkgIndex.tcl" $(CPY) "$(OUT_DIR)\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\" !endif -- cgit v0.12