summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-11-10 22:55:47 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-11-10 22:55:47 (GMT)
commitcb5c86b8a76dfadd445e7a9c45be06b4831260bb (patch)
tree2baa3b79f21d931cebde7a156afa75f1eaa9b134
parentf38d3f45e484452ba99ef07b5348e2c479650d4a (diff)
downloadtcl-cb5c86b8a76dfadd445e7a9c45be06b4831260bb.zip
tcl-cb5c86b8a76dfadd445e7a9c45be06b4831260bb.tar.gz
tcl-cb5c86b8a76dfadd445e7a9c45be06b4831260bb.tar.bz2
* library/dde/pkgIndex.tcl: Added safeguards so that registry
* library/reg/pkgIndex.tcl: and dde packages are not offered * win/tclWinDde.c: on non-Windows platforms. Bumped to * win/tclWinReg.c: registry 1.1.3 and dde 1.3. * win/Makefile.in: * win/configure.in: * win/makefile.bc: * win/makefile.vc: * win/configure: autoconf (2.57)
-rw-r--r--ChangeLog11
-rw-r--r--library/dde/pkgIndex.tcl5
-rwxr-xr-xlibrary/reg/pkgIndex.tcl5
-rw-r--r--win/Makefile.in10
-rwxr-xr-xwin/configure4
-rw-r--r--win/configure.in6
-rw-r--r--win/makefile.bc10
-rw-r--r--win/makefile.vc4
-rw-r--r--win/tclWinDde.c4
-rw-r--r--win/tclWinReg.c4
10 files changed, 38 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index c41c19d..0944b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,17 @@
* win/tclWinInit.c (TclpInitLibraryPath): Fix for [Bug 832657]
that should not run afoul of startup constraints.
+ * library/dde/pkgIndex.tcl: Added safeguards so that registry
+ * library/reg/pkgIndex.tcl: and dde packages are not offered
+ * win/tclWinDde.c: on non-Windows platforms. Bumped to
+ * win/tclWinReg.c: registry 1.1.3 and dde 1.3.
+ * win/Makefile.in:
+ * win/configure.in:
+ * win/makefile.bc:
+ * win/makefile.vc:
+
+ * win/configure: autoconf (2.57)
+
2003-11-10 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* tests/cmdIL.test: Stopped cmdIL-5.5 from stomping over the test
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index 7974e3e..d8d2d6e 100644
--- a/library/dde/pkgIndex.tcl
+++ b/library/dde/pkgIndex.tcl
@@ -1,6 +1,7 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
+if {[string compare $::tcl_platform(platform) windows]} {return}
if {[info exists ::tcl_platform(debug)]} {
- package ifneeded dde 1.2.5 [list load [file join $dir tcldde12g.dll] dde]
+ package ifneeded dde 1.3 [list load [file join $dir tcldde13g.dll] dde]
} else {
- package ifneeded dde 1.2.5 [list load [file join $dir tcldde12.dll] dde]
+ package ifneeded dde 1.3 [list load [file join $dir tcldde13.dll] dde]
}
diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl
index ad9a54b..55775f2 100755
--- a/library/reg/pkgIndex.tcl
+++ b/library/reg/pkgIndex.tcl
@@ -1,8 +1,9 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
+if {[string compare $::tcl_platform(platform) windows]} {return}
if {[info exists ::tcl_platform(debug)]} {
- package ifneeded registry 1.1.2 \
+ package ifneeded registry 1.1.3 \
[list load [file join $dir tclreg11g.dll] registry]
} else {
- package ifneeded registry 1.1.2 \
+ package ifneeded registry 1.1.3 \
[list load [file join $dir tclreg11.dll] registry]
}
diff --git a/win/Makefile.in b/win/Makefile.in
index a0d5991..97dd08f 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.74 2003/10/21 00:23:34 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.75 2003/11/10 22:55:47 dgp Exp $
VERSION = @TCL_VERSION@
@@ -468,7 +468,7 @@ install-binaries: binaries
else true; \
fi; \
done;
- @for i in dde1.2 reg1.1; \
+ @for i in dde1.3 reg1.1; \
do \
if [ ! -d $(LIB_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
@@ -492,13 +492,13 @@ install-binaries: binaries
done
@if [ -f $(DDE_DLL_FILE) ]; then \
echo installing $(DDE_DLL_FILE); \
- $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde1.2; \
+ $(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde1.3; \
$(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl \
- $(LIB_INSTALL_DIR)/dde1.2; \
+ $(LIB_INSTALL_DIR)/dde1.3; \
fi
@if [ -f $(DDE_LIB_FILE) ]; then \
echo installing $(DDE_LIB_FILE); \
- $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde1.2; \
+ $(COPY) $(DDE_LIB_FILE) $(LIB_INSTALL_DIR)/dde1.3; \
fi
@if [ -f $(REG_DLL_FILE) ]; then \
echo installing $(REG_DLL_FILE); \
diff --git a/win/configure b/win/configure
index eb4ea6f..fd4bc38 100755
--- a/win/configure
+++ b/win/configure
@@ -1277,9 +1277,9 @@ TCL_MINOR_VERSION=5
TCL_PATCH_LEVEL="a0"
VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
-TCL_DDE_VERSION=1.2
+TCL_DDE_VERSION=1.3
TCL_DDE_MAJOR_VERSION=1
-TCL_DDE_MINOR_VERSION=2
+TCL_DDE_MINOR_VERSION=3
TCL_DDE_PATCH_LEVEL=""
DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
diff --git a/win/configure.in b/win/configure.in
index 2a7a79e..41921ef 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
# generate the file "configure", which is run during Tcl installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.75 2003/06/16 18:36:45 andreas_kupries Exp $
+# RCS: @(#) $Id: configure.in,v 1.76 2003/11/10 22:55:47 dgp Exp $
AC_INIT(../generic/tcl.h)
AC_PREREQ(2.57)
@@ -19,9 +19,9 @@ TCL_MINOR_VERSION=5
TCL_PATCH_LEVEL="a0"
VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
-TCL_DDE_VERSION=1.2
+TCL_DDE_VERSION=1.3
TCL_DDE_MAJOR_VERSION=1
-TCL_DDE_MINOR_VERSION=2
+TCL_DDE_MINOR_VERSION=3
TCL_DDE_PATCH_LEVEL=""
DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
diff --git a/win/makefile.bc b/win/makefile.bc
index 2457345..7814623 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -127,8 +127,8 @@ STUBPREFIX = $(NAMEPREFIX)stub
DOTVERSION = 8.5
VERSION = 85
-DDEVERSION = 12
-DDEDOTVERSION = 1.2
+DDEVERSION = 13
+DDEDOTVERSION = 1.3
REGVERSION = 11
REGDOTVERSION = 1.1
@@ -442,9 +442,9 @@ install-libraries:
-@copy "$(ROOT)\library\tcltest\tcltest.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.2"
-@copy "$(ROOT)\library\tcltest\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\tcltest2.2"
@echo installing $(TCLDDEDLLNAME)
- -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.1"
- -@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.1"
- -@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.1"
+ -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.3"
+ -@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.3"
+ -@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.3"
@echo installing $(TCLREGDLLNAME)
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.1"
-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.1"
diff --git a/win/makefile.vc b/win/makefile.vc
index 3628507..7e308ae 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.112 2003/10/21 00:23:34 kennykb Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.113 2003/11/10 22:55:48 dgp Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -162,7 +162,7 @@ STUBPREFIX = $(PROJECT)stub
DOTVERSION = 8.5
VERSION = $(DOTVERSION:.=)
-DDEDOTVERSION = 1.2
+DDEDOTVERSION = 1.3
DDEVERSION = $(DDEDOTVERSION:.=)
REGDOTVERSION = 1.1
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 9729a5f..a37cb60 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -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: tclWinDde.c,v 1.17 2003/06/23 22:05:11 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.18 2003/11/10 22:55:48 dgp Exp $
*/
#include "tclPort.h"
@@ -71,7 +71,7 @@ static DWORD ddeInstance; /* The application instance handle given
* to us by DdeInitialize. */
static int ddeIsServer = 0;
-#define TCL_DDE_VERSION "1.2.5"
+#define TCL_DDE_VERSION "1.3"
#define TCL_DDE_PACKAGE_NAME "dde"
#define TCL_DDE_SERVICE_NAME "TclEval"
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 5951c85..4a2c841 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinReg.c,v 1.23 2003/07/23 20:55:14 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.24 2003/11/10 22:55:48 dgp Exp $
*/
#include <tclPort.h>
@@ -228,7 +228,7 @@ Registry_Init(
}
Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd, NULL, NULL);
- return Tcl_PkgProvide(interp, "registry", "1.1.2");
+ return Tcl_PkgProvide(interp, "registry", "1.1.3");
}
/*