summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--README4
-rw-r--r--generic/tk.h6
-rw-r--r--unix/Makefile.in6
-rw-r--r--win/aclocal.m424
-rw-r--r--win/tkWinPort.h11
6 files changed, 39 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index cc970c6..7e3e256 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
1999-07-22 <redman@scriptics.com>
+ * Changed version to 8.2b2
+
+ * win/tkWinPort.h: Block out include of sys/stat.h in order to
+ build extensions with MetroWerks compiler for Win32. [Bug: 2385]
+
+ * unix/Makefile.in: Need to make install-sh executable before
+ calling (with chmod +x). [Bug: 2413]
+
* library/menu.tcl: Applied patch from Jeff Hobbs to fix typo.
[Bug: 2425]
diff --git a/README b/README
index 0fea131..4ef603c 100644
--- a/README
+++ b/README
@@ -4,14 +4,14 @@ README: Tk
service to the Tcl community by Scriptics Corporation.
http://www.scriptics.com/
-RCS: @(#) $Id: README,v 1.17 1999/06/25 23:30:22 welch Exp $
+RCS: @(#) $Id: README,v 1.18 1999/07/22 21:51:24 redman 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.2b1, which is the first beta for Tk 8.2.
+here corresponds to release 8.2b2, which is the first beta for Tk 8.2.
For details on features, incompatibilities, and potential problems with
this release, see the Tcl/Tk 8.2 Web page at
diff --git a/generic/tk.h b/generic/tk.h
index 6ae14a6..9234923 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.28 1999/07/16 01:52:08 redman Exp $
+ * RCS: @(#) $Id: tk.h,v 1.29 1999/07/22 21:51:25 redman Exp $
*/
#ifndef _TK
@@ -46,10 +46,10 @@ extern "C" {
#define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 2
#define TK_RELEASE_LEVEL TCL_BETA_RELEASE
-#define TK_RELEASE_SERIAL 1
+#define TK_RELEASE_SERIAL 2
#define TK_VERSION "8.2"
-#define TK_PATCH_LEVEL "8.2b1"
+#define TK_PATCH_LEVEL "8.2b2"
/*
* The following definitions set up the proper options for Macintosh
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7b02837..0a85b1a 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.25 1999/07/22 01:32:20 redman Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.26 1999/07/22 21:51:25 redman Exp $
# Current Tk version; used in various names.
@@ -81,7 +81,7 @@ TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
# for this version of Tk:
TCL_BIN_DIR = @TCL_BIN_DIR@
-# The linker flags needed to link in the Tcl library (ex: -ltcl8.1)
+# The linker flags needed to link in the Tcl library (ex: -ltcl8.2)
TCL_LIB_FLAG = @TCL_LIB_FLAG@
# Libraries built with optimization switches have this additional extension
@@ -429,6 +429,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
fi; \
done;
@echo "Installing $(TK_LIB_FILE)"
+ chmod +x $(SRC_DIR)/install-sh
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -458,6 +459,7 @@ install-libraries:
else true; \
fi; \
done;
+ chmod +x $(SRC_DIR)/install-sh
@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
do \
echo "Installing $$i"; \
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/tkWinPort.h b/win/tkWinPort.h
index 5391b21..4eaa443 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.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: tkWinPort.h,v 1.5 1999/04/16 01:51:53 stanton Exp $
+ * RCS: @(#) $Id: tkWinPort.h,v 1.6 1999/07/22 21:51:25 redman Exp $
*/
#ifndef _WINPORT
@@ -31,7 +31,16 @@
#include <limits.h>
#include <fcntl.h>
#include <io.h>
+
+/*
+ * Need to block out this include for building extensions with MetroWerks
+ * compiler for Win32.
+ */
+
+#ifndef __MWERKS__
#include <sys/stat.h>
+#endif
+
#include <time.h>
#include <tchar.h>