diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | generic/tk.h | 24 | ||||
| -rw-r--r-- | library/dialog.tcl | 4 | ||||
| -rw-r--r-- | library/tk.tcl | 6 | ||||
| -rw-r--r-- | mac/README | 29 | ||||
| -rw-r--r-- | unix/Makefile.in | 12 | ||||
| -rw-r--r-- | unix/README | 12 | ||||
| -rw-r--r-- | unix/aclocal.m4 | 2 | ||||
| -rw-r--r-- | unix/configure.in | 8 | ||||
| -rw-r--r-- | win/README | 4 | ||||
| -rw-r--r-- | win/configure.in | 8 | ||||
| -rw-r--r-- | win/makefile.vc | 8 |
13 files changed, 76 insertions, 62 deletions
@@ -1,3 +1,16 @@ +1999-09-24 Jeff Hobbs <hobbs@scriptics.com> + + * */README: + * win/makefile.vc: + * */configure.in: + * generic/tk.h: + * library/tk.tcl: up'd to 8.3a1 + + * unix/Makefile.in: changed 'mkdir' to 'mkdir -p' + + * library/dialog.tcl: changed {Times 18} to {Times 12} for + dialog font. + 1999-09-16 Jeff Hobbs <hobbs@scriptics.com> * generic/tkFont.c: fixed processing of font options and error @@ -4,19 +4,19 @@ README: Tk service to the Tcl community by Scriptics Corporation. http://www.scriptics.com/ -RCS: @(#) $Id: README,v 1.19 1999/08/10 23:16:41 redman Exp $ +RCS: @(#) $Id: README,v 1.20 1999/10/01 22:45:11 hobbs Exp $ 1. Introduction --------------- This directory contains the sources and documentation for Tk, an X11 toolkit implemented with the Tcl scripting language. The information -here corresponds to release 8.2.0, which is the first beta for Tk 8.2. +here corresponds to release 8.3a1, which is an alpha release for Tk 8.3. For details on features, incompatibilities, and potential problems with -this release, see the Tcl/Tk 8.2 Web page at +this release, see the Tcl/Tk 8.3 Web page at - http://www.scriptics.com/software/8.2.html + http://www.scriptics.com/software/8.3.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 8b89675..974cf53 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.30 1999/08/10 23:16:42 redman Exp $ + * RCS: @(#) $Id: tk.h,v 1.31 1999/10/01 22:45:16 hobbs Exp $ */ #ifndef _TK @@ -30,26 +30,26 @@ extern "C" { * When version numbers change here, you must also go into the following files * and update the version numbers: * + * library/tk.tcl (only if Major.minor changes, not patchlevel) * unix/configure.in - * README * win/configure.in - * win/makefile.vc (only if major.minor changes, not patchlevel) - * library/tk.tcl (only if major.minor changes, not patchlevel) - * mac/README (only if major.minor changes, not patchlevel) - * win/README (only if major.minor changes, not patchlevel) - * unix/README (only if major.minor changes, not patchlevel) + * win/makefile.vc (not patchlevel) + * README + * mac/README (not patchlevel) + * win/README (not patchlevel) + * unix/README (not patchlevel) * You may also need to update some of these files when the numbers change * for the version of Tcl that this release of Tk is compiled against. */ #define TK_MAJOR_VERSION 8 -#define TK_MINOR_VERSION 2 -#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 0 +#define TK_MINOR_VERSION 3 +#define TK_RELEASE_LEVEL TCL_ALPHA_RELEASE +#define TK_RELEASE_SERIAL 1 -#define TK_VERSION "8.2" -#define TK_PATCH_LEVEL "8.2.0" +#define TK_VERSION "8.3" +#define TK_PATCH_LEVEL "8.3a1" /* * The following definitions set up the proper options for Macintosh diff --git a/library/dialog.tcl b/library/dialog.tcl index b46aa1e..148a3e8 100644 --- a/library/dialog.tcl +++ b/library/dialog.tcl @@ -3,7 +3,7 @@ # This file defines the procedure tk_dialog, which creates a dialog # box containing a bitmap, a message, and one or more buttons. # -# RCS: @(#) $Id: dialog.tcl,v 1.5 1999/09/02 17:02:52 hobbs Exp $ +# RCS: @(#) $Id: dialog.tcl,v 1.6 1999/10/01 22:45:19 hobbs Exp $ # # Copyright (c) 1992-1993 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -68,7 +68,7 @@ proc tk_dialog {w title text bitmap default args} { if {[string equal $tcl_platform(platform) "macintosh"]} { option add *Dialog.msg.font system widgetDefault } else { - option add *Dialog.msg.font {Times 18} widgetDefault + option add *Dialog.msg.font {Times 12} widgetDefault } label $w.msg -justify left -text $text diff --git a/library/tk.tcl b/library/tk.tcl index 7328b8e..b68d31b 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.11 1999/09/02 17:02:53 hobbs Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.12 1999/10/01 22:45:19 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.2 -package require -exact Tcl 8.2 +package require -exact Tk 8.3 +package require -exact Tcl 8.3 # Add Tk's directory to the end of the auto-load search path, if it # isn't already on the path: @@ -1,4 +1,4 @@ -Tk 8.2 for Macintosh +Tk 8.3 for Macintosh by Ray Johnson Scriptics Corporation @@ -8,7 +8,7 @@ Jim Ingham Cygnus Solutions jingham@cygnus.com -RCS: @(#) $Id: README,v 1.10 1999/06/25 23:30:26 welch Exp $ +RCS: @(#) $Id: README,v 1.11 1999/10/01 22:45:22 hobbs Exp $ 1. Introduction --------------- @@ -30,11 +30,11 @@ maintained at 4. The Distribution ------------------- -Macintosh Tk is distributed in three different forms. This -should make it easier to only download what you need. The -packages are as follows: +Macintosh Tk is distributed in three different forms. This should +make it easier to only download what you need. Replace <version> +with the current version of Tk. The packages are as follows: -mactk8.2.sea.hqx +mactk<version>.sea.hqx This distribution is a "binary" only release. It contains an installer program that will install a 68k, PowerPC, or Fat @@ -42,13 +42,13 @@ mactk8.2.sea.hqx the Tcl & Tk libraries in the Extensions folder inside your System Folder. (No "INIT"'s or Control Pannels are installed.) -mactcltk-full-8.2.sea.hqx +mactcltk-full-<version>.sea.hqx This release contains the full release of Tcl and Tk for the Macintosh plus the More Files package on which Macintosh Tcl and Tk rely. -mactk-source-8.2.sea.hqx +mactk-source-<version>.sea.hqx This release contains the complete source to Tk for the Macintosh In addition, Metrowerks CodeWarrior libraries and project files @@ -62,9 +62,9 @@ In order to compile Macintosh Tk you must have the following items: CodeWarrior Pro 3 or higher - Mac Tcl 8.2 (source) + Mac Tcl (source) (which requires More Files 1.4.2 or 1.4.3) - Mac Tk 8.2 (source) + Mac Tk (source) The project files included with the Mac Tcl source should work fine. The only thing you may need to update are the access paths. @@ -77,13 +77,14 @@ Special notes: * We are starting to support the new Appearance Manager that shipped with MacOS 8.0. The Tk 8.0.3 release is the first Tk release - that supports the Appearance Manager well. Tk 8.0.4 extends this support + that supported the Appearance Manager well. Tk 8.0.4 extended this support to the menu system, though you have to have Appearance 1.0.1 or later installed for this to work. -* If you get the Unix tar file, it will untar into a directory tcl8.0.4. However, - the Macintosh project files expect the folder to be called tcl8.0. You will need - to rename the folder to tcl8.0, or change all the paths in the project files. +* If you get the Unix tar file, it will untar into a directory tcl8.0.4. + However, the Macintosh project files expect the folder to be called + tcl8.0. You will need to rename the folder to tcl8.0, or change all the + paths in the project files. If you have comments or Bug reports send them to: diff --git a/unix/Makefile.in b/unix/Makefile.in index 1464dd8..a314426 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.31 1999/09/21 06:43:00 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.32 1999/10/01 22:45:27 hobbs Exp $ # Current Tk version; used in various names. @@ -430,7 +430,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ - mkdir $$i; \ + mkdir -p $$i; \ chmod 755 $$i; \ else true; \ fi; \ @@ -462,7 +462,7 @@ install-libraries: do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ - mkdir $$i; \ + mkdir -p $$i; \ chmod 755 $$i; \ else true; \ fi; \ @@ -494,7 +494,7 @@ install-demos: do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ - mkdir $$i; \ + mkdir -p $$i; \ chmod 755 $$i; \ else true; \ fi; \ @@ -524,7 +524,7 @@ install-doc: do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ - mkdir $$i; \ + mkdir -p $$i; \ chmod 755 $$i; \ else true; \ fi; \ @@ -924,7 +924,7 @@ $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in dist: $(UNIX_DIR)/configure rm -rf $(DISTDIR) - mkdir $(DISTDIR) + mkdir -p $(DISTDIR) mkdir $(DISTDIR)/unix cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix diff --git a/unix/README b/unix/README index 62473ff..e1b9dc7 100644 --- a/unix/README +++ b/unix/README @@ -16,14 +16,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.6 1999/06/25 23:30:26 welch Exp $ +RCS: @(#) $Id: README,v 1.7 1999/10/01 22:45:27 hobbs Exp $ How To Compile And Install Tk: ------------------------------ -(a) Make sure that the Tcl 8.2 release is present in the directory - ../../tcl8.2 (or else use the "--with-tcl" switch described below). - This release of Tk will only work with Tcl 8.2. Also, be sure that +(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 you have configured Tcl before you configure Tk. (b) Check for patches as described in ../README. @@ -84,9 +84,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.2" or "libtk8.2.so"; to use the installed + names, such as "wish8.3" or "libtk8.3.so"; to use the installed versions, either specify the version number or create a symbolic - link (e.g. from "wish" to "wish8.2"). + link (e.g. from "wish" to "wish8.3"). If you have trouble compiling Tk, read through the file "porting.notes". It contains information that people have provided diff --git a/unix/aclocal.m4 b/unix/aclocal.m4 index 73b78b2..11412ee 100644 --- a/unix/aclocal.m4 +++ b/unix/aclocal.m4 @@ -594,7 +594,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl ${TCL_BUILD_LIB_SPEC}" + DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS="" ;; diff --git a/unix/configure.in b/unix/configure.in index 0513f54..ac94a31 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.41 1999/08/10 23:16:42 redman Exp $ +# RCS: @(#) $Id: configure.in,v 1.42 1999/10/01 22:45:28 hobbs Exp $ -TK_VERSION=8.2 +TK_VERSION=8.3 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=2 -TK_PATCH_LEVEL=".0" +TK_MINOR_VERSION=3 +TK_PATCH_LEVEL="a1" VERSION=${TK_VERSION} if test "${prefix}" = "NONE"; then @@ -1,10 +1,10 @@ -Tk 8.2 for Windows +Tk 8.3 for Windows by Scott Stanton Scriptics Corporation scott.stanton@scriptics.com -RCS: @(#) $Id: README,v 1.11 1999/06/25 23:30:27 welch Exp $ +RCS: @(#) $Id: README,v 1.12 1999/10/01 22:45:30 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/configure.in b/win/configure.in index 21dcdd1..af06ec9 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.9 1999/09/10 00:23:12 wart Exp $ +# RCS: @(#) $Id: configure.in,v 1.10 1999/10/01 22:45:31 hobbs Exp $ AC_INIT(../generic/tk.h) -TK_VERSION=8.2 +TK_VERSION=8.3 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=2 -TK_PATCH_LEVEL=".0" +TK_MINOR_VERSION=3 +TK_PATCH_LEVEL="a1" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #-------------------------------------------------------------------- diff --git a/win/makefile.vc b/win/makefile.vc index 29ca19c..5efd132 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.27 1999/07/31 02:31:57 redman Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.28 1999/10/01 22:45:31 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -28,7 +28,7 @@ ROOT = .. TOOLS32 = c:\program files\devstudio\vc TOOLS32_rc = c:\program files\devstudio\sharedide -TCLDIR = ..\..\tcl8.2 +TCLDIR = ..\..\tcl8.3 INSTALLDIR = c:\program files\tcl # Set this to the appropriate value of /MACHINE: for your platform @@ -50,8 +50,8 @@ NODEBUG = 1 TCLNAMEPREFIX = tcl TKNAMEPREFIX = tk WISHNAMEPREFIX = wish -VERSION = 82 -DOTVERSION = 8.2 +VERSION = 83 +DOTVERSION = 8.3 TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub TKSTUBPREFIX = $(TKNAMEPREFIX)stub |