summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-11-10 22:42:06 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-11-10 22:42:06 (GMT)
commitd081bdaefdd5c97a2957145ea3f0ed540aa55942 (patch)
tree5e68bff272addf4657c3e95aaaabaff686717b47
parent32aba931e84dea723663e8d37fa621e161e4b50e (diff)
downloadtcl-d081bdaefdd5c97a2957145ea3f0ed540aa55942.zip
tcl-d081bdaefdd5c97a2957145ea3f0ed540aa55942.tar.gz
tcl-d081bdaefdd5c97a2957145ea3f0ed540aa55942.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.2.2.
-rw-r--r--ChangeLog5
-rw-r--r--library/dde/pkgIndex.tcl5
-rwxr-xr-xlibrary/reg/pkgIndex.tcl5
-rw-r--r--win/tclWinDde.c4
-rw-r--r--win/tclWinReg.c4
5 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 09e18cc..1eeecfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
* win/tclWinInit.c (TclpInitLibraryPath): 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.2.2.
+
2003-11-06 Jeff Hobbs <jeffh@ActiveState.com>
* tests/unixInit.test (unixInit-2.10): mark as knownBug
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl
index 49201f4..b293134 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.1 [list load [file join $dir tcldde12g.dll] dde]
+ package ifneeded dde 1.2.2 [list load [file join $dir tcldde12g.dll] dde]
} else {
- package ifneeded dde 1.2.1 [list load [file join $dir tcldde12.dll] dde]
+ package ifneeded dde 1.2.2 [list load [file join $dir tcldde12.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/tclWinDde.c b/win/tclWinDde.c
index 8244b99..e8bf139 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.13 2003/03/03 17:12:48 dgp Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.13.2.1 2003/11/10 22:42:07 dgp Exp $
*/
#include "tclPort.h"
@@ -69,7 +69,7 @@ static DWORD ddeInstance; /* The application instance handle given
* to us by DdeInitialize. */
static int ddeIsServer = 0;
-#define TCL_DDE_VERSION "1.2.1"
+#define TCL_DDE_VERSION "1.2.2"
#define TCL_DDE_PACKAGE_NAME "dde"
#define TCL_DDE_SERVICE_NAME "TclEval"
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 75fc12b..424cb44 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.21.2.2 2003/07/23 20:57:57 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.21.2.3 2003/11/10 22:42:07 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");
}
/*