From e663b31063c95666a2fe748ec4ce69e081c31f86 Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 3 May 2000 00:18:35 +0000 Subject: * README: * generic/tk.h: * library/tk.tcl: * mac/README: * unix/README: * unix/configure.in: * unix/tk.spec: * win/README: * win/aclocal.m4: * win/configure.in: * win/makefile.vc: updated patchlevel to 8.4a1 --- ChangeLog | 16 ++++++++++++++++ README | 8 ++++---- generic/tk.h | 10 +++++----- library/tk.tcl | 6 +++--- mac/README | 4 ++-- unix/README | 12 ++++++------ unix/configure.in | 8 ++++---- unix/tk.spec | 8 ++++---- win/README | 4 ++-- win/aclocal.m4 | 24 ++++++++++++------------ win/configure.in | 8 ++++---- win/makefile.vc | 8 ++++---- 12 files changed, 66 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15a63e1..aa3cc46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2000-05-02 Jeff Hobbs + + * README: + * generic/tk.h: + * library/tk.tcl: + * mac/README: + * unix/README: + * unix/configure.in: + * unix/tk.spec: + * win/README: + * win/aclocal.m4: + * win/configure.in: + * win/makefile.vc: updated patchlevel to 8.4a1 + + * unix/Makefile.in: added tk.spec to dist target + 2000-04-27 Eric Melski * doc/Tk_Init.3: Added Tk_SafeInit information [Bug: 1884]. diff --git a/README b/README index c590c58..812c901 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ README: Tk - This is the Tk 8.3.1 source distribution. + This is the Tk 8.4a1 source distribution. You can get any release of Tcl from: http://dev.scriptics.com/registration/.html Tcl/Tk is also available through NetCVS: http://dev.scriptics.com/software/tcltk/netcvs.html -RCS: @(#) $Id: README,v 1.25 2000/04/26 17:37:34 hobbs Exp $ +RCS: @(#) $Id: README,v 1.26 2000/05/03 00:18:35 hobbs Exp $ 1. Introduction --------------- @@ -14,9 +14,9 @@ This directory contains the sources and documentation for Tk, an X11 toolkit implemented with the Tcl scripting language. For details on features, incompatibilities, and potential problems with -this release, see the Tcl/Tk 8.3 Web page at +this release, see the Tcl/Tk 8.4 Web page at - http://dev.scriptics.com/software/tcltk/8.3.html + http://dev.scriptics.com/software/tcltk/8.4.html or refer to the "changes" file in this directory, which contains a historical record of all changes to Tk. diff --git a/generic/tk.h b/generic/tk.h index d65b652..a08c3fd 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -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: tk.h,v 1.39 2000/04/19 09:25:53 hobbs Exp $ + * RCS: @(#) $Id: tk.h,v 1.40 2000/05/03 00:18:35 hobbs Exp $ */ #ifndef _TK @@ -46,12 +46,12 @@ extern "C" { */ #define TK_MAJOR_VERSION 8 -#define TK_MINOR_VERSION 3 -#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE +#define TK_MINOR_VERSION 4 +#define TK_RELEASE_LEVEL TCL_ALPHA_RELEASE #define TK_RELEASE_SERIAL 1 -#define TK_VERSION "8.3" -#define TK_PATCH_LEVEL "8.3.1" +#define TK_VERSION "8.4" +#define TK_PATCH_LEVEL "8.4a1" /* * The following definitions set up the proper options for Macintosh diff --git a/library/tk.tcl b/library/tk.tcl index 333816b..cdf52ac 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.20 2000/03/24 19:38:57 ericm Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.21 2000/05/03 00:18:36 hobbs Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -14,8 +14,8 @@ # Insist on running with compatible versions of Tcl and Tk. -package require -exact Tk 8.3 -package require -exact Tcl 8.3 +package require -exact Tk 8.4 +package require -exact Tcl 8.4 # Add Tk's directory to the end of the auto-load search path, if it # isn't already on the path: diff --git a/mac/README b/mac/README index e99ba87..b06bc44 100644 --- a/mac/README +++ b/mac/README @@ -1,4 +1,4 @@ -Tk 8.3 for Macintosh +Tk 8.4 for Macintosh by Ray Johnson Scriptics Corporation @@ -8,7 +8,7 @@ Jim Ingham Cygnus Solutions jingham@cygnus.com -RCS: @(#) $Id: README,v 1.13 2000/04/26 17:37:35 hobbs Exp $ +RCS: @(#) $Id: README,v 1.14 2000/05/03 00:18:36 hobbs Exp $ 1. Introduction --------------- diff --git a/unix/README b/unix/README index 29082c1..5c0ccce 100644 --- a/unix/README +++ b/unix/README @@ -20,14 +20,14 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX. To compile for a PC running Windows, see the README file in the directory ../win. To compile for a Macintosh, see the README file in the directory ../mac. -RCS: @(#) $Id: README,v 1.9 2000/04/26 17:37:35 hobbs Exp $ +RCS: @(#) $Id: README,v 1.10 2000/05/03 00:18:36 hobbs Exp $ How To Compile And Install Tk: ------------------------------ -(a) Make sure that the Tcl 8.3 release is present in the directory - ../../tcl8.3 (or else use the "--with-tcl" switch described below). - This release of Tk will only work with Tcl 8.3. Also, be sure that +(a) Make sure that the Tcl 8.4 release is present in the directory + ../../tcl8.4 (or else use the "--with-tcl" switch described below). + This release of Tk will only work with Tcl 8.4. Also, be sure that you have configured Tcl before you configure Tk. (b) Check for patches as described in ../README. @@ -94,9 +94,9 @@ How To Compile And Install Tk: TCL_LIBRARY environment variable as well (see the Tcl README file for information on this). Note that installed versions of wish, libtk.a, libtk.so, and the Tk library have a version number in their - names, such as "wish8.3" or "libtk8.3.so"; to use the installed + names, such as "wish8.4" or "libtk8.4.so"; to use the installed versions, either specify the version number or create a symbolic - link (e.g. from "wish" to "wish8.3"). + link (e.g. from "wish" to "wish8.4"). If you have trouble compiling Tk, see the URL noted above about working platforms. It contains information that people have provided about changes diff --git a/unix/configure.in b/unix/configure.in index 1c13da1..e0d1848 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,12 +3,12 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. AC_INIT(../generic/tk.h) -# RCS: @(#) $Id: configure.in,v 1.49 2000/04/19 09:25:54 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.50 2000/05/03 00:18:37 hobbs Exp $ -TK_VERSION=8.3 +TK_VERSION=8.4 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=3 -TK_PATCH_LEVEL=".1" +TK_MINOR_VERSION=4 +TK_PATCH_LEVEL="a1" VERSION=${TK_VERSION} if test "${prefix}" = "NONE"; then diff --git a/unix/tk.spec b/unix/tk.spec index 47bd229..571031a 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,7 +1,7 @@ -# $Id: tk.spec,v 1.3 2000/04/26 17:37:35 hobbs Exp $ +# $Id: tk.spec,v 1.4 2000/05/03 00:18:37 hobbs Exp $ # This file is the basis for a binary Tk Linux RPM. -%define version 8.3.1 +%define version 8.4a1 %define directory /usr/local Summary: Tk graphical toolkit for the Tcl scripting language. @@ -10,11 +10,11 @@ Version: %{version} Release: 1 Copyright: BSD Group: Development/Languages -Source: ftp://ftp.scriptics.com/pub/tcl/tcl8_3/tk%{version}.tar.gz +Source: ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tk%{version}.tar.gz URL: http://dev.scriptics.com/ Packager: Scriptics Corporation Buildroot: /var/tmp/%{name}%{version} -Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.3.1 +Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4a1 %description The Tcl (Tool Command Language) provides a powerful platform for diff --git a/win/README b/win/README index 7d9cdcf..592f93c 100644 --- a/win/README +++ b/win/README @@ -1,10 +1,10 @@ -Tk 8.3 for Windows +Tk 8.4 for Windows by Scott Stanton Scriptics Corporation scott.stanton@scriptics.com -RCS: @(#) $Id: README,v 1.13 2000/04/26 17:37:36 hobbs Exp $ +RCS: @(#) $Id: README,v 1.14 2000/05/03 00:18:37 hobbs Exp $ This is the directory where you configure and compile the Windows version of Tk. This directory also contains source files for Tk diff --git a/win/aclocal.m4 b/win/aclocal.m4 index f10cc28..d76248d 100644 --- a/win/aclocal.m4 +++ b/win/aclocal.m4 @@ -20,13 +20,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_MSG_CHECKING([the location of tclConfig.sh]) - if test -d ../../tcl8.3$1/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.3$1/win + if test -d ../../tcl8.4$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.4$1/win else - TCL_BIN_DIR_DEFAULT=../../tcl8.3/win + TCL_BIN_DIR_DEFAULT=../../tcl8.4/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.3 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR], TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`) if test ! -d $TCL_BIN_DIR; then AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist) @@ -58,13 +58,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_DEFUN(SC_PATH_TKCONFIG, [ AC_MSG_CHECKING([the location of tkConfig.sh]) - if test -d ../../tk8.3$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.3$1/win + if test -d ../../tk8.4$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.4$1/win else - TK_BIN_DIR_DEFAULT=../../tk8.3/win + TK_BIN_DIR_DEFAULT=../../tk8.4/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.3 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.4 binaries from DIR], TK_BIN_DIR=$withval, TK_BIN_DIR=`cd $TK_BIN_DIR_DEFAULT; pwd`) if test ! -d $TK_BIN_DIR; then AC_MSG_ERROR(Tk directory $TK_BIN_DIR does not exist) @@ -423,13 +423,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ #------------------------------------------------------------------------ AC_DEFUN(SC_WITH_TCL, [ - if test -d ../../tcl8.3$1/win; then - TCL_BIN_DEFAULT=../../tcl8.3$1/win + if test -d ../../tcl8.4$1/win; then + TCL_BIN_DEFAULT=../../tcl8.4$1/win else - TCL_BIN_DEFAULT=../../tcl8.3/win + TCL_BIN_DEFAULT=../../tcl8.4/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.3 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR], TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`) if test ! -d $TCL_BIN_DIR; then AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist) diff --git a/win/configure.in b/win/configure.in index aa256d8..f7bb113 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,14 +2,14 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.16 2000/04/19 09:25:54 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.17 2000/05/03 00:18:37 hobbs Exp $ AC_INIT(../generic/tk.h) -TK_VERSION=8.3 +TK_VERSION=8.4 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=3 -TK_PATCH_LEVEL=".1" +TK_MINOR_VERSION=4 +TK_PATCH_LEVEL="a1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #-------------------------------------------------------------------- diff --git a/win/makefile.vc b/win/makefile.vc index 6cac887..124891d 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.33 2000/04/08 06:59:09 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.34 2000/05/03 00:18:37 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -26,7 +26,7 @@ # ROOT = .. -TCLDIR = ..\..\tcl8.3 +TCLDIR = ..\..\tcl8.4 INSTALLDIR = c:\progra~1\tcl # Set this to the appropriate value of /MACHINE: for your platform @@ -56,8 +56,8 @@ NODEBUG = 1 TCLNAMEPREFIX = tcl TKNAMEPREFIX = tk WISHNAMEPREFIX = wish -VERSION = 83 -DOTVERSION = 8.3 +VERSION = 84 +DOTVERSION = 8.4 TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub TKSTUBPREFIX = $(TKNAMEPREFIX)stub -- cgit v0.12