diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | generic/tk.h | 16 | ||||
| -rw-r--r-- | library/tk.tcl | 6 | ||||
| -rw-r--r-- | mac/README | 4 | ||||
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 28 | ||||
| -rw-r--r-- | unix/README | 6 | ||||
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/configure.in | 8 | ||||
| -rw-r--r-- | unix/tk.spec | 6 | ||||
| -rw-r--r-- | win/README | 4 | ||||
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/configure.in | 8 | ||||
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 28 |
15 files changed, 87 insertions, 69 deletions
@@ -1,3 +1,21 @@ +2003-03-04 Don Porter <dgp@users.sf.net> + + * README: Bumped version number of + * generic/tk.h: Tk to 8.5a0. + * library/tk.tcl: + * mac/README: + * macosx/Wish.pbproj/project.pbxproj: + * unix/README: + * unix/configure.in: + * unix/tk.spec: + * win/README: + * win/configure.in: + * win/makefile.vc: + * win/tcl.m4: + + * unix/configure: autoconf + * win/configure: + 2003-03-03 Jeff Hobbs <jeffh@ActiveState.com> *** 8.4.2 TAGGED FOR RELEASE *** @@ -1,11 +1,11 @@ README: Tk - This is the Tk 8.4.2 source distribution. + This is the Tk 8.5a0 source distribution. Tcl/Tk is also available through NetCVS: http://tcl.sourceforge.net/ You can get any source release of Tcl from the file distributions link at the above URL. -RCS: @(#) $Id: README,v 1.39 2003/02/15 02:20:59 hobbs Exp $ +RCS: @(#) $Id: README,v 1.40 2003/03/04 23:50:41 dgp 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.4 Web page at +this release, see the Tcl/Tk 8.5 Web page at - http://www.tcl.tk/software/tcltk/8.4.html + http://www.tcl.tk/software/tcltk/8.5.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 dc42c36..9c9592a 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.74 2003/02/15 02:20:59 hobbs Exp $ + * RCS: @(#) $Id: tk.h,v 1.75 2003/03/04 23:50:41 dgp Exp $ */ #ifndef _TK @@ -48,12 +48,12 @@ extern "C" { */ #define TK_MAJOR_VERSION 8 -#define TK_MINOR_VERSION 4 -#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 2 +#define TK_MINOR_VERSION 5 +#define TK_RELEASE_LEVEL TCL_ALPHA_RELEASE +#define TK_RELEASE_SERIAL 0 -#define TK_VERSION "8.4" -#define TK_PATCH_LEVEL "8.4.2" +#define TK_VERSION "8.5" +#define TK_PATCH_LEVEL "8.5a0" /* * The following definitions set up the proper options for Macintosh @@ -68,8 +68,8 @@ extern "C" { #ifndef _TCL # include <tcl.h> -# if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4) -# error Tk 8.4 must be compiled with tcl.h from Tcl 8.4 +# if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) +# error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 # endif #endif diff --git a/library/tk.tcl b/library/tk.tcl index 1d0d3d0..716cd46 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 2003/02/18 21:24:39 hobbs Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.47 2003/03/04 23:50:42 dgp 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 -package require -exact Tcl 8.4 +package require -exact Tk 8.5 +package require -exact Tcl 8.5 # Create a ::tk namespace namespace eval ::tk { @@ -1,9 +1,9 @@ -Tk 8.4 for Macintosh +Tk 8.5 for Macintosh Originally by Ray Johnson while at Sun Microsystems Labs with major help from Jim Ingham while at Cygnus Solutions -RCS: @(#) $Id: README,v 1.17 2002/03/04 23:31:45 hobbs Exp $ +RCS: @(#) $Id: README,v 1.18 2003/03/04 23:50:42 dgp Exp $ 1. Introduction --------------- diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 290434d..b1b6dcf 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1529,11 +1529,11 @@ F5877FBC031FA968016F146B, ); buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 8.4; - DYLIB_CURRENT_VERSION = 8.4; + DYLIB_COMPATIBILITY_VERSION = 8.5; + DYLIB_CURRENT_VERSION = 8.5; DYLIB_INSTALL_PATH = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = "\"$(SYMROOT)\""; - FRAMEWORK_VERSION = 8.4; + FRAMEWORK_VERSION = 8.5; GLOBAL_CFLAGS = "`source \"${SYMROOT}/Tcl.framework/Resources/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT"; HEADER_SEARCH_PATHS = "\"$(SYMROOT)/Tcl.framework/Headers\" \"$(SYMROOT)/Tcl.framework/PrivateHeaders\" ../bitmaps ../generic ../xlib"; INSTALL_PATH = "${DYLIB_INSTALL_PATH}"; @@ -1550,7 +1550,7 @@ TK_MAJOR_VERSION = 8; TK_MINOR_VERSION = 4; TK_PATCH_LEVEL = .1; - TK_VERSION = 8.4; + TK_VERSION = 8.5; USE_GCC3_PFE_SUPPORT = YES; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WRAPPER_EXTENSION = framework; @@ -1572,7 +1572,7 @@ <key>CFBundleExecutable</key> <string>Tk</string> <key>CFBundleGetInfoString</key> - <string>Tk Library 8.4, Copyright © 2002 Tcl Core Team. + <string>Tk Library 8.5, Copyright © 2002 Tcl Core Team. MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string> <key>CFBundleIconFile</key> <string></string> @@ -1581,15 +1581,15 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>Tk Library 8.4</string> + <string>Tk Library 8.5</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>8.4.2</string> + <string>8.5a0</string> <key>CFBundleSignature</key> <string>WiSH</string> <key>CFBundleVersion</key> - <string>8.4.2</string> + <string>8.5a0</string> </dict> </plist> "; @@ -2901,7 +2901,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  ); buildSettings = { FRAMEWORK_SEARCH_PATHS = "\"$(SYMROOT)\""; - FRAMEWORK_VERSION = 8.4; + FRAMEWORK_VERSION = 8.5; GLOBAL_CFLAGS = "`source \"${SYMROOT}/Tcl.framework/Resources/tclConfig.sh\"; echo $${}{TCL_EXTRA_CFLAGS} $${}{TCL_DEFS} | sed -e 's|\\\\\\\\\\\\\\\"|\\\"|g' | sed -e 's| -DTCL_WIDE_INT_TYPE=long. long||'` -U_REENTRANT"; HEADER_SEARCH_PATHS = "\"$(SYMROOT)/Tcl.framework/Headers\" \"$(SYMROOT)/Tcl.framework/PrivateHeaders\" ../generic ../xlib"; INSTALL_PATH = /Applications/Utilities; @@ -2950,7 +2950,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  <key>CFBundleExecutable</key> <string>Wish Shell</string> <key>CFBundleGetInfoString</key> - <string>Wish Shell 8.4, Copyright © 2002 Tcl Core Team. + <string>Wish Shell 8.5, Copyright © 2002 Tcl Core Team. MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string> <key>CFBundleIconFile</key> <string>Wish.icns</string> @@ -2963,11 +2963,11 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>8.4.2</string> + <string>8.5a0</string> <key>CFBundleSignature</key> <string>WiSH</string> <key>CFBundleVersion</key> - <string>8.4.2</string> + <string>8.5a0</string> </dict> </plist> "; @@ -3112,7 +3112,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  OTHER_CFLAGS = "-DMAC_OSX_TK -DTCL_WIDE_INT_TYPE=\"long long\""; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; - PRODUCT_NAME = libtkstub8.4.a; + PRODUCT_NAME = libtkstub8.5.a; REZ_EXECUTABLE = YES; SECTORDER_FLAGS = ""; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; @@ -3127,7 +3127,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  }; F548F8CF0313CEF0016F146B = { isa = PBXLibraryReference; - path = libtkstub8.4.a; + path = libtkstub8.5.a; refType = 3; }; F548F8D00313CF11016F146B = { diff --git a/unix/README b/unix/README index 1b0c580..2fbbe79 100644 --- a/unix/README +++ b/unix/README @@ -20,7 +20,7 @@ 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.19 2003/02/27 00:05:54 hobbs Exp $ +RCS: @(#) $Id: README,v 1.20 2003/03/04 23:50:44 dgp Exp $ How To Compile And Install Tk: ------------------------------ @@ -110,9 +110,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.4" or "libtk8.4.so"; to use the installed + names, such as "wish8.5" or "libtk8.5.so"; to use the installed versions, either specify the version number or create a symbolic - link (e.g. from "wish" to "wish8.4"). + link (e.g. from "wish" to "wish8.5"). 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 b/unix/configure index 1d5026d..a2e055f 100755 --- a/unix/configure +++ b/unix/configure @@ -544,10 +544,10 @@ fi -TK_VERSION=8.4 +TK_VERSION=8.5 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=5 +TK_PATCH_LEVEL="a0" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb es fr it nl ru" diff --git a/unix/configure.in b/unix/configure.in index 32e695f..ebf3cd1 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,15 +3,15 @@ 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. # -# RCS: @(#) $Id: configure.in,v 1.83 2003/02/15 02:21:00 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.84 2003/03/04 23:50:44 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) -TK_VERSION=8.4 +TK_VERSION=8.5 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=5 +TK_PATCH_LEVEL="a0" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb es fr it nl ru" diff --git a/unix/tk.spec b/unix/tk.spec index d6f0480..befe1af 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,7 +1,7 @@ -# $Id: tk.spec,v 1.15 2003/02/15 02:21:00 hobbs Exp $ +# $Id: tk.spec,v 1.16 2003/03/04 23:50:45 dgp Exp $ # This file is the basis for a binary Tk Linux RPM. -%define version 8.4.2 +%define version 8.5a0 %define directory /usr/local Summary: Tk graphical toolkit for the Tcl scripting language. @@ -14,7 +14,7 @@ Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz URL: http://www.tcl.tk/ Packager: Carina Buildroot: /var/tmp/%{name}%{version} -Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4.2 +Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.5a0 %description The Tcl (Tool Command Language) provides a powerful platform for @@ -1,8 +1,8 @@ -Tk 8.4 for Windows +Tk 8.5 for Windows Originally by Scott Stanton while at Sun Microsystems Labs -RCS: @(#) $Id: README,v 1.16 2002/03/04 23:31:45 hobbs Exp $ +RCS: @(#) $Id: README,v 1.17 2003/03/04 23:50:45 dgp 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/configure b/win/configure index 0db2034..83fab07 100755 --- a/win/configure +++ b/win/configure @@ -533,10 +533,10 @@ fi -TK_VERSION=8.4 +TK_VERSION=8.5 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=5 +TK_PATCH_LEVEL="a0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index aea2314..67974db 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,15 +3,15 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.49 2003/02/15 02:21:01 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.50 2003/03/04 23:50:47 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) -TK_VERSION=8.4 +TK_VERSION=8.5 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".2" +TK_MINOR_VERSION=5 +TK_PATCH_LEVEL="a0" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/makefile.vc b/win/makefile.vc index c8fe5bf..a225626 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 2003/02/14 20:30:36 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.68 2003/03/04 23:50:49 dgp Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -165,7 +165,7 @@ PROJECT = tk !endif STUBPREFIX = $(PROJECT)stub -DOTVERSION = 8.4 +DOTVERSION = 8.5 VERSION = $(DOTVERSION:.=) WISHNAMEPREFIX = wish @@ -20,15 +20,15 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_MSG_CHECKING([the location of tclConfig.sh]) - if test -d ../../tcl8.4$1/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4$1/win - elif test -d ../../tcl8.4/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4/win + if test -d ../../tcl8.5$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.5$1/win + elif test -d ../../tcl8.5/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.5/win else TCL_BIN_DIR_DEFAULT=../../tcl/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 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) @@ -60,15 +60,15 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_DEFUN(SC_PATH_TKCONFIG, [ AC_MSG_CHECKING([the location of tkConfig.sh]) - if test -d ../../tk8.4$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.4$1/win - elif test -d ../../tk8.4/win; then - TK_BIN_DIR_DEFAULT=../../tk8.4/win + if test -d ../../tk8.5$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.5$1/win + elif test -d ../../tk8.5/win; then + TK_BIN_DIR_DEFAULT=../../tk8.5/win else TK_BIN_DIR_DEFAULT=../../tk/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.4 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.5 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) @@ -646,13 +646,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ #------------------------------------------------------------------------ AC_DEFUN(SC_WITH_TCL, [ - if test -d ../../tcl8.4$1/win; then - TCL_BIN_DEFAULT=../../tcl8.4$1/win + if test -d ../../tcl8.5$1/win; then + TCL_BIN_DEFAULT=../../tcl8.5$1/win else - TCL_BIN_DEFAULT=../../tcl8.4/win + TCL_BIN_DEFAULT=../../tcl8.5/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.4 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.5 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) |