diff options
Diffstat (limited to 'win')
-rw-r--r-- | win/README | 8 | ||||
-rw-r--r-- | win/README.binary | 22 | ||||
-rw-r--r-- | win/aclocal.m4 | 24 | ||||
-rw-r--r-- | win/makefile.vc | 4 | ||||
-rw-r--r-- | win/tcl.m4 | 24 | ||||
-rw-r--r-- | win/tclWinInit.c | 16 | ||||
-rw-r--r-- | win/tclWinPort.h | 11 |
7 files changed, 59 insertions, 50 deletions
@@ -4,7 +4,7 @@ by Scott Stanton Scriptics Corporation scott.stanton@scriptics.com -RCS: @(#) $Id: README,v 1.12 1999/06/25 23:29:55 welch Exp $ +RCS: @(#) $Id: README,v 1.13 1999/07/22 21:50:56 redman Exp $ 1. Introduction --------------- @@ -21,11 +21,11 @@ The information in this file is maintained on the web at: In order to compile Tcl for Windows, you need the following items: - Tcl 8.1 Source Distribution (plus any patches) + Tcl 8.2 Source Distribution (plus any patches) Visual C++ 2.x/4.x/5.x -In practice, the 8.1 release is built with Visual C++ 5.0 +In practice, the 8.2 release is built with Visual C++ 5.0 In the "win" subdirectory of the source release, you will find "makefile.vc". This is the makefile Visual C++ compiler. You should @@ -45,7 +45,7 @@ find them. Tcl looks in one of three places for the library files: HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.2 3) Relative to the directory containing the current .exe. - Tcl will look for a directory "..\lib\tcl8.1" relative to the + Tcl will look for a directory "..\lib\tcl8.2" relative to the directory containing the currently running .exe. Note that in order to run tclsh82.exe, you must ensure that tcl82.dll diff --git a/win/README.binary b/win/README.binary index fb5a345..ebb745d 100644 --- a/win/README.binary +++ b/win/README.binary @@ -1,11 +1,11 @@ -Tcl/Tk 8.2b1 for Windows, Binary Distribution +Tcl/Tk 8.2b2 for Windows, Binary Distribution -RCS: @(#) $Id: README.binary,v 1.8 1999/06/25 23:29:55 welch Exp $ +RCS: @(#) $Id: README.binary,v 1.9 1999/07/22 21:50:56 redman Exp $ 1. Introduction --------------- -This directory contains the binary distribution of Tcl/Tk 8.2b1 for +This directory contains the binary distribution of Tcl/Tk 8.2b2 for Windows. It was compiled with Microsoft Visual C++ 5.0 using Win32 API, so that it will run under Windows NT, Windows 95, and Windows 98. @@ -25,14 +25,14 @@ Tcl community by Scriptics Corporation. The official home for Tcl and Tk on the Web is at: http://www.scriptics.com -The home page for the Tcl/Tk 8.1 release is - http://www.scriptics.com/software/8.1.html +The home page for the Tcl/Tk 8.2 release is + http://www.scriptics.com/software/8.2.html -Information about new features in Tcl/Tk 8.1 can be found at - http://www.scriptics.com/software/whatsnew81.html +Information about new features in Tcl/Tk 8.2 can be found at + http://www.scriptics.com/software/whatsnew82.html Detailed release notes can be found at - http://www.scriptics.com/software/relnotes/tcl8.1.1 + http://www.scriptics.com/software/relnotes/tcl8.2b2 Information about Tcl itself can be found at http://www.scriptics.com/scripting/ @@ -47,7 +47,7 @@ There are notes about compiling Tcl at --------------- The binary release is distributed as a self-extracting archive called -tcl811.exe. The setup program which will prompt you for an +tcl82b2.exe. The setup program which will prompt you for an installation directory. It will create the installation heirarchy under the specified directory, and install a wish application icon under the program manager group of your choice. @@ -64,8 +64,8 @@ this release, you will need to use the appropriate .lib file for your compiler. In the lib directory of the installation directory, there are library files for the Microsoft Visual C++ compiler: - tcl81.lib - tk81.lib + tcl82.lib + tk82.lib 5. Building dynamically loadable extensions -------------------------------------------- diff --git a/win/aclocal.m4 b/win/aclocal.m4 index d74df1a..9fad38c 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.1$1/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DIR_DEFAULT=../../tcl8.1/win + TCL_BIN_DIR_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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.1$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.1$1/win + if test -d ../../tk8.2$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.2$1/win else - TK_BIN_DIR_DEFAULT=../../tk8.1/win + TK_BIN_DIR_DEFAULT=../../tk8.2/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.1 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.2 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.1$1/win; then - TCL_BIN_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DEFAULT=../../tcl8.1/win + TCL_BIN_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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/makefile.vc b/win/makefile.vc index 59680cf..4d77b51 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -6,7 +6,7 @@ # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: makefile.vc,v 1.40 1999/07/22 00:13:13 redman Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.41 1999/07/22 21:50:57 redman Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -48,7 +48,7 @@ MACHINE = IX86 #THREADDEFINES = -DTCL_THREADS=1 # Set NODEBUG to 0 to compile with symbols -NODEBUG = 1 +NODEBUG = 0 # The following defines can be used to control the amount of debugging # code that is added to the compilation. @@ -20,13 +20,13 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ AC_MSG_CHECKING([the location of tclConfig.sh]) - if test -d ../../tcl8.1$1/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DIR_DEFAULT=../../tcl8.1/win + TCL_BIN_DIR_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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.1$1/win; then - TK_BIN_DIR_DEFAULT=../../tk8.1$1/win + if test -d ../../tk8.2$1/win; then + TK_BIN_DIR_DEFAULT=../../tk8.2$1/win else - TK_BIN_DIR_DEFAULT=../../tk8.1/win + TK_BIN_DIR_DEFAULT=../../tk8.2/win fi - AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.1 binaries from DIR], + AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.2 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.1$1/win; then - TCL_BIN_DEFAULT=../../tcl8.1$1/win + if test -d ../../tcl8.2$1/win; then + TCL_BIN_DEFAULT=../../tcl8.2$1/win else - TCL_BIN_DEFAULT=../../tcl8.1/win + TCL_BIN_DEFAULT=../../tcl8.2/win fi - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], + AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.2 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/tclWinInit.c b/win/tclWinInit.c index 27b86d5..70895ca 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclWinInit.c,v 1.19 1999/07/21 23:28:05 hershey Exp $ + * RCS: @(#) $Id: tclWinInit.c,v 1.20 1999/07/22 21:50:57 redman Exp $ */ #include "tclWinInt.h" @@ -233,17 +233,17 @@ TclpInitLibraryPath(path) * This code looks in the following directories: * * <bindir>/../<installLib> - * (e.g. /usr/local/bin/../lib/tcl8.1) + * (e.g. /usr/local/bin/../lib/tcl8.2) * <bindir>/../../<installLib> - * (e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.1) + * (e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.2) * <bindir>/../library - * (e.g. /usr/src/tcl8.1/unix/../library) + * (e.g. /usr/src/tcl8.2/unix/../library) * <bindir>/../../library - * (e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../library) + * (e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../library) * <bindir>/../../<developLib> - * (e.g. /usr/src/tcl8.1/unix/../../tcl8.1/library) + * (e.g. /usr/src/tcl8.2/unix/../../tcl8.2/library) * <bindir>/../../../<devlopLib> - * (e.g. /usr/src/tcl8.1/unix/solaris-sparc/../../../tcl8.1/library) + * (e.g. /usr/src/tcl8.2/unix/solaris-sparc/../../../tcl8.2/library) */ if (path != NULL) { @@ -304,7 +304,7 @@ TclpInitLibraryPath(path) * Append the value of the TCL_LIBRARY environment variable onto the * path pointer. If the env variable points to another version of * tcl (e.g. "tcl7.6") also append the path to this version (e.g., - * "tcl7.6/../tcl8.1") + * "tcl7.6/../tcl8.2") * * Results: * None. diff --git a/win/tclWinPort.h b/win/tclWinPort.h index aba6807..1f0e46d 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinPort.h,v 1.9 1999/04/22 20:28:02 redman Exp $ + * RCS: @(#) $Id: tclWinPort.h,v 1.10 1999/07/22 21:50:57 redman Exp $ */ #ifndef _TCLWINPORT @@ -52,8 +52,17 @@ typedef float *TCHAR; #include <process.h> #include <signal.h> #include <string.h> + +/* + * Need to block out these includes for building extensions with MetroWerks + * compiler for Win32. + */ + +#ifndef __MWERKS__ #include <sys/stat.h> #include <sys/timeb.h> +#endif + #include <tchar.h> #include <time.h> #include <winsock2.h> |