diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-11 17:46:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-11 17:46:39 (GMT) |
| commit | e125b9425935c29a2a759b69e4146adbc012a183 (patch) | |
| tree | 75d59a4d6a8149488a33a415ec1c3b00bd2fe795 /win | |
| parent | 9cf320faf7fab53a527586ae783d3239e11a2599 (diff) | |
| download | tk-e125b9425935c29a2a759b69e4146adbc012a183.zip tk-e125b9425935c29a2a759b69e4146adbc012a183.tar.gz tk-e125b9425935c29a2a759b69e4146adbc012a183.tar.bz2 | |
* 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:
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 10 | ||||
| -rw-r--r-- | win/makefile.vc | 5 |
2 files changed, 7 insertions, 8 deletions
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)\" |