From f04872f8ab7961a917d3fe82641f8568f04397ab Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 1 Jun 2016 15:08:19 +0000 Subject: Fix [http://core.tcl.tk/tcl/info/3bd69eba99a395ee|3bd69eba99a395ee]: 'make dist' fails when tclsh9.0 is on $PATH --- generic/ttk/ttkGenStubs.tcl | 2 -- library/demos/ixset | 1 - library/demos/rmt | 1 - library/demos/timer | 1 - library/demos/widget | 1 - library/tk.tcl | 4 ---- tests/all.tcl | 3 +-- tests/constraints.tcl | 2 -- tests/ttk/all.tcl | 3 +-- 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl index 3c8eb19..5b374e6 100644 --- a/generic/ttk/ttkGenStubs.tcl +++ b/generic/ttk/ttkGenStubs.tcl @@ -24,8 +24,6 @@ # + stubs table is const-qualified # -package require Tcl 8 - namespace eval genStubs { # libraryName -- # diff --git a/library/demos/ixset b/library/demos/ixset index 06b644d..57985b1 100644 --- a/library/demos/ixset +++ b/library/demos/ixset @@ -9,7 +9,6 @@ exec wish "$0" ${1+"$@"} # 91/11/23 : pda@masi.ibp.fr, jt@ratp.fr : design # 92/08/01 : pda@masi.ibp.fr : cleaning -package require Tcl 8.4 package require Tk # diff --git a/library/demos/rmt b/library/demos/rmt index 51886de..00bdc9d 100644 --- a/library/demos/rmt +++ b/library/demos/rmt @@ -7,7 +7,6 @@ exec wish "$0" ${1+"$@"} # Tk applications. It allows you to select an application and # then type commands to that application. -package require Tcl 8.4 package require Tk wm title . "Tk Remote Controller" diff --git a/library/demos/timer b/library/demos/timer index e10b840..6b61ca4 100644 --- a/library/demos/timer +++ b/library/demos/timer @@ -5,7 +5,6 @@ exec wish "$0" ${1+"$@"} # timer -- # This script generates a counter with start and stop buttons. -package require Tcl 8.4 package require Tk label .counter -text 0.00 -relief raised -width 10 -padx 2m -pady 1m diff --git a/library/demos/widget b/library/demos/widget index d58f086..162497e 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -10,7 +10,6 @@ exec wish "$0" ${1+"$@"} # separate ".tcl" files is this directory, which are sourced by this script as # needed. -package require Tcl 8.5 package require Tk 8.5 package require msgcat package require Ttk diff --git a/library/tk.tcl b/library/tk.tcl index b971329..2dca7fd 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -10,10 +10,6 @@ # See the file "license.terms" for information on usage and redistribution of # this file, and for a DISCLAIMER OF ALL WARRANTIES. -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.5.0 # Verify that we have Tk binary and script components from the same release package require -exact Tk 8.5.19 diff --git a/tests/all.tcl b/tests/all.tcl index 7f57dc2..d15e5ca 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -9,9 +9,8 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -package require Tcl 8.5 -package require tcltest 2.2 package require Tk ;# This is the Tk test suite; fail early if no Tk! +package require tcltest 2.2 tcltest::configure {*}$argv tcltest::configure -testdir [file normalize [file dirname [info script]]] tcltest::configure -loadfile \ diff --git a/tests/constraints.tcl b/tests/constraints.tcl index bc2c09b..01089aa 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -5,8 +5,6 @@ if {[namespace exists tk::test]} { return } -package require Tcl 8.4 - package require Tk 8.4 tk appname tktest wm title . tktest diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl index da2e316..f03cd56 100644 --- a/tests/ttk/all.tcl +++ b/tests/ttk/all.tcl @@ -9,9 +9,8 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -package require Tcl 8.5 -package require tcltest 2.2 package require Tk ;# This is the Tk test suite; fail early if no Tk! +package require tcltest 2.2 tcltest::configure {*}$argv tcltest::configure -testdir [file normalize [file dirname [info script]]] tcltest::configure -loadfile \ -- cgit v0.12